Commit Graph

647 Commits

Author SHA1 Message Date
1632a1f0bd 跳转 2024-12-28 16:43:12 +08:00
LMZ
a6ed725913 ffffffffffffffffffff 2024-12-28 16:38:41 +08:00
lq
3ec262b640 账号修改 2024-12-28 16:15:43 +08:00
huyulong
d789bc35c9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 15:57:20 +08:00
huyulong
7f0dca55bb 帧数据函数 2024-12-28 15:57:12 +08:00
91d58b2f4d 登录,房间列表跳转 2024-12-28 15:48:01 +08:00
LMZ
c3fc4b7c0b 提交一下获取职业ID 2024-12-28 14:50:56 +08:00
5dcc934ab2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 14:30:15 +08:00
dbd2515609 总指挥判断 2024-12-28 14:30:01 +08:00
huyulong
38bbe2ff4e Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 14:11:04 +08:00
huyulong
ae3f0e4b32 整理的同步代码 2024-12-28 14:10:54 +08:00
LMZ
d31d805fd2 偷偷提交不告诉你们 2024-12-28 14:06:45 +08:00
40c41e091a 预定演练yhj 2024-12-28 10:17:34 +08:00
lq
1441e13a50 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 23:42:49 +08:00
lq
61cc379bf1 分管修改 2024-12-27 23:42:19 +08:00
LMZ
700c9ae420 fafafafafafafafafafafafafafafafafafaf 2024-12-27 23:36:33 +08:00
13e73b29c4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 23:12:38 +08:00
9c71a751ba 选房间 yhj 2024-12-27 23:12:22 +08:00
lq
63e3932ece Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 22:04:56 +08:00
lq
7761ff6851 Selsec表Json数据修改 2024-12-27 22:03:15 +08:00
huyulong
5a97e224a1 傻杯林小智,手快提错了 2024-12-27 21:13:34 +08:00
LMZ
98865a9ca3 2024.12.27ZS,CS 2024-12-27 21:10:27 +08:00
huyulong
1279f80eef 动作提交 2024-12-27 21:08:45 +08:00
huyulong
56eadbac93 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 21:03:02 +08:00
huyulong
50ab18271f 接口的变动 2024-12-27 21:02:43 +08:00
e88882a908 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 20:33:58 +08:00
3018ea3fdd zzz 2024-12-27 20:33:32 +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
杨号敬
a6e3b94752 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 17:44:13 +08:00
杨号敬
e1eca313c7 消防栓重构 2024-12-27 17:43:27 +08:00
huyulong
b8745c59bb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 17:42:37 +08:00
huyulong
05303cba42 protobuffer文件更新以及顶棚模型的加入 2024-12-27 17:42:24 +08:00
7dacbff46c 小调整 2024-12-27 16:29:07 +08:00
LMZ
1144a7e9a0 11111 2024-12-27 14:04:54 +08:00
huyulong
d3e1749fc2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 12:02:10 +08:00
LMZ
01873bd34c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 12:01:23 +08:00
LMZ
6b15ec99f5 CSHYL 2024-12-27 12:01:08 +08:00
lq
43b0e17b22 分管修改 2024-12-27 11:53:50 +08:00
huyulong
c2588d6c4f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-27 11:36:00 +08:00
huyulong
a9868295a9 接口 2024-12-27 11:35:45 +08:00
杨号敬
da67044825 相机视角的修改角度 2024-12-27 11:11:26 +08:00
LMZ
bea43936f3 该亖的張叁 2024-12-26 23:18:09 +08:00
8c6a171f9d 场景小修改 2024-12-26 23:07:55 +08:00
LMZ
c7ae9cac51 GGGGGGGGGGGGGGGGGGGGGGGGGGGG 2024-12-26 22:30:20 +08:00
杨号敬
105d6d8df3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-26 22:29:18 +08:00
杨号敬
faa4d21d63 任务触发 2024-12-26 22:28:12 +08:00
0416eb8c6b 一些小修改 2024-12-26 22:26:18 +08:00
huyulong
0ece047d64 websocket接口更新 2024-12-26 21:59:25 +08:00
huyulong
a722d89ccf 接口相关变动 2024-12-26 20:58:08 +08:00
LMZ
cf6ea396eb 吃饭去了 2024-12-26 18:03:45 +08:00
杨号敬
57ba37d615 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-26 18:02:47 +08:00
杨号敬
50c5fcc619 触发器 2024-12-26 18:02:37 +08:00
huyulong
e41eaa55de protobuf文件更新 2024-12-26 17:59:44 +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
965bc503d5 主持人跳转 2024-12-26 03:46:07 +08:00
0604831cf4 bug修改 2024-12-25 23:37:40 +08:00
huyulong
a42ff097ae Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-25 23:16:17 +08:00
huyulong
e2b7eeb967 图层更改 2024-12-25 23:16:12 +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
b94e4c403b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-25 22:11:08 +08:00
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
杨号敬
859886d8b9 bug修改 2024-12-25 12:00:57 +08:00
杨号敬
0cbeeaa200 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-25 11:12:33 +08:00
杨号敬
48e66423e6 灭火,水管,任务消防栓,水枪,摄像头BUG 2024-12-25 11:12:18 +08:00
huyulong
05613c0e42 摄像机正交 2024-12-25 11:07:42 +08:00
d6ad8c1779 bug修改 2024-12-25 11:01:30 +08:00
lq
da0cb1c39c 修改 2024-12-24 23:02:32 +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
杨号敬
2a03c69761 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-24 21:06:53 +08:00
杨号敬
8945231d61 捡起丢下 2024-12-24 21:06:44 +08:00
b52ae261fd 视角 2024-12-24 20:21:15 +08:00
huyulong
d93d109f6f add 2024-12-24 19:57:10 +08:00
杨号敬
6fbcaa97b6 aaa 2024-12-24 19:56:29 +08:00
huyulong
6d9e19bc69 该死的李巧八嘎 2024-12-24 19:42:16 +08:00
huyulong
c6133bdfd3 打包第一版 2024-12-24 19:28:00 +08:00
huyulong
dc780717c3 跳转场景相关代码 2024-12-24 19:04:09 +08:00
lq
1461effa82 背景图 2024-12-24 18:54:53 +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
huyulong
80dcd6533e UI位置调整 2024-12-24 14:27:53 +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
12f3deac0d Selesc表还原 2024-12-24 09:32:32 +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
杨号敬
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
lq
d227ee41b5 数据传输修改 2024-12-23 17:19:50 +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
huyulong
fd684c198f 跳转场景 2024-12-23 15:01:25 +08:00
huyulong
90e9f9a4f2 跳转场景 2024-12-23 15:00:34 +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
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
ebffbfdcf8 嘿嘿 2024-12-19 09:29:32 +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
杨号敬
2b9e436ea1 电特效 2024-12-18 17:13:53 +08:00