Commit Graph

108 Commits

Author SHA1 Message Date
bzx
04f294c876 Merge remote-tracking branch 'origin/Huang'
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2026-02-03 13:40:30 +08:00
bzx
6232fb5295 fix:火力对决调整为房主选完人数,加入的人直接开始游戏 2026-02-03 13:40:15 +08:00
50471cb5d2 Merge remote-tracking branch 'origin/Ljh' into Huang
# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameLocal.cs
#	ProjectSettings/ProjectSettings.asset
2026-01-28 18:24:25 +08:00
4b48f1f46b 添加江苏徐州鼓楼中控 2026-01-28 18:23:52 +08:00
ZYT
94ff2f2fc7 修改辽宁鞍山骊山大悦城场景 2026-01-27 17:20:43 +08:00
c1ad880aed 添加山西运城万达广场场景 2026-01-27 14:13:04 +08:00
2e19646432 Merge remote-tracking branch 'origin/Ljh' into Huang 2026-01-27 11:29:42 +08:00
fa5e43e96b Merge commit '9d1d6a822ea96ff40d75e240d1850cdf8f84c215' into Huang
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-27 11:29:16 +08:00
ZYT
6456346f83 Merge remote-tracking branch 'origin/Huang' into Ljh
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-27 10:54:24 +08:00
ZYT
9d1d6a822e 添加湖南湘西永顺新天地商场场景 2026-01-27 10:53:56 +08:00
ab16080d64 添加北京通州场景 2026-01-26 14:34:37 +08:00
ZYT
b11d3498ef Merge remote-tracking branch 'origin/Huang' into Ljh 2026-01-23 17:43:47 +08:00
d3e88684e1 添加吉林长春北湖中控 添加山东威海场景 2026-01-23 13:57:03 +08:00
ZYT
8013aa2ee9 Merge remote-tracking branch 'origin/Huang' into Ljh 2026-01-23 11:31:58 +08:00
ZYT
832cd519b2 Merge remote-tracking branch 'origin/Huang' into Ljh 2026-01-22 17:49:59 +08:00
ddf448df93 修改甘肃金昌金川地形 2026-01-22 17:32:07 +08:00
8f963901d2 添加重庆侠客新场地(江西南昌新建旭辉广场)场景 2026-01-22 13:35:30 +08:00
ZYT
8a1275aa56 Merge remote-tracking branch 'origin/Huang' into Ljh
# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameLocal.cs
2026-01-22 11:05:59 +08:00
ZYT
3aa01817a2 修改配置包 2026-01-22 11:04:06 +08:00
2ef7adb9c3 添加吉林吉林场景 2026-01-21 16:54:12 +08:00
c2ee818830 Merge remote-tracking branch 'origin/main' into Huang
# Conflicts:
#	Assets/_MrCs/Scripts/Manager/GameLocal.cs
#	ProjectSettings/ProjectSettings.asset
2026-01-20 18:01:58 +08:00
6b0ad49c5e 打包 2026-01-20 18:01:37 +08:00
bzx
b987894780 fix:调整道具枪倒计时问题 2026-01-20 17:54:27 +08:00
bzx
b8273b222c fix:火力对决解决卡顿问题 2026-01-20 17:29:30 +08:00
22af762906 添加宁夏银川金凤新华联广场场景 2026-01-20 17:14:32 +08:00
d2ededc258 打包河南商丘场景 2026-01-20 15:21:04 +08:00
c1e45d5bb1 添加广东梅州场景 2026-01-20 14:25:33 +08:00
ZYT
237a7dccfb 添加江西南昌场景 2026-01-20 11:09:00 +08:00
ZYT
7d911acff7 添加江西赣州龙南万达广场室内场景 2026-01-19 10:21:46 +08:00
ZYT
638bef72b3 添加江西赣州龙南场景 2026-01-17 09:59:04 +08:00
ZYT
4d390a514f 添加辽宁大连普兰店万达广场场景 2026-01-16 15:36:01 +08:00
ZYT
bf896010ad Merge remote-tracking branch 'origin/main' into Ljh 2026-01-15 13:37:33 +08:00
ZYT
5d2a94ae44 添加辽宁盘锦双台子双台城场景 2026-01-15 13:37:27 +08:00
bzx
a0219a7301 fix:静态数据调整到gamelocal脚本里 2026-01-15 11:28:22 +08:00
ZYT
d9ad8ca434 Merge remote-tracking branch 'origin/main' into Ljh
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2026-01-15 09:35:48 +08:00
ZYT
353b835c46 添加柱子纹理 2026-01-15 09:35:31 +08:00
bzx
984ae79b14 add:补充 2026-01-14 19:57:50 +08:00
bzx
4d329f709d add:添加中控控制脚本 2026-01-14 19:55:55 +08:00
ZYT
0d3bbcdddc 添加山东潍坊临朐万达广场室内场景 2026-01-12 10:18:44 +08:00
ZYT
87f4aa1f66 修改吉林长春朝阳欧亚卖场场景 2026-01-08 10:04:33 +08:00
ZYT
8264edb094 添加吉林长春朝阳欧亚卖场场景,修改南京浦口龙湖天街场景 2026-01-07 09:39:14 +08:00
ZYT
7d3517caaf 修改河北桃城场景,添加浙江温州山东潍坊临朐万达广场场景 2026-01-04 09:45:22 +08:00
ZYT
058dae39d9 添加安徽马鞍山场景 2025-12-26 20:02:53 +08:00
ZYT
062dd29b13 添加山东济宁第三个场景 2025-12-25 18:17:01 +08:00
ZYT
5ba634542a 添加安徽宿州砀山古城商业街室内场景 2025-12-24 14:59:21 +08:00
ZYT
a58a73aa1d 添加湖南株洲万达神农城潮玩社场景,河北衡水辛集万达广场场景 2025-12-23 12:01:36 +08:00
ZYT
016c70f2d0 添加宁夏银川金凤新华联广场场景 2025-12-12 17:36:34 +08:00
ZYT
a70ff32f0d 添加公司一楼大厅室外场景 2025-12-12 14:01:00 +08:00
ZYT
a05d8a18d2 添加指引系统,退出APP功能,安徽宿州砀山古城商业街苏州场景 2025-12-06 11:38:05 +08:00
ZYT
488197692e 添加浙江杭州临平银泰城室外,成都双流圣菲学校,重庆侠客行场景 2025-12-01 17:52:04 +08:00