Commit Graph

338 Commits

Author SHA1 Message Date
杨号敬
96391fa3bb 灭火bug 2024-12-24 10:58:23 +08:00
LMZ
4427015945 小小提交一下,就一下下 2024-12-23 19:12:48 +08:00
杨号敬
dd4e7592fa 场景触发 2024-12-23 17:54:17 +08:00
杨号敬
44400ea519 触发 2024-12-23 17:36:09 +08:00
huyulong
45e22987c0 播放动画时细节跳转 2024-12-23 17:28:00 +08:00
huyulong
31d185d6a5 Tmap的还原 2024-12-23 16:59:26 +08:00
杨号敬
986346264d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Scenes/Tmap 1.unity
2024-12-23 16:53:17 +08:00
杨号敬
ba80b25302 触发 2024-12-23 16:46:43 +08:00
lq
134eeda58d 配置表及Json数据类型修改 2024-12-23 16:02:57 +08:00
e0772cb409 上帝视角图标 2024-12-23 15:02:55 +08:00
97bb77af26 图标添加,UI逻辑修改 2024-12-23 14:46:56 +08:00
lq
ec305be7cb 难度传值修改 2024-12-23 14:28:02 +08:00
huyulong
e7920a7662 add 2024-12-23 11:42:24 +08:00
huyulong
598d2ebc44 npc的状态 2024-12-23 09:55:15 +08:00
LMZ
e68872263e 小小提交一下,存在感+1 2024-12-20 18:50:23 +08:00
lq
8fd9d76b66 缺少职业显示 2024-12-20 17:57:13 +08:00
杨号敬
18d3348bc3 摄像机2 2024-12-20 17:27:42 +08:00
杨号敬
c308ff18c0 摄像机 2024-12-20 17:24:11 +08:00
杨号敬
163bb10049 消防栓 2024-12-20 14:38:57 +08:00
07cf76891f 回放和主持人 2024-12-20 10:10:19 +08:00
lq
7b9a6325be Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-19 21:41:22 +08:00
lq
d9524370e4 判断人员是否满足条件 2024-12-19 21:41:03 +08:00
huyulong
56bcbc38ae 字号调整 2024-12-19 17:14:14 +08:00
huyulong
bb176dd6eb 可交互的提示,目标点提示 2024-12-19 16:06:06 +08:00
huyulong
70c94505e3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-19 15:04:28 +08:00
huyulong
a9b7d0022d 拖动视角,可交互对象和任务添加 2024-12-19 15:04:19 +08:00
lq
dfdf0047a8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-19 14:12:14 +08:00
lq
fd1fac3e63 三级面板重构 2024-12-19 14:11:11 +08:00
huyulong
910f3f28a6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-19 11:59:38 +08:00
huyulong
4b79e37679 视角摇杆控制 2024-12-19 11:54:47 +08:00
LMZ
42faa0abed 甲方geigei要求我上传的 2024-12-19 11:31:55 +08:00
LMZ
835f20a3ca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-18 23:13:49 +08:00
LMZ
3253c19bcd 忽冷忽热ProMax 2024-12-18 23:13:30 +08:00
huyulong
7f82478353 配电箱的提示UI 2024-12-18 20:42:08 +08:00
huyulong
3d8c75df12 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-18 19:21:19 +08:00
huyulong
a667d525be 相机移动的调整 2024-12-18 19:21:11 +08:00
杨号敬
c6078772a9 配电箱 2024-12-18 19:19:27 +08:00
杨号敬
338bdf8205 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-18 17:11:48 +08:00
杨号敬
ba00ada486 水管 2024-12-18 17:11:40 +08:00
huyulong
840e0cd26e 相机控制旋转动画 2024-12-18 16:35:39 +08:00
杨号敬
f55ae148eb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-18 11:38:21 +08:00
杨号敬
462dc697ef 水管 2024-12-18 11:38:13 +08:00
huyulong
4893ba37db Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-18 11:17:50 +08:00
huyulong
bd16418df5 相机控制 2024-12-18 11:17:37 +08:00
lq
71e68b463c 应急人员配置数据上传修改 2024-12-18 10:22:19 +08:00
杨号敬
fb63f81118 水管 2024-12-18 03:03:46 +08:00
lq
e402949286 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-17 22:56:07 +08:00
lq
587ef1aec3 疏散人员配置修改 2024-12-17 22:55:13 +08:00
huyulong
4f934c717b 模型调整 2024-12-17 21:59:07 +08:00
huyulong
4f84e1947a 新的地图烘焙 2024-12-17 17:50:26 +08:00
huyulong
5156519b91 场景人物模型的替换 2024-12-17 17:31:38 +08:00
杨号敬
498174a1a5 水灭火 2024-12-17 17:27:46 +08:00
杨号敬
ed10cbc8ab 2024-12-17 17:06:14 +08:00
LMZ
e0f9c2e1f0 被迫提交 2024-12-17 16:28:38 +08:00
lq
3d4197bf93 疏散人群公布修改 2024-12-17 16:01:03 +08:00
LMZ
92c61ae09c UI改了动效,张叁严选版 2024-12-17 14:08:52 +08:00
杨号敬
520b78d60a 消防水 2024-12-17 12:00:17 +08:00
杨号敬
4c8f51270e 消防栓水管 2024-12-17 10:58:51 +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
huyulong
dbf5da1dea 模型更改后重新烘焙场景 2024-12-16 15:07:58 +08:00
huyulong
ae9a1e705e 命名规范更新 2024-12-16 15:04:53 +08:00
huyulong
ce28192126 相机角度调整 2024-12-16 11:48:57 +08:00
lq
0fa701719b jSon文件拖入 2024-12-16 09:51:35 +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
d46b3e56de npc寻路逻辑完成 2024-12-14 16:33:31 +08:00
huyulong
609550513f add 2024-12-14 16:01:31 +08:00
huyulong
3d84708b83 npc暂时不能移动 2024-12-14 15:43:47 +08:00
huyulong
ce8b5533af NPC寻路还有一点问题 2024-12-13 20:18:23 +08:00
huyulong
87574c81d7 重新烘焙 2024-12-13 19:46:36 +08:00
huyulong
c23857dde6 add模型 2024-12-13 19:40:55 +08:00
huyulong
42aed4e26e 换模型 2024-12-13 19:40:29 +08:00
huyulong
e1942ce8f5 任务的逻辑及相关脚本的添加,NPC移动的逻辑改动 2024-12-13 17:19:27 +08:00
lq
4451817b92 Language.json修改 2024-12-13 15:30:41 +08:00
huyulong
397c98dbb3 navmesh烘焙路径 2024-12-13 10:17:50 +08:00
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