Commit Graph

625 Commits

Author SHA1 Message Date
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
e80d187860 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
2024-12-05 20:25:14 +08:00
huyulong
47787b8bfd 任务接口和相关函数 2024-12-05 20:21:15 +08:00
lq
a4a078d93a bug修改 2024-12-05 20:02:27 +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