Commit Graph

316 Commits

Author SHA1 Message Date
杨号敬
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
杨号敬
d98d907ca2 NPctext 2024-12-16 10:24:19 +08:00
lq
0fa701719b jSon文件拖入 2024-12-16 09:51:35 +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
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
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
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
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
0e0fe09cbc Language传入 2024-12-12 19:58:55 +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
5d36ff9f2f 两个测试按钮,用来测试npc移动 2024-12-12 17:18:12 +08:00
LMZ
58716f26eb 弄完了火线指令UI及逻辑(不确定版本) 2024-12-12 16:36:07 +08:00
lq
693bcf736e 人员数据上传更改 2024-12-12 15:34:43 +08:00
lq
e34c97432c 人员数据上传 2024-12-12 15:21:07 +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
7f831f0862 疏散人群公布修改 2024-12-10 18:14:08 +08:00
lq
96ba512839 界面隐藏 2024-12-10 15:02:05 +08:00
lq
307c28637b 主测试场景更改 2024-12-10 14:28:28 +08:00
lq
aaf0eb1408 疏散人群公布UI逻辑修改 2024-12-10 08:05:28 +08:00
lq
5db2740f34 应急人员配置数据串联 2024-12-09 23:53:38 +08:00
huyulong
ca14e5e3cb 第二个UI场景 2024-12-09 22:47:49 +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
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
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
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
5baf3a71b5 我盖 2024-12-04 15:05:38 +08:00
huyulong
724b00c690 灭火器位置,角色的基类 2024-12-04 10:58:48 +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
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
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
lq
7e8fee2657 日期界面的的显示逻辑更改 2024-11-30 23:32:17 +08:00
lq
f061cf37a3 本地配置表解析 2024-11-30 18:15:51 +08:00
杨号敬
f908b4f0a6 yhj1 2024-11-30 17:43:21 +08:00
huyulong
826b1824f1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-30 16:52:45 +08:00
huyulong
5662f186af 广播NPC位置,让NPC移动,更改玩家模型,写了个假的返回值 2024-11-30 16:52:33 +08:00
lq
e644437eb2 UI修改 2024-11-30 16:19:19 +08:00
2e16b88891 添加场景跟文本框脚本 2024-11-30 15:11:53 +08:00
ed1187fa11 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-30 10:27:25 +08:00
0259ecde77 预定演练接口完成 2024-11-30 10:23:05 +08:00
lq
6c8269ebb4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-30 10:20:02 +08:00
lq
994a519ae2 逻辑更改 2024-11-30 10:19:52 +08:00
b0682d1f74 修改预定演练部分接口 2024-11-29 20:10:43 +08:00
995af011b7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 20:07:12 +08:00
518340ebdb 修改预定演练部分接口 2024-11-29 20:06:53 +08:00
huyulong
8ccbc2bc14 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 20:06:04 +08:00
huyulong
b025a98b33 websocket相关代码改动 2024-11-29 20:05:55 +08:00
lq
343b2f59a6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-11-29 20:05:33 +08:00