Commit Graph

612 Commits

Author SHA1 Message Date
huyulong
03f30e02ac 3d场景的动画和模型 2024-12-29 10:44:12 +08:00
LMZ
71f8fea176 提交一下下下把 2024-12-29 10:43:52 +08:00
huyulong
c743860080 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-29 10:43:27 +08:00
4cd2b4e776 场景修改 2024-12-29 10:41:48 +08:00
huyulong
465b3b3d6b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-29 09:53:25 +08:00
7a377f27a0 场景跳转 2024-12-29 09:53:09 +08:00
huyulong
37474ab016 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-29 09:19:59 +08:00
LMZ
fbacbe64ca 困困,哭哭,跑跑路 2024-12-28 23:53:11 +08:00
huyulong
a9403974f0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 22:54:08 +08:00
9eb0d79d8a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 21:42:26 +08:00
9e5ec8812f 加入房间 bug 2024-12-28 21:42:16 +08:00
huyulong
49e2d8f06d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 19:42:00 +08:00
huyulong
d7b2eabecc protobuffer文件更新 2024-12-28 19:41:52 +08:00
LMZ
9b1697a850 修改UI逻辑 2024-12-28 18:03:41 +08:00
566285caa8 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang 2024-12-28 16:43:20 +08:00
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