Commit Graph

163 Commits

Author SHA1 Message Date
d74ba7cd8b 添加葫芦岛建昌兴隆大家庭场景,宁夏银川万达场景 2026-02-06 14:15:11 +08:00
b41e23eddc Merge remote-tracking branch 'origin/main_ZYT' into Huang
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2026-02-04 17:52:04 +08:00
3ddf92d435 添加北京通州向日葵广场场景、河南开封室内、室外场景,北京密云场景,辽宁水游城场景,江西南昌西湖南昌动物园场景,陕西榆林场景,四川凉山场景;修改河南商丘场景、江苏徐州鼓楼欧乐堡场景 2026-02-04 17:48:24 +08:00
ZYT
90eb12d542 修改北京通州,辽宁鞍山场景,删除多余地形 2026-02-04 10:26:10 +08:00
7204257b44 为湖南常德添加新中控 2026-01-29 15:44:09 +08:00
5e72e1dd69 添加江苏徐州鼓楼中控 2026-01-28 18:22:23 +08:00
3616493b52 修改合并错误 2026-01-27 11:59:58 +08:00
0dd669484e Merge remote-tracking branch 'origin/main_ZYT' into Huang
# Conflicts:
#	Assets/_Zombie/Scripts/GameLocal.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-27 11:46:00 +08:00
c89819f2df 添加山西运城万达广场场景 2026-01-27 11:44:36 +08:00
ZYT
52533bb3f8 添加湖南湘西永顺新天地商场场景 2026-01-27 10:53:37 +08:00
6018785264 添加江西运城,北京通州场景 2026-01-26 13:57:27 +08:00
b27be90b08 Merge remote-tracking branch 'origin/main_ZYT' into Huang
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-26 10:15:55 +08:00
fb7ce7221f ProjectSettings 2026-01-26 10:14:58 +08:00
bzx
4c144750ec fix:解决武器消失问题 2026-01-25 13:55:02 +08:00
bzx
e37234a18e fix:删除无效音效 2026-01-25 13:15:06 +08:00
bzx
db90f5be7a Merge remote-tracking branch 'origin/Huang' 2026-01-25 13:01:53 +08:00
74541fa6a2 添加山东济南室内室外、安徽马鞍山、辽宁鞍山新中控 2026-01-23 16:45:25 +08:00
ZYT
1f960d49ab Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	Assets/_Zombie/Scripts/GameLocal.cs
2026-01-23 16:15:40 +08:00
ZYT
921ddb535c 修改盘锦场景 2026-01-23 16:15:16 +08:00
0c24dba4ea Merge remote-tracking branch 'origin/main' into Huang 2026-01-23 15:36:35 +08:00
3d77331722 更新配置包 添加山东威海场景 添加吉林长春北湖中控 2026-01-23 13:42:46 +08:00
ZYT
391c54af81 Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	Assets/_Zombie/Scripts/GameLocal.cs
2026-01-22 14:07:15 +08:00
ZYT
1ad28947d4 修改配置 2026-01-22 14:06:42 +08:00
416cdf5069 添加重庆侠客新场地(江西南昌新建旭辉广场)场景 2026-01-22 13:34:47 +08:00
ZYT
cb6441b4a2 更改打包 2026-01-21 18:00:52 +08:00
ZYT
62fbc134d5 更改配置 2026-01-21 17:43:00 +08:00
ZYT
c6d11c849d Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	Assets/_Zombie/Scripts/GameLocal.cs
2026-01-21 17:29:38 +08:00
ZYT
760e951f8a 更该配置包 2026-01-21 17:29:06 +08:00
ZYT
d0f13c3d27 改配置包 2026-01-21 17:02:20 +08:00
0007f7c3c0 添加吉林吉林场景 2026-01-21 16:52:58 +08:00
bzx
2f72e3b08d fix:使用完枪械 删除枪械,解决后期卡顿问题 2026-01-21 13:43:20 +08:00
7d584c3cd9 修改宁夏银川金凤新华联广场场景 2026-01-20 17:18:05 +08:00
12a48b28c1 添加宁夏银川金凤新华联广场场景 2026-01-20 17:03:21 +08:00
3a47e0525e 广东梅州打包失败 2026-01-20 15:51:24 +08:00
05a0851546 添加广东梅州场景 2026-01-20 15:21:27 +08:00
f66312b593 修改河南商丘场景 2026-01-20 14:25:01 +08:00
cd20ccb499 Merge branch 'Huang' of http://192.168.0.105:45441/PineappleTech/Zombie into Huang
# Conflicts:
#	Assets/_Zombie/Scenes/Henan_Shangqiu_Juyang_WuyueGuangchang.unity
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-19 18:24:26 +08:00
74dd79f7bb 添加河南商丘场景 2026-01-19 18:23:58 +08:00
eb1566f0a7 添加河南商丘场景 2026-01-19 18:04:28 +08:00
d500fa432e 添加江西南昌场景 2026-01-19 15:01:44 +08:00
ccb3b614ea 添加江西赣州龙南万达广场室内场景 2026-01-17 17:30:13 +08:00
ZYT
f19b721698 添加江西赣州陇南场景 2026-01-17 09:58:42 +08:00
ZYT
0341d7f292 添加辽宁大连普兰店万达广场场景 2026-01-16 15:35:47 +08:00
ZYT
80bb51e20b Merge remote-tracking branch 'origin/main' into main_ZYT 2026-01-15 14:00:41 +08:00
bzx
275619f2f4 fix:调整静态数据存储gamelocal 2026-01-15 13:55:34 +08:00
ZYT
208a784447 添加辽宁盘锦双台子双台城场景 2026-01-15 13:34:59 +08:00
bzx
accdca2ff4 add:添加中控控制脚本 2026-01-14 19:13:11 +08:00
ZYT
eb206db3c1 添加山东潍坊临朐万达广场室内场景 2026-01-12 10:18:25 +08:00
ZYT
e1ce45b115 修改吉林长春朝阳欧亚卖场场景 2026-01-08 10:04:16 +08:00
ZYT
71d0f52d5b 添加吉林长春朝阳欧亚卖场场景,修改南京浦口龙湖天街场景 2026-01-07 09:38:53 +08:00