DESKTOP-BG758DI\Admin 3e5b37d50d Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan ...

# Conflicts:
#	Assets/Resources/~$银河守护者-广西桂林恭城世纪鑫诚.xlsm.meta
#	Assets/Resources/~$银河守护者-江苏徐州丰县吾悦广场.xlsm.meta
#	Assets/Resources/银河守护者-辽宁鞍山立山大悦城.xlsm.meta
#	Assets/StreamingAssets/build_info

2025-09-28 18:12:50 +08:00

..

AI

…

DamageNumbersPro

…

Davis3D

…

DC

Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

2025-09-28 18:12:50 +08:00

Editor Default Resources

…

ErbGameArt

…

Fonts

…

Gizmos

…

HistoricalMuseum

…

http

…

InfiniteShooting

…

Knife

…

Matrials

…

MeshBaker

…

Models

…

OrdosFX

…

Plugins

…

Portal Particle

…

Prefabs

…

Resources

Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

2025-09-28 18:12:50 +08:00

Samples

…

Scenes

Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

2025-09-28 18:12:50 +08:00

Scripts

Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

2025-09-28 18:12:50 +08:00

Shader

…

StreamingAssets

修改广西桂林场景，未打包

2025-09-28 18:11:35 +08:00

sucai

Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan

2025-09-28 18:12:50 +08:00

TextMesh Pro

…

Textures

…

Trails FX

…

TruegearSdk

…

TutorialInfo

…

Unity-Logs-Viewer

…

Unity.VisualScripting.Generated

…

XR

…

XRI

…

AI.meta

…

DamageNumbersPro.meta

…

Davis3D.meta

…

DC.meta

…

Editor Default Resources.meta

…

ErbGameArt.meta

…

Fonts.meta

…

Gizmos.meta

…

HistoricalMuseum.meta

…

http.meta

…

InfiniteShooting.meta

…

Knife.meta

…

Matrials.meta

…

MeshBaker.meta

…

Models.meta

…

New Universal Render Pipeline Asset_Renderer.asset

…

New Universal Render Pipeline Asset_Renderer.asset.meta

…

New Universal Render Pipeline Asset.asset

…

New Universal Render Pipeline Asset.asset.meta

…

OrdosFX.meta

…

Plugins.meta

…

Portal Particle.meta

…

Prefabs.meta

…

Resources.meta

…

Samples.meta

…

Scenes.meta

…

Scripts.meta

…

Shader.meta

…

SpawnPoolProfile.asset

…

SpawnPoolProfile.asset.meta

…

StreamingAssets.meta

…

sucai.meta

…

TextMesh Pro.meta

…

Textures.meta

…

Trails FX.meta

…

TruegearSdk.meta

…

TutorialInfo.meta

…

Unity-Logs-Viewer.meta

…

Unity.VisualScripting.Generated.meta

…

UniversalRenderPipelineGlobalSettings.asset

…

UniversalRenderPipelineGlobalSettings.asset.meta

…

XR.meta

…

XRI.meta

…