Commit Graph

80 Commits

Author SHA1 Message Date
LMZ
e50bf861f4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Res/FreeAction/03/btn_sssx02.png.meta
#	xiaofang/Assets/Res/FreeAction/03/img_commontip_frame.png.meta
2024-12-17 16:31:04 +08:00
LMZ
e0f9c2e1f0 被迫提交 2024-12-17 16:28:38 +08:00
huyulong
e7fe39da5e 模型更换 2024-12-17 16:23:27 +08:00
huyulong
b6f66918b3 新场景模型及烘焙 2024-12-17 09:58:07 +08:00
杨号敬
ee11d8aa03 消防栓 2024-12-16 20:29:28 +08:00
LMZ
dbd00a9734 累了,毁灭把(等待其他指令传达信息再读表修改数据) 2024-12-16 17:17:46 +08:00
huyulong
e4f8365208 预制体的添加 2024-12-16 17:09:32 +08:00
杨号敬
5743caeea9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-16 15:30:58 +08:00
杨号敬
a7c5b49939 任务配置 2024-12-16 15:28:35 +08:00
huyulong
bb72e78fb4 场景模型替换 2024-12-16 15:01:50 +08:00
LMZ
dd726a950a aaaaaaa 2024-12-16 09:44:53 +08:00
LMZ
1eeb4cd49b 串好啦啦啦啦啦啦啦啦(mini版本) 2024-12-15 17:11:33 +08:00
huyulong
ab6f57ce72 调整npc碰撞体 2024-12-14 15:45:04 +08:00
huyulong
52ba7a2567 寻路逻辑,给每个npc一个目标点 2024-12-14 15:01:16 +08:00
huyulong
42aed4e26e 换模型 2024-12-13 19:40:29 +08:00
huyulong
e1942ce8f5 任务的逻辑及相关脚本的添加,NPC移动的逻辑改动 2024-12-13 17:19:27 +08:00
huyulong
9aa45fe1d0 地图的贴图 2024-12-13 11:09:28 +08:00
huyulong
630a853c21 将npc移动改成navmesh的方法移动 2024-12-13 09:43:21 +08:00
LMZ
58716f26eb 弄完了火线指令UI及逻辑(不确定版本) 2024-12-12 16:36:07 +08:00
huyulong
62c4d3a495 调整预制体的原数值 2024-12-12 15:53:16 +08:00
huyulong
8b3f6cf36c 场景模型更换 2024-12-12 15:37:38 +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
LMZ
a69752b3d9 逻辑基本串了一下还差数据没弄 2024-12-12 09:18:00 +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
da9598e483 Test 2024-12-11 16:55:55 +08:00
huyulong
f122a2e268 UI相关逻辑 2024-12-11 16:51:06 +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
7f831f0862 疏散人群公布修改 2024-12-10 18:14:08 +08:00
lq
96ba512839 界面隐藏 2024-12-10 15:02:05 +08:00
lq
aaf0eb1408 疏散人群公布UI逻辑修改 2024-12-10 08:05:28 +08:00
huyulong
cc4315acbd 自由行动14UI完成 2024-12-10 05:50:29 +08:00
huyulong
977b4cd7d0 自由移动场景14 2024-12-10 05:16:49 +08:00
ad14e3f646 小智搞的!!!不是魅魔!!!!!,做完了指令行动UI了,还差逻辑 2024-12-10 02:40:30 +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
914c20306c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-09 21:22:54 +08:00