Commit Graph

540 Commits

Author SHA1 Message Date
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