wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
625 Commits 1 Branch 0 Tags 1.6 GiB
8792d291ec
Commit Graph

375 Commits

Author SHA1 Message Date
LMZ
98865a9ca3 2024.12.27ZS,CS 2024-12-27 21:10:27 +08:00
lq
7231ae528e 分管添加 2024-12-27 20:32:05 +08:00
LMZ
42e3c76d7c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 
# Conflicts:
#	xiaofang/Assets/Scenes/Tmap 1.unity
 2024-12-27 20:28:10 +08:00
LMZ
c742aa03e0 CCCCSSSSSSS 2024-12-27 17:45:19 +08:00
杨号敬
e1eca313c7 消防栓重构 2024-12-27 17:43:27 +08:00
LMZ
6b15ec99f5 CSHYL 2024-12-27 12:01:08 +08:00
杨号敬
da67044825 相机视角的修改角度 2024-12-27 11:11:26 +08:00
LMZ
bea43936f3 该亖的張叁 2024-12-26 23:18:09 +08:00
LMZ
c7ae9cac51 GGGGGGGGGGGGGGGGGGGGGGGGGGGG 2024-12-26 22:30:20 +08:00
LMZ
cf6ea396eb 吃饭去了 2024-12-26 18:03:45 +08:00
杨号敬
2f632244d1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-26 17:37:41 +08:00
杨号敬
0c334d2c09 触发 2024-12-26 17:37:30 +08:00
lq
7fc799c481 Json数据更改 2024-12-26 17:36:12 +08:00
huyulong
c28f7f22cd 预定演练提交之后跳转场景调整 2024-12-26 16:26:16 +08:00
huyulong
8c3910a8f6 111 2024-12-26 04:18:42 +08:00
杨号敬
e7d9b0dd5e 相机移动bug 2024-12-26 04:17:03 +08:00
liuliang
965bc503d5 主持人跳转 2024-12-26 03:46:07 +08:00
杨号敬
440544da21 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-25 22:49:32 +08:00
杨号敬
8c2282dc95 摄像头bug 2024-12-25 22:49:24 +08:00
huyulong
ae74e28e93 登录改动 2024-12-25 22:49:02 +08:00
liuliang
b94e4c403b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-25 22:11:08 +08:00
liuliang
e92750730f 主持人 2024-12-25 22:10:20 +08:00
杨号敬
6814e21b64 1225bug修改 2024-12-25 22:08:40 +08:00
杨号敬
999159c80b 移动 2024-12-25 18:02:44 +08:00
杨号敬
36f82953a5 移动BUG 2024-12-25 17:38:45 +08:00
lq
9df67ea1d6 roomId设为全局变量 2024-12-25 17:24:22 +08:00
lq
0cc4f10ed1 警示窗 2024-12-25 17:07:27 +08:00
杨号敬
8ae97dee20 相机移动bug 2024-12-25 17:06:23 +08:00
lq
9f14a4e7d0 部分Bug修改 2024-12-25 15:29:21 +08:00
杨号敬
e5a0613584 消防bug 2024-12-25 14:42:59 +08:00
LMZ
482f53edc7 吃饭去咯 2024-12-25 12:02:42 +08:00
杨号敬
48e66423e6 灭火，水管，任务消防栓，水枪，摄像头BUG 2024-12-25 11:12:18 +08:00
lq
6d2c116c62 显示Bug修改 2024-12-24 23:00:40 +08:00
杨号敬
1b6e787ec6 丢弃按钮，捡起按钮 2024-12-24 22:01:21 +08:00
LMZ
dfd654db8d 提交提交！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！ 2024-12-24 21:15:03 +08:00
杨号敬
8945231d61 捡起丢下 2024-12-24 21:06:44 +08:00
huyulong
c6133bdfd3 打包第一版 2024-12-24 19:28:00 +08:00
huyulong
dc780717c3 跳转场景相关代码 2024-12-24 19:04:09 +08:00
lq
9dd5691c73 疏散人群公布 2024-12-24 18:51:35 +08:00
杨号敬
6f287d0279 灭火bug 2024-12-24 17:55:44 +08:00
杨号敬
fd53218661 物品替换 2024-12-24 16:35:05 +08:00
杨号敬
cc0923a4cf 连接消防动作bug 2024-12-24 11:55:51 +08:00
杨号敬
3db58eb24c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-24 10:58:32 +08:00
杨号敬
96391fa3bb 灭火bug 2024-12-24 10:58:23 +08:00
lq
2ad6d74aec Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-24 09:25:10 +08:00
lq
a6002493cd Json修改 2024-12-24 09:24:45 +08:00
LMZ
4427015945 小小提交一下，就一下下 2024-12-23 19:12:48 +08:00
huyulong
45e22987c0 播放动画时细节跳转 2024-12-23 17:28:00 +08:00
lq
d227ee41b5 数据传输修改 2024-12-23 17:19:50 +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
huyulong
fd684c198f 跳转场景 2024-12-23 15:01:25 +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
杨号敬
163bb10049 消防栓 2024-12-20 14:38:57 +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
018d26e6dd 玩家状态 2024-12-19 18:54:12 +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
lq
bbdd46c6df 应急演练图标读取以及三级面板设置 2024-12-18 21:31:25 +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
huyulong
840e0cd26e 相机控制旋转动画 2024-12-18 16:35:39 +08:00
lq
44f1c9ad78 所有表格Json数据更新 2024-12-18 14:35:56 +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
9770a94f2b 部分json修改，npc入参数据名修改 2024-12-18 11:16:15 +08:00
lq
bba48a5f25 LogError删除 2024-12-18 10:24:23 +08:00
lq
71e68b463c 应急人员配置数据上传修改 2024-12-18 10:22:19 +08:00
lq
7cf74ef71a 应急人员配置修改 2024-12-18 09:23:40 +08:00
杨号敬
fb63f81118 水管 2024-12-18 03:03:46 +08:00
lq
587ef1aec3 疏散人员配置修改 2024-12-17 22:55:13 +08:00
lq
98e20032fa 疏散人群公布数据上传 2024-12-17 17:44:06 +08:00
杨号敬
498174a1a5 水灭火 2024-12-17 17:27:46 +08:00
杨号敬
ed10cbc8ab 水 2024-12-17 17:06:14 +08:00
lq
d5e313e43d 修改 2024-12-17 17:04:12 +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
lq
34cec3fe18 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-16 21:38:21 +08:00