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 |
|
|
|
9770a94f2b
|
部分json修改，npc入参数据名修改
|
2024-12-18 11:16:15 +08:00 |
|
|
|
bba48a5f25
|
LogError删除
|
2024-12-18 10:24:23 +08:00 |
|
|
|
71e68b463c
|
应急人员配置数据上传修改
|
2024-12-18 10:22:19 +08:00 |
|
|
|
7cf74ef71a
|
应急人员配置修改
|
2024-12-18 09:23:40 +08:00 |
|
杨号敬
|
fb63f81118
|
水管
|
2024-12-18 03:03:46 +08:00 |
|
杨号敬
|
bcc74f0465
|
add
|
2024-12-18 02:18:45 +08:00 |
|
|
|
e402949286
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-17 22:56:07 +08:00 |
|
|
|
587ef1aec3
|
疏散人员配置修改
|
2024-12-17 22:55:13 +08:00 |
|
huyulong
|
4f934c717b
|
模型调整
|
2024-12-17 21:59:07 +08:00 |
|
huyulong
|
12d9d8e1ec
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-17 17:50:31 +08:00 |
|
huyulong
|
4f84e1947a
|
新的地图烘焙
|
2024-12-17 17:50:26 +08:00 |
|
|
|
98e20032fa
|
疏散人群公布数据上传
|
2024-12-17 17:44:06 +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 |
|
|
|
d5e313e43d
|
修改
|
2024-12-17 17:04:12 +08:00 |
|
|
|
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 |
|
|
|
e0f9c2e1f0
|
被迫提交
|
2024-12-17 16:28:38 +08:00 |
|
huyulong
|
e7fe39da5e
|
模型更换
|
2024-12-17 16:23:27 +08:00 |
|
|
|
3d4197bf93
|
疏散人群公布修改
|
2024-12-17 16:01:03 +08:00 |
|
|
|
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 |
|
|
|
34cec3fe18
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-16 21:38:21 +08:00 |
|
杨号敬
|
ee11d8aa03
|
消防栓
|
2024-12-16 20:29:28 +08:00 |
|
|
|
e44090390c
|
显示修改
|
2024-12-16 17:56:27 +08:00 |
|
|
|
dbd00a9734
|
累了，毁灭把（等待其他指令传达信息再读表修改数据）
|
2024-12-16 17:17:46 +08:00 |
|
|
|
161b95deda
|
地区-1判断
|
2024-12-16 17:14:52 +08:00 |
|
huyulong
|
033f1f00b1
|
Select表数据更新
|
2024-12-16 17:13:26 +08:00 |
|
|
|
e7fc35f2b7
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-16 17:11:35 +08:00 |
|
|
|
4472c138f0
|
小改
|
2024-12-16 17:11:22 +08:00 |
|
huyulong
|
d19e6c9e41
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-16 17:09:43 +08:00 |
|
huyulong
|
e4f8365208
|
预制体的添加
|
2024-12-16 17:09:32 +08:00 |
|
|
|
4cdbf62b8d
|
应急人员配置修改
|
2024-12-16 15:57:15 +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
|
ddbd0d2544
|
更改停下的判断
|
2024-12-16 15:27:24 +08:00 |
|
huyulong
|
dbf5da1dea
|
模型更改后重新烘焙场景
|
2024-12-16 15:07:58 +08:00 |
|
huyulong
|
ae9a1e705e
|
命名规范更新
|
2024-12-16 15:04:53 +08:00 |
|
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 |
|
|
|
0fa701719b
|
jSon文件拖入
|
2024-12-16 09:51:35 +08:00 |
|
|
|
0ee5f60376
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-16 09:45:06 +08:00 |
|
|
|
dd726a950a
|
aaaaaaa
|
2024-12-16 09:44:53 +08:00 |
|
huyulong
|
9233e9377d
|
111
|
2024-12-16 09:42:44 +08:00 |
|
|
|
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 |
|
|
|
cb3052a324
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-13 20:17:47 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
073f34d888
|
疏散人群公布返回其他界面报空修改
|
2024-12-12 20:50:17 +08:00 |
|
|
|
26e6f4e6d1
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 20:01:23 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3a3ff0429a
|
UI逻辑完善版，被啊胡（卡脖子）
|
2024-12-12 17:55:05 +08:00 |
|
|
|
1776a9fa2b
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-12 17:52:00 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
693bcf736e
|
人员数据上传更改
|
2024-12-12 15:34:43 +08:00 |
|
|
|
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 |
|
|
|
a69752b3d9
|
逻辑基本串了一下还差数据没弄
|
2024-12-12 09:18:00 +08:00 |
|
|
|
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 |
|
|
|
dba8c4a975
|
修改
|
2024-12-11 16:41:46 +08:00 |
|
|
|
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 |
|
|
|
8f1c7cc03c
|
整体数据上传
|
2024-12-11 16:37:21 +08:00 |
|
huyulong
|
f0b9f206aa
|
Taskjson的添加和Language文件的更新
|
2024-12-11 16:05:50 +08:00 |
|
|
|
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 |
|
|
|
5f5bc751f3
|
修改
|
2024-12-11 15:53:49 +08:00 |
|
|
|
e0ef89a8cf
|
修改
|
2024-12-11 15:50:06 +08:00 |
|
|
|
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 |
|
|
|
158082ec63
|
疏散人群公布弹窗修改
|
2024-12-11 01:32:11 +08:00 |
|
|
|
0b05e7d0ef
|
修改
|
2024-12-10 23:24:15 +08:00 |
|
|
|
94eb75df55
|
人员窗口弹窗
|
2024-12-10 21:34:19 +08:00 |
|
|
|
7f831f0862
|
疏散人群公布修改
|
2024-12-10 18:14:08 +08:00 |
|
|
|
96ba512839
|
界面隐藏
|
2024-12-10 15:02:05 +08:00 |
|
|
|
307c28637b
|
主测试场景更改
|
2024-12-10 14:28:28 +08:00 |
|
|
|
aaf0eb1408
|
疏散人群公布UI逻辑修改
|
2024-12-10 08:05:28 +08:00 |
|
|
|
a349a1ee86
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main
|
2024-12-10 06:21:18 +08:00 |
|
|
|
f035248e44
|
界面
|
2024-12-10 06:20:20 +08:00 |
|
huyulong
|
7741141765
|
UI变动
|
2024-12-10 06:11:25 +08:00 |
|
|
|
751e369ed8
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main
|
2024-12-10 05:55:41 +08:00 |
|
huyulong
|
cc4315acbd
|
自由行动14UI完成
|
2024-12-10 05:50:29 +08:00 |
|
huyulong
|
977b4cd7d0
|
自由移动场景14
|
2024-12-10 05:16:49 +08:00 |
|
|
|
4c19dc9395
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main
|
2024-12-10 02:55:18 +08:00 |
|
huyulong
|
e89ba36f44
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-10 02:43:02 +08:00 |
|
huyulong
|
73ba252e4f
|
新增UI场景和相关图片
|
2024-12-10 02:42:52 +08:00 |
|
|
|
b3c3c8cda7
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-10 02:40:37 +08:00 |
|
|
|
ad14e3f646
|
小智搞的!!!不是魅魔!!!!!,做完了指令行动UI了,还差逻辑
|
2024-12-10 02:40:30 +08:00 |
|
|
|
d9defe9230
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang into main
|
2024-12-10 00:43:05 +08:00 |
|
|
|
0981a8241d
|
一
|
2024-12-10 00:42:57 +08:00 |
|
huyulong
|
52b576f39b
|
tip界面UI
|
2024-12-10 00:32:43 +08:00 |
|
huyulong
|
c0a4c6638b
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-10 00:01:17 +08:00 |
|
|
|
d2f870bb12
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-10 00:00:05 +08:00 |
|
|
|
025221011a
|
主持人界面UI的制作完成
|
2024-12-09 23:59:47 +08:00 |
|
huyulong
|
b2889a0eb6
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-09 23:54:26 +08:00 |
|
huyulong
|
c131c50fe4
|
两个UI场景
|
2024-12-09 23:54:17 +08:00 |
|
|
|
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 |
|
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 |
|
|
|
051cfed454
|
事件数据传输修改
|
2024-12-09 14:20:37 +08:00 |
|
|
|
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 |
|
|
|
53f0e64108
|
更改为测试版本
|
2024-12-09 11:37:36 +08:00 |
|
huyulong
|
d10d3775d8
|
proto文件修改以及npc寻路
|
2024-12-09 11:30:15 +08:00 |
|
|
|
0462282d61
|
PanelToggle更改
|
2024-12-09 11:09:39 +08:00 |
|
|
|
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 |
|
|
|
cf40583796
|
修改
|
2024-12-08 14:13:31 +08:00 |
|
|
|
e2f480b1ea
|
修改
|
2024-12-07 17:47:46 +08:00 |
|
|
|
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 |
|
|
|
8bb12d1eb3
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-06 15:44:18 +08:00 |
|
|
|
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 |
|
|
|
93501dd2b0
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-06 11:38:00 +08:00 |
|
|
|
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 |
|
|
|
1f5c12cde9
|
BUG更改
|
2024-12-05 23:10:33 +08:00 |
|
|
|
e03032830a
|
bug修改
|
2024-12-05 20:33:37 +08:00 |
|
huyulong
|
47787b8bfd
|
任务接口和相关函数
|
2024-12-05 20:21:15 +08:00 |
|
|
|
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 |
|
|
|
cecf3989b3
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-05 15:39:20 +08:00 |
|
|
|
effc389683
|
选择场景数据串联更改
|
2024-12-05 15:39:10 +08:00 |
|
huyulong
|
13f74a2139
|
add
|
2024-12-05 09:21:07 +08:00 |
|
|
|
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 |
|
|
|
2454ea9555
|
应急人员配置点击变色更改
|
2024-12-04 16:37:51 +08:00 |
|
huyulong
|
358701471d
|
增加了common文件夹
|
2024-12-04 15:26:46 +08:00 |
|
huyulong
|
df819a7e54
|
更改ProtoBuffer相关文件位置
|
2024-12-04 15:10:27 +08:00 |
|
huyulong
|
5baf3a71b5
|
我盖
|
2024-12-04 15:05:38 +08:00 |
|
wulongxiao
|
1345268590
|
add
|
2024-12-04 11:22:32 +08:00 |
|
wulongxiao
|
14e656915a
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-04 11:08:07 +08:00 |
|
wulongxiao
|
c78f0e18f7
|
add
|
2024-12-04 11:08:01 +08:00 |
|
huyulong
|
74d838b4ff
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-04 10:59:04 +08:00 |
|
huyulong
|
724b00c690
|
灭火器位置，角色的基类
|
2024-12-04 10:58:48 +08:00 |
|
杨号敬
|
ded7aad782
|
回放6修改
|
2024-12-04 09:56:33 +08:00 |
|
huyulong
|
44c0e6f8c9
|
test
|
2024-12-03 22:02:01 +08:00 |
|
huyulong
|
89e13177f7
|
整合UI
|
2024-12-02 19:44:46 +08:00 |
|
|
|
53f6f2eea6
|
人员配置点击修改
|
2024-12-02 19:40:49 +08:00 |
|
杨号敬
|
c63a323117
|
回放系统1-6
|
2024-12-02 17:15:15 +08:00 |
|
huyulong
|
b302e7fc00
|
加了Dotween和NPC的基类
|
2024-12-02 17:09:34 +08:00 |
|
huyulong
|
e56213a52d
|
更改模型结构，方便以后更改人物模型
|
2024-12-02 15:09:22 +08:00 |
|
|
|
975d8aac61
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-02 10:50:51 +08:00 |
|
|
|
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 |
|
|
|
fb60729d67
|
所有
|
2024-12-02 00:35:53 +08:00 |
|
huyulong
|
ffffa196a4
|
json文件接入
|
2024-12-01 23:00:40 +08:00 |
|
|
|
44ea8baf75
|
数据串联
|
2024-12-01 22:36:41 +08:00 |
|
huyulong
|
c28cca2d95
|
UI逻辑bug修复，准备接数据
|
2024-12-01 22:24:03 +08:00 |
|
huyulong
|
20120af3ed
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-12-01 19:28:30 +08:00 |
|
huyulong
|
84925d637b
|
test
|
2024-12-01 19:28:25 +08:00 |
|
|
|
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 |
|
|
|
f71b850f24
|
剧本数据串联
|
2024-12-01 17:51:09 +08:00 |
|
|
|
350a7e0deb
|
应急疏散人员
|
2024-12-01 15:06:22 +08:00 |
|
|
|
893f7368c1
|
配置表增加，接大部分所需传输数据的接口
|
2024-12-01 04:58:16 +08:00 |
|
|
|
7e8fee2657
|
日期界面的的显示逻辑更改
|
2024-11-30 23:32:17 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6c8269ebb4
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-30 10:20:02 +08:00 |
|
|
|
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 |
|
|
|
343b2f59a6
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-29 20:05:33 +08:00 |
|
|
|
9e826b643d
|
UI更改
|
2024-11-29 20:05:19 +08:00 |
|
|
|
03d13f552b
|
解耦部分预定演练接口
|
2024-11-29 17:27:21 +08:00 |
|
huyulong
|
1004dab9da
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-29 16:21:29 +08:00 |
|
huyulong
|
a39b24936b
|
UI逻辑
|
2024-11-29 16:20:58 +08:00 |
|
|
|
23a440edf5
|
日历
|
2024-11-29 16:19:12 +08:00 |
|
huyulong
|
9450947206
|
监听玩家和NPC位置的部分代码
|
2024-11-29 15:41:49 +08:00 |
|
huyulong
|
9072256301
|
Proto文件更新
|
2024-11-29 15:22:51 +08:00 |
|
huyulong
|
c24fd38f6c
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-29 15:13:50 +08:00 |
|
huyulong
|
8ffac13f7f
|
更新proto文件
|
2024-11-29 15:13:32 +08:00 |
|
|
|
811a4c3512
|
选择演练未选中按钮的禁用
|
2024-11-29 14:44:18 +08:00 |
|
|
|
f3478cb879
|
UI补提
|
2024-11-29 09:47:47 +08:00 |
|
|
|
55d17b0835
|
UI脚本
|
2024-11-29 09:44:45 +08:00 |
|
|
|
dddce7611a
|
场景选择更改和剧本部分更改
|
2024-11-28 22:02:35 +08:00 |
|
|
|
5d16c5db3a
|
剧本UI逻辑更改，疏散人群UI部分逻辑编写
|
2024-11-28 11:56:28 +08:00 |
|
|
|
3a93a71921
|
选择剧本和疏散人群公布逻辑编写
|
2024-11-28 01:31:46 +08:00 |
|
|
|
96039b8e08
|
UI更改
|
2024-11-27 23:59:00 +08:00 |
|
|
|
2833129a25
|
UI逻辑更改
|
2024-11-27 16:54:09 +08:00 |
|
|
|
9d79de6f6e
|
ui逻辑
|
2024-11-27 02:11:27 +08:00 |
|
|
|
4867a2ac6a
|
UI史山更改
|
2024-11-26 18:24:12 +08:00 |
|
|
|
c044a92f14
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-26 15:36:40 +08:00 |
|
|
|
68e60a08d7
|
UI修改及拼接
|
2024-11-26 15:36:02 +08:00 |
|
huyulong
|
c42747c233
|
UI代码提交
|
2024-11-25 17:58:45 +08:00 |
|
huyulong
|
b363e6a670
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-25 17:28:51 +08:00 |
|
huyulong
|
6dbe316c91
|
写好获取点击位置的名称传入结构体
|
2024-11-25 17:28:47 +08:00 |
|
|
|
36a71879f3
|
login脚本更改和结构体里面的难度赋值
|
2024-11-25 17:27:33 +08:00 |
|
huyulong
|
5da149088a
|
Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang
|
2024-11-25 17:16:45 +08:00 |
|
huyulong
|
e628bf2ddc
|
消防演练场景UI逻辑代码
|
2024-11-25 17:16:41 +08:00 |
|
|
|
1f5d6d90e7
|
事件选择UI逻辑
|
2024-11-25 17:15:16 +08:00 |
|
