Commit Graph

42 Commits

Author SHA1 Message Date
ZYT
11c316f571 添加广东广州蒋海燕荔湖场景 2025-10-24 15:51:58 +08:00
ZYT
9c669978e0 添加河南新乡万达广场室内场景 2025-10-22 18:30:45 +08:00
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
da37270b63 fix:添加中控脚本 2025-10-20 15:13:27 +08:00
bzx
3887a2ee8f fix:楼下场地优化 2025-10-15 14:27:17 +08:00
bzx
aea64399a7 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2025-10-14 18:19:40 +08:00
bzx
df10c3f4da add:添加体感服功能 2025-10-14 18:17:45 +08:00
ZYT
a839dbe14e Merge commit 'ce4551d58fe529f1c6f77a4866b92c5516edaa60' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-10-14 11:00:05 +08:00
bzx
229046c6f8 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-10-14 10:57:38 +08:00
bzx
ce4551d58f fix:调整联机时最后一波敌人抖动问题 2025-10-14 10:56:43 +08:00
ZYT
1870efd889 添加甘肃金昌金川世纪广场室外场景,添加扬州探索中新外带场景,修改云南临沧地下场景 2025-10-13 18:27:05 +08:00
ZYT
b60a33b69e Merge commit '7b1c3a025db3a8691703cbef195043714bdc94cc' into main_ZYT
# Conflicts:
#	Assets/_DefendNJ/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity
#	Assets/_DefendNJ/Scenes/Yunnan_Lincang_Linxiang_Hengji_Dixia.unity.meta
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-10-13 10:43:52 +08:00
ZYT
0eeed07e5f 添加甘肃室外场景,修改云南临沧临翔地下场景 2025-10-13 10:42:56 +08:00
bzx
0e3a2daf97 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-10-11 18:37:14 +08:00
bzx
7b1c3a025d fix:调整联机问题。调整最后一波拼刀问题 2025-10-11 18:34:10 +08:00
ZYT
b81488eaa9 添加浙江杭州临平银泰城室内场景 2025-10-10 18:28:21 +08:00
ZYT
6eb01dc449 添加河南新乡万达广场场景 2025-10-09 18:23:55 +08:00
ZYT
c44da929a8 修改枚举鉴权,添加金华科技馆 湖南衡阳 唐山 临平 桂林 金昌场地资源,添加安徽芜湖、扬州未来外场景 2025-09-30 18:05:50 +08:00
bzx
f617a00597 add:添加安徽宿州 辽宁鞍山场景 调整鉴权申请 2025-09-30 17:17:21 +08:00
bzx
e4e3cae523 fix:注释调试 2025-09-30 16:26:47 +08:00
bzx
6d754a635a fix:解决支援敌人没死亡问题 2025-09-30 16:08:20 +08:00
bzx
dd89969cf0 fix:开门方法修改 添加湖南吉首场地 2025-09-30 14:30:21 +08:00
bzx
0997ef4412 fix:添加刀光特效,修改炸弹特效 2025-09-30 14:19:36 +08:00
bzx
993e75dbaf fix:扬州枚举修改 2025-09-29 21:13:57 +08:00
ZYT
75bc9c85ad 修改枚举、添加山东潍坊地形资源 2025-09-29 20:39:34 +08:00
bzx
34e404b7e0 fix:修改场地中所有问题 2025-09-29 20:30:48 +08:00
bzx
8a7da1c51b fix:隐藏体感服调用,调整刀的位置 2025-09-29 19:28:19 +08:00
bzx
b0a8b439a6 fix:音效补充 完善各个事件 2025-09-29 19:01:48 +08:00
bzx
21c46b8054 fix:完成整体游戏逻辑 2025-09-28 18:24:09 +08:00
bzx
fb54e66fe0 fix:修改 2025-09-27 18:45:59 +08:00
bzx
7ee82c350e fix:补充敌人行为 2025-09-27 11:28:08 +08:00
bzx
4a6c418dda fix:修改敌人流程,添加敌人枚举 2025-09-26 13:33:37 +08:00
bzx
ccbcd219c2 fix:调整敌人状态和playerAi状态 2025-09-25 13:38:59 +08:00
bzx
d37bb0ae35 fix:补充ai行为流程 2025-09-24 11:10:05 +08:00
bzx
d648a31930 fix:修改敌人逻辑 2025-09-22 18:37:47 +08:00
bzx
60ee55d266 fix:添加所需音频,添加敌人模型 2025-09-22 10:54:00 +08:00
bzx
b964f40e11 fix:修改队友AI脚本 2025-09-13 18:45:40 +08:00
bzx
c1214ae168 fix:添加场景素材和人物素材 2025-09-11 10:39:49 +08:00
bzx
819533e596 fix:数据表更新添加 2025-09-10 11:01:45 +08:00
bzx
79535c29fe fix;删除无用资源 2025-09-05 15:44:54 +08:00