Commit Graph

59 Commits

Author SHA1 Message Date
ZYT
afb7c9211d 修改医疗包不消失 2025-09-05 10:31:27 +08:00
ZYT
3ab1f54d28 删除浙江绍兴场景中的雾 2025-09-04 18:26:58 +08:00
bzx
73a222b67d Merge remote-tracking branch 'origin/main_ZYT' 2025-09-04 17:32:49 +08:00
bzx
24a4c7de62 fix:修复多人捡血包消失问题 2025-09-04 17:32:27 +08:00
ZYT
ef56c44d5b Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-09-04 17:28:33 +08:00
ZYT
df6ac4a6ef 添加扬州邗江探索中心内外场景和修改河南新郑双湖大道龙湖锦艺城场景 2025-09-04 17:26:44 +08:00
bzx
3ee6b3d87c Merge remote-tracking branch 'origin/main_ZYT' 2025-09-04 16:29:20 +08:00
bzx
df67ddb9da fix::修复一些联机中的问题 2025-09-04 16:29:12 +08:00
ZYT
d7ff78707a Merge remote-tracking branch 'origin/main' into main_ZYT 2025-09-02 18:26:35 +08:00
ZYT
dd0f8f0f74 添加南京栖霞尧化门场景 2025-09-02 18:26:07 +08:00
bzx
aa4ba610ef Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2025-09-02 18:25:55 +08:00
bzx
5a84813302 add:添加河南新郑和廊坊场景,给枪械添加死亡和结束禁止开枪 2025-09-02 18:25:39 +08:00
ZYT
445e2eecdc Merge remote-tracking branch 'origin/main' into main_ZYT 2025-09-02 17:43:45 +08:00
ZYT
943823ed2c 修改辽宁、浙江场景 2025-09-02 17:42:28 +08:00
bzx
76e7aa977a fix:解决结束不停止问题,修改枪械子弹数量 2025-09-02 17:41:48 +08:00
ZYT
550db38e55 添加和修改场景 2025-09-02 17:22:17 +08:00
ZYT
5161b628db 修改脚本 2025-09-02 15:56:08 +08:00
ZYT
2b97b51039 添加辽宁鞍山脚本,修改Gun2、Gun3脚本 2025-09-02 15:46:19 +08:00
ZYT
f732eaba9d Merge remote-tracking branch 'origin/main' into main_ZYT 2025-09-02 15:28:40 +08:00
ZYT
d0924a6685 添加地形和场景 2025-09-02 15:28:22 +08:00
bzx
908d5dcf17 Merge remote-tracking branch 'origin/main_ZYT' 2025-09-02 15:27:21 +08:00
bzx
03f1c9da76 fix:体感服完成测试 2025-09-02 15:27:14 +08:00
ZYT
688b5e3dcf Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2025-09-02 14:48:30 +08:00
bzx
532e054580 add:添加医疗包 2025-09-02 14:46:43 +08:00
ZYT
5861a46e42 打包信息 2025-09-02 14:46:33 +08:00
bzx
777db1792e fix:添加道具枚举 2025-09-02 13:31:10 +08:00
bzx
b0bde8e8a4 fix:修复一些可见bug 2025-09-02 13:30:42 +08:00
bzx
ba85235908 fix:玩家血量提升到150 枪械射击加手柄震动 2025-09-01 18:34:30 +08:00
bzx
10a6a681d0 fix:修改联机一系列问题 2025-09-01 16:02:23 +08:00
ZYT
99e2f2b692 Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2025-08-30 20:00:48 +08:00
bzx
a299697363 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-08-30 19:59:26 +08:00
bzx
b926717db2 fix:场景材质丢失问题 2025-08-30 19:58:51 +08:00
ZYT
c930737217 修改安徽、吉首场景 2025-08-30 19:58:35 +08:00
ZYT
9c80c426db Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2025-08-30 19:42:07 +08:00
ZYT
9b1628cd08 修改湖南吉首场景 2025-08-30 19:41:10 +08:00
bzx
c2555a5801 1 2025-08-30 19:40:18 +08:00
bzx
fd2ab9dbf6 Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2025-08-30 19:38:26 +08:00
bzx
2a787883ac fix:修复喷火枪涂层问题 2025-08-30 19:38:09 +08:00
ZYT
0fe214afac 修改安徽芜湖冠威场景 2025-08-30 18:49:49 +08:00
bzx
c35f712fa4 fix:复活阶段禁止开枪 2025-08-30 18:49:07 +08:00
bzx
54c96c1119 Merge remote-tracking branch 'origin/main_ZYT' 2025-08-30 18:24:40 +08:00
bzx
453e0b5fe9 fix:重置初始枪械 2025-08-30 18:23:21 +08:00
ZYT
3d9e16c594 添加安徽,山东场地模型 2025-08-30 18:22:59 +08:00
bzx
e8a9f54168 fix:修复场地bug 2025-08-30 18:18:34 +08:00
bzx
63fca02961 fix:浙江绍兴场地布置 2025-08-30 16:44:43 +08:00
bzx
5949cb138e Merge remote-tracking branch 'origin/main_ZYT' 2025-08-30 16:22:45 +08:00
bzx
e506d0d625 fix:解决流程中触发的问题 2025-08-30 16:22:40 +08:00
ZYT
9a599f059b 添加浙江绍兴嵊州场景模型 2025-08-30 15:00:56 +08:00
bzx
cb0edbf3b3 fix:添加各个音效 2025-08-30 14:37:14 +08:00
bzx
a56b727086 fix:调整目标朝向问题 2025-08-29 18:41:53 +08:00