|
|
26e6f4e6d1
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 20:01:23 +08:00 |
|
|
|
0e0fe09cbc
|
Language传入
|
2024-12-12 19:58:55 +08:00 |
|
huyulong
|
7464bc59ce
|
add
|
2024-12-12 19:58:12 +08:00 |
|
huyulong
|
b7948af071
|
add
|
2024-12-12 19:49:08 +08:00 |
|
huyulong
|
be71fcb864
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 19:15:19 +08:00 |
|
|
|
61643f2e48
|
模板Id传参
|
2024-12-12 19:14:48 +08:00 |
|
huyulong
|
5c755a28a0
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 18:51:16 +08:00 |
|
huyulong
|
d9af993db4
|
添加了NPC的管理类NPCController
|
2024-12-12 18:51:08 +08:00 |
|
|
|
3a3ff0429a
|
UI逻辑完善版，被啊胡（卡脖子）
|
2024-12-12 17:55:05 +08:00 |
|
|
|
1776a9fa2b
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 17:52:00 +08:00 |
|
|
|
bcd89311f7
|
UI逻辑完善版（被小胡卡脖子）
|
2024-12-12 17:51:05 +08:00 |
|
huyulong
|
8216fd8b4b
|
addd
|
2024-12-12 17:18:53 +08:00 |
|
huyulong
|
5d36ff9f2f
|
两个测试按钮，用来测试npc移动
|
2024-12-12 17:18:12 +08:00 |
|
huyulong
|
54a8aa476e
|
测试调用npc移动
|
2024-12-12 17:07:43 +08:00 |
|
huyulong
|
b4f601691d
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 17:00:29 +08:00 |
|
huyulong
|
df42382aa8
|
新增NpcMove接口
|
2024-12-12 17:00:17 +08:00 |
|
|
|
58716f26eb
|
弄完了火线指令UI及逻辑（不确定版本）
|
2024-12-12 16:36:07 +08:00 |
|
huyulong
|
f9356cc0d4
|
npc生成位置修复
|
2024-12-12 16:02:29 +08:00 |
|
huyulong
|
62c4d3a495
|
调整预制体的原数值
|
2024-12-12 15:53:16 +08:00 |
|
huyulong
|
4c012fd4b6
|
Npc生成和移动时x反转的修复
|
2024-12-12 15:48:41 +08:00 |
|
huyulong
|
82ab009094
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 15:37:42 +08:00 |
|
huyulong
|
8b3f6cf36c
|
场景模型更换
|
2024-12-12 15:37:38 +08:00 |
|
|
|
693bcf736e
|
人员数据上传更改
|
2024-12-12 15:34:43 +08:00 |
|
|
|
e34c97432c
|
人员数据上传
|
2024-12-12 15:21:07 +08:00 |
|
huyulong
|
3465b0042c
|
NPC生成和移动
|
2024-12-12 15:06:30 +08:00 |
|
huyulong
|
0fc572148d
|
Npc移动逻辑
|
2024-12-12 14:50:53 +08:00 |
|
huyulong
|
7217b04390
|
任务相关的变量加入
|
2024-12-12 11:04:48 +08:00 |
|
|
|
a69752b3d9
|
逻辑基本串了一下还差数据没弄
|
2024-12-12 09:18:00 +08:00 |
|
|
|
e29f7044df
|
人物信息
|
2024-12-11 21:28:05 +08:00 |
|
huyulong
|
980e2e96ac
|
Json文件读取代码调整，任务相关逻辑的编写
|
2024-12-11 20:54:34 +08:00 |
|
huyulong
|
c7cf4332da
|
任务相关逻辑
|
2024-12-11 20:16:45 +08:00 |
|
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 |
|
|
|
dba8c4a975
|
修改
|
2024-12-11 16:41:46 +08:00 |
|
|
|
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 |
|
|
|
8f1c7cc03c
|
整体数据上传
|
2024-12-11 16:37:21 +08:00 |
|
huyulong
|
f0b9f206aa
|
Taskjson的添加和Language文件的更新
|
2024-12-11 16:05:50 +08:00 |
|
|
|
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 |
|
|
|
5f5bc751f3
|
修改
|
2024-12-11 15:53:49 +08:00 |
|
|
|
e0ef89a8cf
|
修改
|
2024-12-11 15:50:06 +08:00 |
|
|
|
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 |
|
|
|
158082ec63
|
疏散人群公布弹窗修改
|
2024-12-11 01:32:11 +08:00 |
|
|
|
0b05e7d0ef
|
修改
|
2024-12-10 23:24:15 +08:00 |
|
|
|
94eb75df55
|
人员窗口弹窗
|
2024-12-10 21:34:19 +08:00 |
|
|
|
7f831f0862
|
疏散人群公布修改
|
2024-12-10 18:14:08 +08:00 |
|
|
|
96ba512839
|
界面隐藏
|
2024-12-10 15:02:05 +08:00 |
|
|
|
307c28637b
|
主测试场景更改
|
2024-12-10 14:28:28 +08:00 |
|
|
|
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 |
|
|
|
5db2740f34
|
应急人员配置数据串联
|
2024-12-09 23:53:38 +08:00 |
|
|
|
441a9a200c
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 23:28:34 +08:00 |
|
|
|
cde58b2894
|
小智做的不是刘亮!!!!!!!指令行动1-7,有些在同一个panel里
|
2024-12-09 23:28:21 +08:00 |
|
|
|
f6ac4bd6bd
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main
|
2024-12-09 23:18:03 +08:00 |
|
|
|
f0000064bb
|
add
|
2024-12-09 23:17:47 +08:00 |
|
huyulong
|
ca14e5e3cb
|
第二个UI场景
|
2024-12-09 22:47:49 +08:00 |
|
huyulong
|
b987f7f540
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 21:26:22 +08:00 |
|
|
|
93583c39e2
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 21:25:26 +08:00 |
|
|
|
21790b3aae
|
提交主持人界面的UI
|
2024-12-09 21:24:46 +08:00 |
|
huyulong
|
4c6485629c
|
add自由移动02场景
|
2024-12-09 21:23:31 +08:00 |
|
|
|
914c20306c
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 21:22:54 +08:00 |
|
|
|
a1698498ab
|
下拉框
|
2024-12-09 21:22:46 +08:00 |
|
huyulong
|
7cc351f404
|
场景的UI图片
|
2024-12-09 20:29:52 +08:00 |
|
huyulong
|
1011de6d2d
|
自由行动第一个UI
|
2024-12-09 19:42:46 +08:00 |
|
|
|
d8e5ca443e
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 15:37:24 +08:00 |
|
|
|
ddfaf5715e
|
火灾指令式行动场景搭建
|
2024-12-09 15:37:08 +08:00 |
|
huyulong
|
d5ad76e1d6
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 15:35:44 +08:00 |
|
huyulong
|
9cbee4b513
|
自由行动相关UI的添加和场景的创建
|
2024-12-09 15:35:32 +08:00 |
|
|
|
051cfed454
|
事件数据传输修改
|
2024-12-09 14:20:37 +08:00 |
|
|
|
6ee036b478
|
数据传输更改
数据传输更改
|
2024-12-09 14:12:43 +08:00 |
|
