Commit Graph

727 Commits

Author SHA1 Message Date
b563233d2f 收集水滴接口的接入 2024-12-20 21:03:36 +08:00
GL
bfd3ffcd8d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs
2024-12-20 20:12:36 +08:00
GL
e6f69939e9 2024-12-20 18:02:18 +08:00
wulongxiao
cd5ee4145b 合并 2024-12-20 17:47:25 +08:00
GL
734500c4d5 344 2024-12-20 17:43:30 +08:00
GL
069fd83170 火炎 2024-12-20 17:40:13 +08:00
wulongxiao
42db11f65d 同步版本 2024-12-20 17:33:11 +08:00
wulongxiao
da2a92853e 购买船的bug修了 2024-12-20 16:37:36 +08:00
GL
58b9e729cf Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 16:29:19 +08:00
GL
2c18c592bb 攻击特效 2024-12-20 16:29:02 +08:00
wulongxiao
805e92e1b5 修bug 2024-12-20 16:01:29 +08:00
7ac2f8714f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 15:59:37 +08:00
981a99f2c2 界面的切换以及收集水滴接口的接入 2024-12-20 15:59:27 +08:00
wulongxiao
1c0de36011 数量增加 2024-12-20 15:56:43 +08:00
wulongxiao
213ad38d7b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 12:03:38 +08:00
wulongxiao
ef0587c815 修bug 2024-12-20 12:03:29 +08:00
GL
cd38bca734 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 11:58:05 +08:00
GL
852ad0da26 木木 2024-12-20 11:57:47 +08:00
wulongxiao
abe132a692 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 11:33:17 +08:00
wulongxiao
d2571a4d85 四场景bug修改 2024-12-20 11:33:06 +08:00
GL
4522a4af91 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 10:42:38 +08:00
GL
c36ab84ce7 信息显示Bug修复 2024-12-20 10:42:20 +08:00
44fb1ca024 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 09:32:34 +08:00
c3ec26a706 矿场修改 2024-12-20 09:32:19 +08:00
GL
731a8b10bb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 19:02:25 +08:00
GL
48a6681ddb 信息显示 2024-12-19 19:02:10 +08:00
34af355f9d Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 17:32:21 +08:00
0adad295c3 生态书团队UI的修改以及数据的修正 2024-12-19 17:32:14 +08:00
wulongxiao
0c36023d56 四个场景接口 2024-12-19 17:31:43 +08:00
8e1d4ac88b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 16:04:25 +08:00
5391da4770 登录场景的一些修改 2024-12-19 16:04:17 +08:00
wulongxiao
fdcd8beba9 接口 2024-12-19 15:55:08 +08:00
wulongxiao
adfdc8c267 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 15:25:49 +08:00
wulongxiao
d1cc7a3b0b 心跳包 2024-12-19 15:25:25 +08:00
d47eda3d04 生态树宠物界面的修改 2024-12-19 15:24:14 +08:00
wulongxiao
8fb8460d04 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 14:43:36 +08:00
wulongxiao
5a6988b819 修改登入 2024-12-19 14:43:24 +08:00
GL
c778e5f8d1 攻击范围显示 2024-12-19 11:48:31 +08:00
1707005c71 接口接入的完成 2024-12-19 00:57:23 +08:00
37b939985b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-19 00:14:19 +08:00
e2df629676 接口接入完成 2024-12-19 00:14:10 +08:00
wulongxiao
98d42f8d93 四大场景完 2024-12-18 23:52:41 +08:00
wulongxiao
e6958c62df Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 23:42:13 +08:00
wulongxiao
78713793f5 四大场景接口代码 2024-12-18 23:42:07 +08:00
69f5387d62 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 23:39:27 +08:00
75fb2e6f34 生态树宠物之家的接口接入完成 2024-12-18 23:39:18 +08:00
wulongxiao
f995278b88 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 23:15:22 +08:00
wulongxiao
934f3f8c51 该改了宝石接口 2024-12-18 23:15:00 +08:00
GL
c13580b095 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 21:08:35 +08:00
GL
676f800527 小修改 2024-12-18 21:08:22 +08:00