Commit Graph

107 Commits

Author SHA1 Message Date
ZYT
1e3a9e0569 添加广东广州杨海燕荔湖场景 2025-12-01 12:06:49 +08:00
bzx
85868a43f8 Merge remote-tracking branch 'origin/Ljh'
# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameManager.cs
#	ProjectSettings/EditorBuildSettings.asset
2025-12-01 12:02:04 +08:00
bzx
fbdca84adf fix:解决从机音效问题 2025-12-01 12:01:42 +08:00
ZYT
ffd6883b55 Merge remote-tracking branch 'origin/main' into Ljh
# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameManager.cs
#	ProjectSettings/EditorBuildSettings.asset
2025-12-01 10:41:48 +08:00
ZYT
141cdabec9 添加欧乐堡5*10场景 2025-12-01 10:41:15 +08:00
bzx
31fbf427b8 fix:联机界面默认调用显示第一个界面,打包剩余场地 2025-12-01 10:39:14 +08:00
bzx
3a0c9d1ef8 Merge remote-tracking branch 'origin/Ljh'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-11-28 18:58:50 +08:00
bzx
355ab685ce 制作枚举18-25场地 2025-11-28 18:58:35 +08:00
ZYT
860a0b4710 Merge remote-tracking branch 'origin/main' into Ljh
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-11-28 18:42:42 +08:00
ZYT
8c5c3f2e7c 添加江苏徐州苏宁广场,苏宁广场一楼,江苏徐州过楼欧乐堡5*5场景 2025-11-28 18:41:58 +08:00
ZYT
0def3f7dab 添加湖南常德澧县万达广场,重庆洪崖洞,陕西宝鸡,吉林长春北湖吾悦广场 2025-11-28 18:02:05 +08:00
bzx
67663c0d99 Merge remote-tracking branch 'origin/Ljh'
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-11-28 16:01:12 +08:00
bzx
7137782617 添加尧化门 双龙大道场地 2025-11-28 16:00:56 +08:00
ZYT
f5ac1fe060 增加29之后的枚举 2025-11-28 15:58:29 +08:00
ZYT
fe2a4210fe 添加芜湖,浙江金华,山东潍坊场景,修改人数选择界面贴图 2025-11-28 15:39:59 +08:00
ZYT
1b00cf8ff5 Merge remote-tracking branch 'origin/main' into Ljh
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-11-28 13:38:50 +08:00
ZYT
bbbcd28681 添加扬州探索中心室外场景 2025-11-28 13:38:31 +08:00
bzx
f41b5e0dbb fix:修复主机和从机分数不匹配问题 2025-11-28 13:37:07 +08:00
ZYT
3c655c64a1 Merge remote-tracking branch 'origin/main' into Ljh 2025-11-28 10:38:04 +08:00
bzx
49a873d234 fix:界面调整 2025-11-28 10:37:33 +08:00
ZYT
3c1b3ab532 Merge remote-tracking branch 'origin/main' into Ljh
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2025-11-27 18:32:55 +08:00
ZYT
98b0827946 添加扬州邗江探索中心场景 2025-11-27 18:32:20 +08:00
bzx
221224cf68 fix:设置房间人数添加至少两人限制 2025-11-27 18:31:24 +08:00
bzx
38174fe174 fix:GameId调整为10 2025-11-27 18:00:52 +08:00
bzx
878b217e10 fix:修复一下从机激光武器没伤害问题 2025-11-27 17:57:33 +08:00
bzx
ab59cd4c69 add:添加空格跳关选项 2025-11-27 17:22:36 +08:00
bzx
1e7f6fc381 fix:补充 2025-11-27 17:19:05 +08:00
bzx
4c71bcaaef fix:添加开始游戏倒计时 2025-11-27 17:18:09 +08:00
bzx
1b2c92eec1 fix:修改绍兴场地,修改总游玩时长 2025-11-27 17:07:55 +08:00
bzx
f289be240e fix:修改场景 2025-11-27 17:00:51 +08:00
bzx
7e3c2fabdd fix:位置微调 2025-11-27 16:58:38 +08:00
bzx
d1dde89cbf add:添加主机选择人数界面 2025-11-27 16:52:22 +08:00
bzx
b8d484311c fix:最后调整,对受击音效 场地 特效调整 2025-11-27 10:17:16 +08:00
bzx
4949ba7d72 fix:添加切换回合过场动画,添加城市模型素材 2025-11-26 13:53:01 +08:00
bzx
c59da6c680 FIX;添加回合概念,添加回合和复活UI 调整UI界面 2025-11-25 18:34:35 +08:00
bzx
80ff394cef add:添加一些特效 2025-11-24 18:56:18 +08:00
bzx
f3be988c8b fix:添加无敌罩素材 添加空投飞机素材 2025-11-22 17:44:23 +08:00
bzx
e806dee512 fix:解决打死敌人 击杀者图标不显示问题 2025-11-22 16:53:39 +08:00
bzx
7e25fbda08 add:添加击杀图标显示,添加积分概念 2025-11-22 10:20:40 +08:00
bzx
ba2708dcd9 fix:添加开场boss 调整 回血阵 毒阵道具特效 2025-11-20 17:02:14 +08:00
bzx
2d9464a417 fix:玩家添加盔甲和头盔 调整玩家掉血问题 2025-11-19 13:53:34 +08:00
bzx
d3ffcbf745 fix:从机伤害字体问题修复 2025-11-17 17:37:31 +08:00
bzx
17ddc42174 fix:联机下 防护罩没问题,激光没问题,攻击家人没问题,散弹没问题 2025-11-14 18:31:09 +08:00
bzx
6c75fe25f5 fix:调试道具枪,调试联机模式 2025-11-13 19:00:45 +08:00
bzx
045897d685 fix:添加松手事件,添加激光枪完整道具 2025-11-13 11:55:51 +08:00
bzx
e909b9e01c add:添加 假人 炸弹 回血圈 散弹枪 更新枪模型 添加炮台预制体 2025-11-12 17:52:24 +08:00
bzx
754361c792 fix:添加毒气弹枪和一系列脚本 2025-11-11 19:15:23 +08:00
bzx
b1d7a5727e add:添加破碎插件 2025-11-11 18:11:32 +08:00
bzx
31dd8212df add:整理道具,完成防御弹 敌人子弹和友方子弹区分 2025-11-11 17:04:22 +08:00
bzx
b8cae8f23b add:添加防护罩脚本 2025-11-10 18:46:16 +08:00