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

Merge remote-tracking branch 'origin/main' into main_ZYT

Browse Source 
# Conflicts:
#	Assets/_Alice/Scripts/Base/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
ZYT
2026-01-04 09:43:53 +08:00
parent b25f0cf6d8 23fefe478d
commit beed8d6cd1
7 changed files with 289 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectSettings/EditorBuildSettings.asset
View File

@@ -161,7 +161,7 @@ EditorBuildSettings:
- enabled: 0
path: Assets/_Alice/Scenes/GongSi1LouShiwai.unity
guid: fc1fccbc1d9a40a43ba3e05540147656
- enabled: 0
- enabled: 1
path: Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity
guid: 63b47db0877f0c24bad6c9f81dec192e
- enabled: 0