|
|
11c316f571
|
添加广东广州蒋海燕荔湖场景
|
2025-10-24 15:51:58 +08:00 |
|
|
|
9c669978e0
|
添加河南新乡万达广场室内场景
|
2025-10-22 18:30:45 +08:00 |
|
|
|
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 |
|
|
|
45bab0e1e5
|
添加AI，添加云南凌沧一楼场景，修改广州场景
|
2025-10-21 10:43:08 +08:00 |
|
|
|
7bc3335044
|
fix：调整体感服问题
|
2025-10-20 15:26:55 +08:00 |
|
|
|
8bbb954c15
|
Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
# Assets/Plugins/Android/AndroidManifest.xml
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-10-20 15:14:45 +08:00 |
|
|
|
da37270b63
|
fix：添加中控脚本
|
2025-10-20 15:13:27 +08:00 |
|
|
|
188858c7f8
|
添加湖南衡阳珠晖东洲岛室内场景
|
2025-10-15 18:17:05 +08:00 |
|
|
|
616e101c4b
|
Merge remote-tracking branch 'origin/main' into main_ZYT
|
2025-10-15 16:36:11 +08:00 |
|
|
|
c00fe2cbc8
|
Merge remote-tracking branch 'origin/main_ZYT'
|
2025-10-15 16:31:44 +08:00 |
|
|
|
3887a2ee8f
|
fix：楼下场地优化
|
2025-10-15 14:27:17 +08:00 |
|
|
|
3f0f8897f0
|
Merge remote-tracking branch 'origin/main' into main_ZYT
|
2025-10-15 10:49:09 +08:00 |
|
|
|
bd36a8e4a5
|
Merge commit 'df10c3f4da8af587d55bf99a1b1faf479083ec29' into main_ZYT
|
2025-10-15 10:48:47 +08:00 |
|
|
|
aea64399a7
|
Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
# ProjectSettings/ProjectSettings.asset
|
2025-10-14 18:19:40 +08:00 |
|
|
|
df10c3f4da
|
add：添加体感服功能
|
2025-10-14 18:17:45 +08:00 |
|
|
|
1a7d007197
|
Merge remote-tracking branch 'origin/main' into main_ZYT
|
2025-10-14 11:09:44 +08:00 |
|
|
|
a839dbe14e
|
Merge commit 'ce4551d58fe529f1c6f77a4866b92c5516edaa60' into main_ZYT
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-10-14 11:00:05 +08:00 |
|
|
|
229046c6f8
|
Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-10-14 10:57:38 +08:00 |
|
|
|
ce4551d58f
|
fix：调整联机时最后一波敌人抖动问题
|
2025-10-14 10:56:43 +08:00 |
|
|
|
1870efd889
|
添加甘肃金昌金川世纪广场室外场景，添加扬州探索中新外带场景，修改云南临沧地下场景
|
2025-10-13 18:27:05 +08:00 |
|
|
|
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 |
|
|
|
0eeed07e5f
|
添加甘肃室外场景，修改云南临沧临翔地下场景
|
2025-10-13 10:42:56 +08:00 |
|
|
|
0e3a2daf97
|
Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-10-11 18:37:14 +08:00 |
|
|
|
7b1c3a025d
|
fix：调整联机问题。调整最后一波拼刀问题
|
2025-10-11 18:34:10 +08:00 |
|
|
|
b81488eaa9
|
添加浙江杭州临平银泰城室内场景
|
2025-10-10 18:28:21 +08:00 |
|
|
|
6eb01dc449
|
添加河南新乡万达广场场景
|
2025-10-09 18:23:55 +08:00 |
|
|
|
b8cb472404
|
fix：调整楼下地图
|
2025-10-01 18:09:36 +08:00 |
|
|
|
813711282d
|
Merge remote-tracking branch 'origin/L-jiahuan'
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-09-30 19:57:09 +08:00 |
|
|
|
36bd9ff6d1
|
Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectSettings.asset
|
2025-09-30 19:56:33 +08:00 |
|
|
|
89aede3758
|
fix：添加乌兰浩特，临沧 等场地
|
2025-09-30 19:56:17 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4428c0ace6
|
fix：添加徐州场地修改潍坊场地
|
2025-09-30 18:10:09 +08:00 |
|
|
|
c44da929a8
|
修改枚举鉴权，添加金华科技馆 湖南衡阳 唐山 临平 桂林 金昌场地资源，添加安徽芜湖、扬州未来外场景
|
2025-09-30 18:05:50 +08:00 |
|
|
|
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 |
|
|
|
8c6b682c0a
|
修改南京尧化门、山东潍坊场景、添加安徽芜湖场景
|
2025-09-30 17:19:53 +08:00 |
|
|
|
f617a00597
|
add：添加安徽宿州 辽宁鞍山场景 调整鉴权申请
|
2025-09-30 17:17:21 +08:00 |
|
|
|
e4e3cae523
|
fix:注释调试
|
2025-09-30 16:26:47 +08:00 |
|
|
|
6d754a635a
|
fix：解决支援敌人没死亡问题
|
2025-09-30 16:08:20 +08:00 |
|
|
|
eb9cdfe194
|
fix：湖南吉首地形修改
|
2025-09-30 15:13:37 +08:00 |
|
|
|
dd89969cf0
|
fix：开门方法修改 添加湖南吉首场地
|
2025-09-30 14:30:21 +08:00 |
|
|
|
0997ef4412
|
fix：添加刀光特效，修改炸弹特效
|
2025-09-30 14:19:36 +08:00 |
|
|
|
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 |
|
|
|
ef9e755cee
|
修改山东潍坊青州泰华城场景点位
|
2025-09-29 22:03:16 +08:00 |
|
|
|
680656acf3
|
修改点位
|
2025-09-29 21:42:48 +08:00 |
|
|
|
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 |
|
