Commit Graph

351 Commits

Author SHA1 Message Date
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
huyulong
c7464b65c7 add 2024-12-02 10:48:25 +08:00
huyulong
92840d4957 UI层逻辑代码以及配置表的接入 2024-12-02 02:47:29 +08:00
huyulong
5af6fe0d54 应急人群公布 2024-12-02 01:46:57 +08:00
lq
fb60729d67 所有 2024-12-02 00:35:53 +08:00
huyulong
ffffa196a4 json文件接入 2024-12-01 23:00:40 +08:00
lq
44ea8baf75 数据串联 2024-12-01 22:36:41 +08:00
huyulong
c28cca2d95 UI逻辑bug修复,准备接数据 2024-12-01 22:24:03 +08:00
huyulong
84925d637b test 2024-12-01 19:28:25 +08:00
huyulong
474beeff04 界面UI和UI逻辑 2024-12-01 19:24:07 +08:00
lq
350a7e0deb 应急疏散人员 2024-12-01 15:06:22 +08:00
lq
893f7368c1 配置表增加,接大部分所需传输数据的接口 2024-12-01 04:58:16 +08:00
lq
7e8fee2657 日期界面的的显示逻辑更改 2024-11-30 23:32:17 +08:00
lq
f061cf37a3 本地配置表解析 2024-11-30 18:15:51 +08:00
杨号敬
f908b4f0a6 yhj1 2024-11-30 17:43:21 +08:00
huyulong
826b1824f1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-30 16:52:45 +08:00
huyulong
5662f186af 广播NPC位置,让NPC移动,更改玩家模型,写了个假的返回值 2024-11-30 16:52:33 +08:00
lq
e644437eb2 UI修改 2024-11-30 16:19:19 +08:00
2e16b88891 添加场景跟文本框脚本 2024-11-30 15:11:53 +08:00
lq
994a519ae2 逻辑更改 2024-11-30 10:19:52 +08:00
huyulong
8ccbc2bc14 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 20:06:04 +08:00
huyulong
b025a98b33 websocket相关代码改动 2024-11-29 20:05:55 +08:00
lq
343b2f59a6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 20:05:33 +08:00
lq
9e826b643d UI更改 2024-11-29 20:05:19 +08:00
huyulong
1004dab9da Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 16:21:29 +08:00
huyulong
a39b24936b UI逻辑 2024-11-29 16:20:58 +08:00
lq
23a440edf5 日历 2024-11-29 16:19:12 +08:00
GL
811a4c3512 选择演练未选中按钮的禁用 2024-11-29 14:44:18 +08:00
lq
dddce7611a 场景选择更改和剧本部分更改 2024-11-28 22:02:35 +08:00
lq
5d16c5db3a 剧本UI逻辑更改,疏散人群UI部分逻辑编写 2024-11-28 11:56:28 +08:00
lq
3a93a71921 选择剧本和疏散人群公布逻辑编写 2024-11-28 01:31:46 +08:00
lq
96039b8e08 UI更改 2024-11-27 23:59:00 +08:00
lq
2833129a25 UI逻辑更改 2024-11-27 16:54:09 +08:00
lq
9d79de6f6e ui逻辑 2024-11-27 02:11:27 +08:00
lq
4867a2ac6a UI史山更改 2024-11-26 18:24:12 +08:00
lq
68e60a08d7 UI修改及拼接 2024-11-26 15:36:02 +08:00
huyulong
6dbe316c91 写好获取点击位置的名称传入结构体 2024-11-25 17:28:47 +08:00
huyulong
5da149088a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-25 17:16:45 +08:00
huyulong
e628bf2ddc 消防演练场景UI逻辑代码 2024-11-25 17:16:41 +08:00
lq
1f5d6d90e7 事件选择UI逻辑 2024-11-25 17:15:16 +08:00
huyulong
62e44f2cf5 添加UI脚本以及相关代码 2024-11-25 16:33:54 +08:00
huyulong
4ed4a6076f 登录完成 2024-11-25 10:54:30 +08:00
huyulong
6fd35d739c 登录脚本 2024-11-25 10:18:49 +08:00
huyulong
5382863b0b add 接口相关代码 2024-11-23 14:08:04 +08:00
dc6bcb85bf 接口 2024-11-21 13:55:05 +08:00
b1edcafa6c 2024-11-20 14:58:50 +08:00
huyulong
157401732c 修改 2024-11-20 14:37:08 +08:00
huyulong
a65704d9f7 加入了楼的模型,调整了楼的碰撞体 2024-11-20 07:01:28 +08:00
huyulong
27c938b77b 修复了灭火灭一半逃跑被卡住的bug 2024-11-20 03:42:04 +08:00
huyulong
35427a2b78 更改人物模型 2024-11-20 03:09:02 +08:00
856eb5caac 修复视角和火焰以及手触分区的Bug 2024-11-19 23:18:17 +08:00
099e712626 覆盖2 2024-11-19 16:30:22 +08:00
wulongxiao
027399561f UI增加和更改,视角移动修复test 2024-11-19 15:32:45 +08:00
huyulong
2866ead9c9 修改摇杆的代码 2024-11-19 10:30:41 +08:00
huyulong
6bbdfc0a8e 1 2024-11-18 15:43:00 +08:00
lq
a40465e742 更改UI适配 2024-11-15 16:44:48 +08:00
huyulong
e392d30e79 修复UI在特殊分辨率下无法自动拉伸 2024-11-15 12:00:53 +08:00
huyulong
eeee0e13c8 add 2024-11-14 17:32:30 +08:00
lq
36a1dc6a3a add 2024-11-14 17:05:32 +08:00
lq
fb23149d92 add 2024-11-14 17:02:38 +08:00
lq
8edd235394 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-14 16:57:11 +08:00
lq
c600e07c77 add 2024-11-14 16:56:57 +08:00
lq
2ca4b8546a add 2024-11-14 16:53:34 +08:00
huyulong
9f2837e7bb add 2024-11-14 16:52:39 +08:00
huyulong
2c88fbdd78 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-14 16:46:33 +08:00
huyulong
720ae050ce add 2024-11-14 16:45:46 +08:00
lq
65dfbbc128 add 2024-11-14 11:13:55 +08:00
lq
f1363a1f6a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-14 10:59:35 +08:00
lq
39fb303c42 add 2024-11-14 10:55:41 +08:00
huyulong
a4768da868 add 2024-11-14 10:53:28 +08:00
wulongxiao
6d8e42becc add 2024-11-14 09:06:45 +08:00
wulongxiao
4f08b201af add 2024-11-13 15:18:59 +08:00
hyskai
2b5f9b33c5 add 2024-11-12 16:58:29 +08:00
hyskai
3b5b8b8365 add 2024-11-12 10:42:00 +08:00
hyskai
003210b4dd add 2024-11-11 23:16:11 +08:00
hyskai
47ab32f9bc add 2024-11-11 19:46:42 +08:00
hyskai
61c3ecb90b add 2024-11-11 11:46:15 +08:00
hyskai
5e1e62e684 add 2024-11-11 11:19:33 +08:00
hyskai
d669df6098 add 2024-11-11 10:23:57 +08:00
hyskai
a542e3c457 Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang 2024-11-08 18:12:11 +08:00
hyskai
b82e10a44c add 2024-11-08 18:11:34 +08:00
GL
dbbfab6a6c add 2024-11-08 17:37:40 +08:00
GL
5b14263a71 Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang 2024-11-08 16:50:59 +08:00
GL
bc34713a43 add 2024-11-08 16:45:54 +08:00
hyskai
aa141d2eaa add 2024-11-08 16:27:31 +08:00
hyskai
4e6b54523e add 2024-11-08 16:04:27 +08:00
hyskai
75513e4127 add 2024-11-08 15:32:26 +08:00
hyskai
3402bc7ec1 add 2024-11-08 14:45:16 +08:00
GL
0f6e9bd8d9 add 2024-11-08 14:32:14 +08:00
hyskai
d62effb435 add 2024-11-07 19:13:50 +08:00
hyskai
d798b89f25 add 2024-11-07 09:21:53 +08:00
hyskai
c202f9a0ce add 2024-11-06 11:28:04 +08:00
279527db37 add 2024-11-06 10:16:26 +08:00
d929c18bc3 add 2024-10-24 18:01:55 +08:00
81549fdb3d add 2024-10-24 12:46:20 +08:00
e68031d5b5 add 2024-10-24 09:23:47 +08:00
f6b3a3986d Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang
# Conflicts:
#	xiaofang/Assets/Scenes/firetest.unity
#	xiaofang/Assets/Script/Item/Fire.cs
#	xiaofang/Assets/Script/npc/DiStributionbox.cs
2024-10-23 20:58:35 +08:00
1c7899c2e2 add 2024-10-23 20:48:23 +08:00
hyskai
c71184e68d add 2024-10-23 15:13:58 +08:00
hyskai
88f758b93a add 2024-10-23 14:30:28 +08:00
a56ce491ae add 2024-10-23 14:29:00 +08:00
84a330f459 add 2024-10-23 11:31:35 +08:00
hyskai
7d6b6f49ca add 2024-10-23 11:29:08 +08:00
93aad738cf Merge branch 'main' of http://192.168.2.19:3000/hyskai/_xiaofang 2024-10-22 17:37:52 +08:00
c14ca68b16 ADD 2024-10-22 17:37:42 +08:00
hyskai
8e99a48e22 add 2024-10-22 17:31:48 +08:00
e54542c0f3 add 2024-10-22 11:57:50 +08:00
b7298a00c4 add 2024-10-21 18:09:07 +08:00
156e684f99 add 2024-10-21 17:21:28 +08:00
hyskai
c0b240e081 add 2024-10-21 16:51:26 +08:00