Commit Graph

54 Commits

Author SHA1 Message Date
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
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
e4e3cae523 fix:注释调试 2025-09-30 16:26:47 +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
bzx
156306616a Merge remote-tracking branch 'origin/L-jiahuan' 2025-09-30 10:46:57 +08:00
808bc5d627 Merge remote-tracking branch 'origin/main_ZYT' into L-jiahuan 2025-09-30 10:45:26 +08:00
5c1398b257 fix:山东济宁内添加 2025-09-29 22:03:24 +08:00
ZYT
ef9e755cee 修改山东潍坊青州泰华城场景点位 2025-09-29 22:03:16 +08:00
ZYT
680656acf3 修改点位 2025-09-29 21:42:48 +08:00
ZYT
6556b124f0 Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	Assets/_DefendNJ/Scripts/GameLocal.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-29 21:33:27 +08:00
ZYT
4006ad5afb 添加山东潍坊青州泰华城场景 2025-09-29 21:32:29 +08:00
bzx
993e75dbaf fix:扬州枚举修改 2025-09-29 21:13:57 +08:00
bzx
2b9e380b7d fix:南京尧化门 2025-09-29 21:07:13 +08:00
bzx
57b5a2facd Merge remote-tracking branch 'origin/main_ZYT' 2025-09-29 20:45:40 +08:00
bzx
03aa929ea6 fix:调整为了 2025-09-29 20:45:07 +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
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