PineappleTech/AliceBall
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main_ZYT'

Browse Source 
# Conflicts:
#	Assets/_Alice/Scripts/Base/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
bzx
2025-12-27 12:29:33 +08:00
parent f7a5145341 2994f5973f
commit 23fefe478d
70 changed files with 1417164 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProjectSettings/EditorBuildSettings.asset
View File

@@ -167,6 +167,18 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Alice/Scenes/Hebei_Hengshui_Xinji_WandaGuangchang.unity
guid: 8259766f583edc34cbe979cc5df8327a
- enabled: 0
path: Assets/_Alice/Scenes/Hunan_Zhuzhou_Wanda_Shennongcheng_Chaowanshe.unity
guid: e8aefebd9754eb7438cfd18f91478c48
- enabled: 0
path: Assets/_Alice/Scenes/Anhui_Suzhou_Yueshan_Guchengshangyejie_Shinei.unity
guid: 363248f48377d584aaea2074a5a3d477
- enabled: 0
path: Assets/_Alice/Scenes/Shandong_Jining_Shangchang_3.unity
guid: e64ccb272ecd5a545b78f52f0f9c47eb
- enabled: 0
path: Assets/_Alice/Scenes/Anhui_Manshan_XingyueGuangchang.unity
guid: 0fb05a0779ddff843bd07bfb5e6551cd
m_configObjects:
Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
type: 2}