Commit Graph

286 Commits

Author SHA1 Message Date
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
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
lq
051cfed454 事件数据传输修改 2024-12-09 14:20:37 +08:00
lq
6ee036b478 数据传输更改
数据传输更改
2024-12-09 14:12:43 +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
huyulong
d10d3775d8 proto文件修改以及npc寻路 2024-12-09 11:30:15 +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
cf40583796 修改 2024-12-08 14:13:31 +08:00
lq
e2f480b1ea 修改 2024-12-07 17:47:46 +08:00
lq
d04be15484 消防接口数据传输 2024-12-07 16:18:15 +08:00
huyulong
957e7cc035 add 2024-12-06 18:08:56 +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
83353b4aeb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:52:21 +08:00
huyulong
a8dbfec82d 任务显示修复 2024-12-06 11:52:15 +08:00
lq
93501dd2b0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-06 11:38:00 +08:00
lq
b383d7bf89 JSONReader覆盖 2024-12-06 11:37:41 +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
lq
e03032830a bug修改 2024-12-05 20:33:37 +08:00
huyulong
47787b8bfd 任务接口和相关函数 2024-12-05 20:21:15 +08:00
lq
feda86e6c3 Bug修改 2024-12-05 17:56:33 +08:00
huyulong
9598202d0f 新的接口接入 2024-12-05 17:38: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
358701471d 增加了common文件夹 2024-12-04 15:26:46 +08:00
huyulong
df819a7e54 更改ProtoBuffer相关文件位置 2024-12-04 15:10:27 +08:00
huyulong
5baf3a71b5 我盖 2024-12-04 15:05:38 +08:00
wulongxiao
1345268590 add 2024-12-04 11:22:32 +08:00
wulongxiao
14e656915a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-04 11:08:07 +08:00
wulongxiao
c78f0e18f7 add 2024-12-04 11:08:01 +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
44c0e6f8c9 test 2024-12-03 22:02:01 +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
b302e7fc00 加了Dotween和NPC的基类 2024-12-02 17:09:34 +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
20120af3ed Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-01 19:28:30 +08:00
huyulong
84925d637b test 2024-12-01 19:28:25 +08:00
lq
20525a4d96 UI脚本更改 2024-12-01 19:27:05 +08:00
huyulong
c55c4b4444 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-01 19:24:20 +08:00
huyulong
474beeff04 界面UI和UI逻辑 2024-12-01 19:24:07 +08:00
lq
f71b850f24 剧本数据串联 2024-12-01 17:51:09 +08:00
lq
350a7e0deb 应急疏散人员 2024-12-01 15:06:22 +08:00
lq
893f7368c1 配置表增加,接大部分所需传输数据的接口 2024-12-01 04:58:16 +08:00