Commit Graph

43 Commits

Author SHA1 Message Date
ZYT
56aea35b65 添加陕西宝鸡场景 2025-11-08 15:26:35 +08:00
ZYT
1a751e0fdc 修改江苏徐州丰县吾悦广场场景,添加徐州欧乐堡,欧乐堡2场景,徐州苏宁广场场景,南京浦口龙湖天街场景 2025-11-06 16:42:21 +08:00
ZYT
11c316f571 添加广东广州蒋海燕荔湖场景 2025-10-24 15:51:58 +08:00
ZYT
9c669978e0 添加河南新乡万达广场室内场景 2025-10-22 18:30:45 +08:00
ZYT
45bab0e1e5 添加AI,添加云南凌沧一楼场景,修改广州场景 2025-10-21 10:43:08 +08:00
ZYT
188858c7f8 添加湖南衡阳珠晖东洲岛室内场景 2025-10-15 18:17: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
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
bzx
b8cb472404 fix:调整楼下地图 2025-10-01 18:09:36 +08:00
bzx
813711282d Merge remote-tracking branch 'origin/L-jiahuan'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-30 19:57:09 +08:00
bzx
36bd9ff6d1 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-30 19:56:33 +08:00
bzx
89aede3758 fix:添加乌兰浩特,临沧 等场地 2025-09-30 19:56:17 +08:00
ZYT
bc0a270763 布置场地 2025-09-30 19:43:18 +08:00
41ab7019b8 Merge remote-tracking branch 'origin/main' into L-jiahuan
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-30 18:37:04 +08:00
58725ad6a8 添加河南新政场景 2025-09-30 18:35:36 +08:00
bzx
2ffa30ad21 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	Assets/DC/场地/保卫金陵_山东潍坊青州泰华城.prefab
#	Assets/_DefendNJ/Scenes/ShanDong_Langfang_QingzhouTaihuacheng.unity
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-30 18:10:40 +08:00
bzx
4428c0ace6 fix:添加徐州场地修改潍坊场地 2025-09-30 18:10:09 +08:00
ZYT
c44da929a8 修改枚举鉴权,添加金华科技馆 湖南衡阳 唐山 临平 桂林 金昌场地资源,添加安徽芜湖、扬州未来外场景 2025-09-30 18:05:50 +08:00
ZYT
77e299fa09 Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-30 17:20:32 +08:00
ZYT
8c6b682c0a 修改南京尧化门、山东潍坊场景、添加安徽芜湖场景 2025-09-30 17:19:53 +08:00
bzx
f617a00597 add:添加安徽宿州 辽宁鞍山场景 调整鉴权申请 2025-09-30 17:17:21 +08:00
bzx
6d754a635a fix:解决支援敌人没死亡问题 2025-09-30 16:08:20 +08:00
bzx
eb9cdfe194 fix:湖南吉首地形修改 2025-09-30 15:13:37 +08:00
bzx
dd89969cf0 fix:开门方法修改 添加湖南吉首场地 2025-09-30 14:30:21 +08:00
bzx
0997ef4412 fix:添加刀光特效,修改炸弹特效 2025-09-30 14:19:36 +08:00
ZYT
a4c32cd8d6 添加尧化门、山东济宁内场景资源 2025-09-29 20:44:41 +08:00
ZYT
fc856f9f11 添加山东潍坊地形 2025-09-29 20:40:37 +08:00
ZYT
75bc9c85ad 修改枚举、添加山东潍坊地形资源 2025-09-29 20:39:34 +08:00
bzx
34e404b7e0 fix:修改场地中所有问题 2025-09-29 20:30:48 +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
ccbcd219c2 fix:调整敌人状态和playerAi状态 2025-09-25 13:38:59 +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
bzx
b69ce07492 init:初始化 2025-09-04 14:31:28 +08:00