Commit Graph

115 Commits

Author SHA1 Message Date
huyulong
1279f80eef 动作提交 2024-12-27 21:08:45 +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
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
LMZ
1144a7e9a0 11111 2024-12-27 14:04:54 +08:00
LMZ
6b15ec99f5 CSHYL 2024-12-27 12:01:08 +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
杨号敬
0c334d2c09 触发 2024-12-26 17:37:30 +08:00
杨号敬
6814e21b64 1225bug修改 2024-12-25 22:08:40 +08:00
LMZ
482f53edc7 吃饭去咯 2024-12-25 12:02:42 +08:00
LMZ
dfd654db8d 提交提交!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2024-12-24 21:15:03 +08:00
LMZ
4427015945 小小提交一下,就一下下 2024-12-23 19:12:48 +08:00
lq
134eeda58d 配置表及Json数据类型修改 2024-12-23 16:02:57 +08:00
lq
ec305be7cb 难度传值修改 2024-12-23 14:28:02 +08:00
LMZ
e68872263e 小小提交一下,存在感+1 2024-12-20 18:50:23 +08:00
lq
8fd9d76b66 缺少职业显示 2024-12-20 17:57:13 +08:00
lq
d9524370e4 判断人员是否满足条件 2024-12-19 21:41:03 +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
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
杨号敬
fb63f81118 水管 2024-12-18 03:03:46 +08:00
huyulong
4f934c717b 模型调整 2024-12-17 21:59:07 +08:00
huyulong
4f84e1947a 新的地图烘焙 2024-12-17 17:50:26 +08:00
huyulong
5156519b91 场景人物模型的替换 2024-12-17 17:31:38 +08:00
杨号敬
ed10cbc8ab 2024-12-17 17:06:14 +08:00
LMZ
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
LMZ
e0f9c2e1f0 被迫提交 2024-12-17 16:28:38 +08:00
huyulong
e7fe39da5e 模型更换 2024-12-17 16:23:27 +08:00
huyulong
b6f66918b3 新场景模型及烘焙 2024-12-17 09:58:07 +08:00
杨号敬
ee11d8aa03 消防栓 2024-12-16 20:29:28 +08:00
LMZ
dbd00a9734 累了,毁灭把(等待其他指令传达信息再读表修改数据) 2024-12-16 17:17:46 +08:00
huyulong
e4f8365208 预制体的添加 2024-12-16 17:09:32 +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
bb72e78fb4 场景模型替换 2024-12-16 15:01:50 +08:00
LMZ
dd726a950a aaaaaaa 2024-12-16 09:44:53 +08:00
LMZ
1eeb4cd49b 串好啦啦啦啦啦啦啦啦(mini版本) 2024-12-15 17:11:33 +08:00
huyulong
ab6f57ce72 调整npc碰撞体 2024-12-14 15:45:04 +08:00
huyulong
52ba7a2567 寻路逻辑,给每个npc一个目标点 2024-12-14 15:01:16 +08:00
huyulong
42aed4e26e 换模型 2024-12-13 19:40:29 +08:00