Commit Graph

427 Commits

Author SHA1 Message Date
huyulong
a1787fd70d UI界面的命名规范 2024-12-11 17:41:14 +08:00
huyulong
99d2d7a7e8 修复prefab丢失bug 2024-12-11 17:07:18 +08:00
huyulong
f43fe7bf66 修复冲突 2024-12-11 17:00:42 +08:00
huyulong
da9598e483 Test 2024-12-11 16:55:55 +08:00
huyulong
f122a2e268 UI相关逻辑 2024-12-11 16:51:06 +08:00
lq
dba8c4a975 修改 2024-12-11 16:41:46 +08:00
lq
328c69e877 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/JSONReader/JSONReader.cs
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
2024-12-11 16:41:12 +08:00
lq
8f1c7cc03c 整体数据上传 2024-12-11 16:37:21 +08:00
huyulong
f0b9f206aa Taskjson的添加和Language文件的更新 2024-12-11 16:05:50 +08:00
lq
22f3b964c9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 16:00:12 +08:00
huyulong
480d7d6338 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
2024-12-11 15:58:15 +08:00
huyulong
48f4c0dc98 UI相关文件,以及Language表更新 2024-12-11 15:55:46 +08:00
lq
5f5bc751f3 修改 2024-12-11 15:53:49 +08:00
lq
e0ef89a8cf 修改 2024-12-11 15:50:06 +08:00
lq
56174ab2ff 修改 2024-12-11 15:35:11 +08:00
huyulong
e50511e1d7 Taskjson文件的读取和部分UI脚本 2024-12-11 15:27:54 +08:00
d606df27e0 逻辑写一半ProMax 2024-12-11 14:37:42 +08:00
huyulong
7506bda817 UI相关逻辑 2024-12-11 14:24:06 +08:00
huyulong
827332bcaa Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 11:15:47 +08:00
b5e67fdb51 小改 2024-12-11 11:15:20 +08:00
huyulong
e0275fd030 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 11:11:01 +08:00
huyulong
b66fe5fb38 FreePanel01相关UI逻辑 2024-12-11 11:10:48 +08:00
5cece435ae 玩家列表接口 2024-12-11 11:01:36 +08:00
lq
158082ec63 疏散人群公布弹窗修改 2024-12-11 01:32:11 +08:00
lq
0b05e7d0ef 修改 2024-12-10 23:24:15 +08:00
lq
94eb75df55 人员窗口弹窗 2024-12-10 21:34:19 +08:00
lq
7f831f0862 疏散人群公布修改 2024-12-10 18:14:08 +08:00
lq
96ba512839 界面隐藏 2024-12-10 15:02:05 +08:00
lq
307c28637b 主测试场景更改 2024-12-10 14:28:28 +08:00
lq
aaf0eb1408 疏散人群公布UI逻辑修改 2024-12-10 08:05:28 +08:00
a349a1ee86 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 06:21:18 +08:00
f035248e44 界面 2024-12-10 06:20:20 +08:00
huyulong
7741141765 UI变动 2024-12-10 06:11:25 +08:00
751e369ed8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 05:55:41 +08:00
huyulong
cc4315acbd 自由行动14UI完成 2024-12-10 05:50:29 +08:00
huyulong
977b4cd7d0 自由移动场景14 2024-12-10 05:16:49 +08:00
4c19dc9395 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 02:55:18 +08:00
huyulong
e89ba36f44 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 02:43:02 +08:00
huyulong
73ba252e4f 新增UI场景和相关图片 2024-12-10 02:42:52 +08:00
b3c3c8cda7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 02:40:37 +08:00
ad14e3f646 小智搞的!!!不是魅魔!!!!!,做完了指令行动UI了,还差逻辑 2024-12-10 02:40:30 +08:00
d9defe9230 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main 2024-12-10 00:43:05 +08:00
0981a8241d 2024-12-10 00:42:57 +08:00
huyulong
52b576f39b tip界面UI 2024-12-10 00:32:43 +08:00
huyulong
c0a4c6638b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 00:01:17 +08:00
d2f870bb12 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-10 00:00:05 +08:00
025221011a 主持人界面UI的制作完成 2024-12-09 23:59:47 +08:00
huyulong
b2889a0eb6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 23:54:26 +08:00
huyulong
c131c50fe4 两个UI场景 2024-12-09 23:54:17 +08:00
lq
5db2740f34 应急人员配置数据串联 2024-12-09 23:53:38 +08:00