Commit Graph

134 Commits

Author SHA1 Message Date
7c15702491 添加江西南昌西湖动物园室内,宁夏银川万达场景 2026-02-05 15:32:57 +08:00
70005a1dbd Merge remote-tracking branch 'origin/main_ZYT' into Huang
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2026-02-04 17:46:23 +08:00
5470402bd2 添加北京通州向日葵广场场景、河南开封室内、室外场景,北京密云场景,辽宁水游城场景,江西南昌西湖南昌动物园场景,陕西榆林场景,四川凉山场景;修改河南商丘场景、江苏徐州鼓楼欧乐堡场景 2026-02-04 17:45:21 +08:00
ZYT
1c29215b04 修改公司一楼,辽宁鞍山,北京通州场景,删除多余地形 2026-02-04 10:24:37 +08:00
d043eab5d3 为湖南常德添加新中控 2026-01-29 15:44:00 +08:00
145365f92d 添加山东济南室内外中控,江苏徐州鼓楼欧乐堡中控 2026-01-28 16:58:06 +08:00
309edca622 修改合并后的错误 2026-01-27 11:54:03 +08:00
0e10183fcc Merge remote-tracking branch 'origin/main_ZYT' into Huang
# Conflicts:
#	Assets/_Alice/Scripts/Base/GameLocal.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-27 11:28:05 +08:00
5bceb2df1f 添加山西运城万达广场场景 2026-01-27 11:27:05 +08:00
ZYT
55573afe13 添加湖南湘西永顺新天地商场场景 2026-01-27 10:52:12 +08:00
ZYT
83869387f9 Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-26 17:08:20 +08:00
34b8886231 添加北京通州场景 2026-01-26 13:55:13 +08:00
f1d4cd43db 添加安徽马鞍山、辽宁鞍山场景新中控 2026-01-23 17:27:59 +08:00
274a50eafa 添加吉林长春北湖中控,添加广东威海场景 2026-01-23 14:25:32 +08:00
5a33e7cd4c 修改甘肃金昌金川场景 2026-01-22 16:21:14 +08:00
15373383d8 添加重庆侠客新场地(江西南昌新建旭辉广场)场景 2026-01-22 12:01:15 +08:00
ZYT
9e46a6e344 Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-22 11:05:15 +08:00
07800889fc 打包吉林吉林场景 2026-01-21 16:44:33 +08:00
31d00eee21 添加吉林吉林场景 2026-01-21 13:50:08 +08:00
cf98194f5b 修改宁夏银川金凤新华联广场场景 2026-01-20 17:22:15 +08:00
46e35d4d22 添加宁夏银川金凤新华联广场场景 2026-01-20 16:51:35 +08:00
9c9719c70f 添加广东梅州场景 2026-01-20 11:26:51 +08:00
1012eff096 添加河南商丘场景 2026-01-19 18:03:09 +08:00
ZYT
3fd70811cd Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
2026-01-19 15:15:32 +08:00
ZYT
69db134c6c 打包 2026-01-19 15:15:17 +08:00
09e54a76fb 添加江西南昌场景 2026-01-19 14:58:23 +08:00
ZYT
bdbb4ad913 Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	ProjectSettings/EditorBuildSettings.asset
2026-01-17 16:38:09 +08:00
ZYT
8fbe48a6bf 修改辽宁大连普兰店万达广场场景 2026-01-17 16:37:46 +08:00
8f7aa9ec10 添加江西赣州龙南万达广场室内场景 2026-01-17 16:21:41 +08:00
4d74948f10 Merge branch 'Huang' of http://192.168.0.105:45441/PineappleTech/AliceBall into Huang
# Conflicts:
#	Assets/_Alice/Scenes/Jiangxi_Ganzhou_Longnan_WandaGuangchang.unity
2026-01-17 11:14:52 +08:00
2d3eae4acd 修改江西赣州龙南万达广场场景 2026-01-17 11:13:38 +08:00
82acecfbbb 修改江西赣州龙南万达广场场景 2026-01-17 11:12:41 +08:00
933eb8f4be 添加江西赣州龙南万达广场场景 2026-01-16 17:15:49 +08:00
bzx
411ee2f84a fix:调整项目场景位置 2026-01-16 16:31:09 +08:00
ZYT
6dc61ac753 修改辽宁大连普兰店万达广场场景 2026-01-16 15:37:03 +08:00
ZYT
63855259c7 Merge remote-tracking branch 'origin/Huang' into main_ZYT
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
2026-01-15 21:00:27 +08:00
ZYT
741c15cc8d 为吉林长春朝阳欧亚卖场添加中控脚本 2026-01-15 21:00:12 +08:00
692ae18801 修改辽宁大连场景 2026-01-15 20:56:01 +08:00
d695042072 Merge remote-tracking branch 'origin/main_ZYT' into Huang 2026-01-15 16:06:02 +08:00
d5494fd372 添加辽宁大连场景 2026-01-15 16:05:54 +08:00
bzx
f3f8a04931 add:添加中控控制脚本 2026-01-14 19:03:11 +08:00
ZYT
338d42e8ac 添加辽宁盘锦双台子双台城场景 2026-01-14 18:04:42 +08:00
ZYT
f469ce4a73 添加每个场景的AIPos 2026-01-12 14:29:40 +08:00
ZYT
a41e2d59fe 添加山东潍坊临朐万达广场室内场景,修改吉林长春朝阳欧亚卖场场景 2026-01-08 10:03:20 +08:00
ZYT
7b5f553926 添加吉林长春朝阳欧亚卖场场景,修改南京浦口龙湖天街场景 2026-01-07 09:38:38 +08:00
ZYT
beed8d6cd1 Merge remote-tracking branch 'origin/main' into main_ZYT
# Conflicts:
#	Assets/_Alice/Scripts/Base/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
2026-01-04 09:43:53 +08:00
ZYT
b25f0cf6d8 修改河北桃城场景,添加浙江温州,山东潍坊临朐万达广场场景 2026-01-04 09:43:17 +08:00
bzx
23fefe478d Merge remote-tracking branch 'origin/main_ZYT'
# Conflicts:
#	Assets/_Alice/Scripts/Base/GameManager.cs
#	ProjectSettings/ProjectSettings.asset
2025-12-27 12:29:33 +08:00
bzx
f7a5145341 调整银川场景,添加ai创建初始位置 2025-12-27 12:16:39 +08:00
ZYT
2994f5973f 添加衡水桃城,安徽马鞍山场景 2025-12-26 20:01:02 +08:00