Commit Graph

7 Commits

Author SHA1 Message Date
ZYT
9305d26f25 Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	Assets/Plugins/Android/AndroidManifest.xml
#	Assets/_DefendNJ/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
#	Assets/_DefendNJ/Scripts/Manager/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
2025-10-21 10:45:08 +08:00
ZYT
45bab0e1e5 添加AI,添加云南凌沧一楼场景,修改广州场景 2025-10-21 10:43:08 +08:00
bzx
7bc3335044 fix:调整体感服问题 2025-10-20 15:26:55 +08:00
bzx
df10c3f4da add:添加体感服功能 2025-10-14 18:17:45 +08:00
bzx
8a7da1c51b fix:隐藏体感服调用,调整刀的位置 2025-09-29 19:28:19 +08:00
bzx
c1214ae168 fix:添加场景素材和人物素材 2025-09-11 10:39:49 +08:00
bzx
79535c29fe fix;删除无用资源 2025-09-05 15:44:54 +08:00