Commit Graph

260 Commits

Author SHA1 Message Date
huyulong
630a853c21 将npc移动改成navmesh的方法移动 2024-12-13 09:43:21 +08:00
huyulong
7464bc59ce add 2024-12-12 19:58:12 +08:00
lq
61643f2e48 模板Id传参 2024-12-12 19:14:48 +08:00
LMZ
1776a9fa2b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-12 17:52:00 +08:00
LMZ
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
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
LMZ
58716f26eb 弄完了火线指令UI及逻辑(不确定版本) 2024-12-12 16:36:07 +08:00
huyulong
4c012fd4b6 Npc生成和移动时x反转的修复 2024-12-12 15:48:41 +08:00
huyulong
8b3f6cf36c 场景模型更换 2024-12-12 15:37:38 +08:00
lq
e34c97432c 人员数据上传 2024-12-12 15:21:07 +08:00
huyulong
3465b0042c NPC生成和移动 2024-12-12 15:06:30 +08:00
huyulong
7217b04390 任务相关的变量加入 2024-12-12 11:04:48 +08:00
LMZ
a69752b3d9 逻辑基本串了一下还差数据没弄 2024-12-12 09:18:00 +08:00
huyulong
a1787fd70d UI界面的命名规范 2024-12-11 17:41:14 +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
8f1c7cc03c 整体数据上传 2024-12-11 16:37:21 +08:00
huyulong
f0b9f206aa Taskjson的添加和Language文件的更新 2024-12-11 16:05:50 +08:00
lq
5f5bc751f3 修改 2024-12-11 15:53:49 +08:00
lq
56174ab2ff 修改 2024-12-11 15:35:11 +08:00
d606df27e0 逻辑写一半ProMax 2024-12-11 14:37:42 +08:00
huyulong
7506bda817 UI相关逻辑 2024-12-11 14:24:06 +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
lq
158082ec63 疏散人群公布弹窗修改 2024-12-11 01:32:11 +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
huyulong
7741141765 UI变动 2024-12-10 06:11:25 +08:00
huyulong
cc4315acbd 自由行动14UI完成 2024-12-10 05:50:29 +08:00
huyulong
977b4cd7d0 自由移动场景14 2024-12-10 05:16:49 +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
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
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
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
9cbee4b513 自由行动相关UI的添加和场景的创建 2024-12-09 15:35:32 +08:00
huyulong
1200fb2dc8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 11:57:03 +08:00
huyulong
e170fc08c3 Select表的添加和读取 2024-12-09 11:56:53 +08:00
lq
53f0e64108 更改为测试版本 2024-12-09 11:37:36 +08:00
lq
0462282d61 PanelToggle更改 2024-12-09 11:09:39 +08:00
lq
4a1837a740 选择剧本更改 2024-12-09 09:53:48 +08:00
huyulong
39920f011c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 09:47:03 +08:00
huyulong
e4c0491f53 任务栏的按钮调整 2024-12-09 09:46:52 +08:00
lq
e2f480b1ea 修改 2024-12-07 17:47:46 +08:00
lq
d04be15484 消防接口数据传输 2024-12-07 16:18:15 +08:00
huyulong
e4f4fdf66e add 2024-12-06 17:43:38 +08:00
huyulong
33c0586519 boy1材质和贴图 2024-12-06 17:24:23 +08:00
huyulong
00c4e2bc74 测试boy模型完毕,动作可用 2024-12-06 16:43:56 +08:00
huyulong
76b7259a13 任务隐藏和显示的动画 2024-12-06 16:24:45 +08:00
lq
8bb12d1eb3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 15:44:18 +08:00
lq
3d8b063137 场景选中事件出现 2024-12-06 15:43:36 +08:00
huyulong
44a81c31a7 人物受伤屏幕闪红 2024-12-06 15:15:30 +08:00
huyulong
3dd80a3816 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:29:32 +08:00
huyulong
8729b82472 任务相关逻辑,以及任务显示逻辑 2024-12-06 11:29:20 +08:00
lq
1f5c12cde9 BUG更改 2024-12-05 23:10:33 +08:00
huyulong
47787b8bfd 任务接口和相关函数 2024-12-05 20:21:15 +08:00
lq
feda86e6c3 Bug修改 2024-12-05 17:56:33 +08:00
huyulong
7496a6effd 更新common文件,将相关proto文件移到项目中,任务系统UI和json读取 2024-12-05 16:31:46 +08:00
lq
cecf3989b3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-05 15:39:20 +08:00
lq
effc389683 选择场景数据串联更改 2024-12-05 15:39:10 +08:00
huyulong
13f74a2139 add 2024-12-05 09:21:07 +08:00
lq
1d623866c4 Language设置 2024-12-04 22:58:31 +08:00
huyulong
46ec56f0f6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-04 16:40:59 +08:00
huyulong
3e3888fb9c 扣血逻辑 2024-12-04 16:40:48 +08:00
lq
2454ea9555 应急人员配置点击变色更改 2024-12-04 16:37:51 +08:00
huyulong
74d838b4ff Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-04 10:59:04 +08:00
huyulong
724b00c690 灭火器位置,角色的基类 2024-12-04 10:58:48 +08:00
杨号敬
ded7aad782 回放6修改 2024-12-04 09:56:33 +08:00
huyulong
89e13177f7 整合UI 2024-12-02 19:44:46 +08:00
lq
53f6f2eea6 人员配置点击修改 2024-12-02 19:40:49 +08:00
杨号敬
c63a323117 回放系统1-6 2024-12-02 17:15:15 +08:00
huyulong
e56213a52d 更改模型结构,方便以后更改人物模型 2024-12-02 15:09:22 +08:00
lq
975d8aac61 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-02 10:50:51 +08:00
lq
56fb511330 人员配置修改 2024-12-02 10:50:31 +08:00