Commit Graph

399 Commits

Author SHA1 Message Date
huyulong
58fa69a3b9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-16 15:02:02 +08:00
huyulong
bb72e78fb4 场景模型替换 2024-12-16 15:01:50 +08:00
杨号敬
7632a3f057 路径测试2 2024-12-16 14:14:25 +08:00
杨号敬
a3e794dd82 路径测试1 2024-12-16 12:01:51 +08:00
杨号敬
144727feb3 路径测试 2024-12-16 11:58:13 +08:00
huyulong
ce28192126 相机角度调整 2024-12-16 11:48:57 +08:00
杨号敬
fd4087570c NPCtext2 2024-12-16 10:30:18 +08:00
杨号敬
d98d907ca2 NPctext 2024-12-16 10:24:19 +08:00
lq
0fa701719b jSon文件拖入 2024-12-16 09:51:35 +08:00
LMZ
0ee5f60376 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-16 09:45:06 +08:00
LMZ
dd726a950a aaaaaaa 2024-12-16 09:44:53 +08:00
huyulong
9233e9377d 111 2024-12-16 09:42:44 +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
ab6f57ce72 调整npc碰撞体 2024-12-14 15:45:04 +08:00
huyulong
3d84708b83 npc暂时不能移动 2024-12-14 15:43:47 +08:00
huyulong
fbc97ff6f5 npc寻路 2024-12-14 15:19:22 +08:00
huyulong
52ba7a2567 寻路逻辑,给每个npc一个目标点 2024-12-14 15:01:16 +08:00
huyulong
aea6ce1bfa npc 2024-12-14 14:42:47 +08:00
huyulong
e5c5f68ac5 寻路相关逻辑更改 2024-12-14 14:31:48 +08:00
huyulong
24266873f8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-13 20:18:35 +08:00
huyulong
ce8b5533af NPC寻路还有一点问题 2024-12-13 20:18:23 +08:00
lq
cb3052a324 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-13 20:17:47 +08:00
lq
2303dd14fa 疏散人群公布修改 2024-12-13 20:17:37 +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
ddc46a22ef 移动调整 2024-12-13 19:33:27 +08:00
huyulong
b50088ffdf 移动 2024-12-13 19:31:29 +08:00
huyulong
93ec2f5d86 移动 2024-12-13 19:29:43 +08:00
huyulong
65018a1dd2 移动修改 2024-12-13 19:27:04 +08:00
huyulong
4ca91767bb npc移动逻辑 2024-12-13 19:23:39 +08:00
huyulong
7e7c986885 移动逻辑修改 2024-12-13 19:17:57 +08:00
huyulong
b5df614e9c npc移动逻辑 2024-12-13 19:11:14 +08:00
huyulong
44894803bb npc生成逻辑 2024-12-13 17:48:37 +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
9aa45fe1d0 地图的贴图 2024-12-13 11:09:28 +08:00
huyulong
397c98dbb3 navmesh烘焙路径 2024-12-13 10:17:50 +08:00
huyulong
436b55ebb1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-13 09:43:31 +08:00
huyulong
630a853c21 将npc移动改成navmesh的方法移动 2024-12-13 09:43:21 +08:00
lq
073f34d888 疏散人群公布返回其他界面报空修改 2024-12-12 20:50:17 +08:00
lq
26e6f4e6d1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-12 20:01:23 +08:00
lq
0e0fe09cbc Language传入 2024-12-12 19:58:55 +08:00
huyulong
7464bc59ce add 2024-12-12 19:58:12 +08:00
huyulong
b7948af071 add 2024-12-12 19:49:08 +08:00
huyulong
be71fcb864 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-12 19:15:19 +08:00
lq
61643f2e48 模板Id传参 2024-12-12 19:14:48 +08:00
huyulong
5c755a28a0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-12 18:51:16 +08:00
huyulong
d9af993db4 添加了NPC的管理类NPCController 2024-12-12 18:51:08 +08:00
LMZ
3a3ff0429a UI逻辑完善版,被啊胡(卡脖子) 2024-12-12 17:55:05 +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
54a8aa476e 测试调用npc移动 2024-12-12 17:07:43 +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
f9356cc0d4 npc生成位置修复 2024-12-12 16:02:29 +08:00
huyulong
62c4d3a495 调整预制体的原数值 2024-12-12 15:53:16 +08:00
huyulong
4c012fd4b6 Npc生成和移动时x反转的修复 2024-12-12 15:48:41 +08:00
huyulong
82ab009094 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-12 15:37:42 +08:00
huyulong
8b3f6cf36c 场景模型更换 2024-12-12 15:37:38 +08:00
lq
693bcf736e 人员数据上传更改 2024-12-12 15:34:43 +08:00
lq
e34c97432c 人员数据上传 2024-12-12 15:21:07 +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
lq
e29f7044df 人物信息 2024-12-11 21:28:05 +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
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
dba8c4a975 修改 2024-12-11 16:41:46 +08:00
lq
328c69e877 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/JSONReader/JSONReader.cs
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
2024-12-11 16:41:12 +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
22f3b964c9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 16:00:12 +08:00
huyulong
480d7d6338 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
# Conflicts:
#	xiaofang/Assets/Script/UI/TemplateInfo.cs
2024-12-11 15:58:15 +08:00
huyulong
48f4c0dc98 UI相关文件,以及Language表更新 2024-12-11 15:55:46 +08:00
lq
5f5bc751f3 修改 2024-12-11 15:53:49 +08:00
lq
e0ef89a8cf 修改 2024-12-11 15:50:06 +08:00
lq
56174ab2ff 修改 2024-12-11 15:35:11 +08:00
huyulong
e50511e1d7 Taskjson文件的读取和部分UI脚本 2024-12-11 15:27:54 +08:00
d606df27e0 逻辑写一半ProMax 2024-12-11 14:37:42 +08:00
huyulong
7506bda817 UI相关逻辑 2024-12-11 14:24:06 +08:00
huyulong
827332bcaa Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-11 11:15:47 +08:00
b5e67fdb51 小改 2024-12-11 11:15:20 +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
5cece435ae 玩家列表接口 2024-12-11 11:01:36 +08:00
lq
158082ec63 疏散人群公布弹窗修改 2024-12-11 01:32:11 +08:00
lq
0b05e7d0ef 修改 2024-12-10 23:24:15 +08:00
lq
94eb75df55 人员窗口弹窗 2024-12-10 21:34:19 +08:00