Commit Graph

660 Commits

Author SHA1 Message Date
b8df4797e3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 10:56:15 +08:00
f4e3330f78 生态树图片的切换 2024-12-24 10:56:07 +08:00
GL
7f50422c4b 眩晕实现 2024-12-24 10:30:29 +08:00
GL
bb8e70f159 修改 2024-12-23 22:36:17 +08:00
c0e9f2e103 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 22:33:19 +08:00
c45b92cea7 生态书团队水滴的修改 2024-12-23 22:33:13 +08:00
wulongxiao
b4f0275d5b Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 22:32:51 +08:00
wulongxiao
f361545e30 眩晕技能 2024-12-23 22:32:40 +08:00
2f7b63c3db Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 21:16:42 +08:00
7940d15c23 萌妖图鉴按钮的切换以及水滴bug的修复 2024-12-23 21:16:37 +08:00
wulongxiao
bc1bd4b4f7 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 20:01:08 +08:00
wulongxiao
2715420564 技能 2024-12-23 20:00:58 +08:00
ebbf5af50c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 17:53:30 +08:00
f1364c9fd5 接口bug的修复 2024-12-23 17:53:25 +08:00
wulongxiao
e5867b8d48 技能测试 2024-12-23 16:59:06 +08:00
GL
f2c3d40985 萌妖数据读取 2024-12-23 16:58:00 +08:00
GL
642916d6ca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 14:28:52 +08:00
GL
902adeb497 改了动画化参数 2024-12-23 14:28:31 +08:00
wulongxiao
85c3d81518 萌妖技能 2024-12-23 14:28:09 +08:00
7b504541c4 安卓复制粘贴剪切板的脚本 2024-12-23 14:26:13 +08:00
d87fc5db56 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 14:02:36 +08:00
eae8f1c465 验证码模块跟用户模块bug的修改完成 2024-12-23 14:02:30 +08:00
wulongxiao
e3c5aa6d46 技能 2024-12-23 14:01:19 +08:00
4dec19aa1f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-23 10:12:56 +08:00
8631b458c5 接口问题的修改 2024-12-23 10:12:46 +08:00
wulongxiao
1a80bc783d 修改了资产的图标 2024-12-23 10:10:42 +08:00
wulongxiao
e1045eb00a 解决冲突 2024-12-20 22:28:06 +08:00
wulongxiao
4d3aea9f99 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/Scenes/scene_Main.unity
#	meng_yao/Assets/script/scene_Main/ManurePanel.cs.meta
2024-12-20 22:18:33 +08:00
wulongxiao
31158c5cbd 打包版本 2024-12-20 22:17:52 +08:00
GL
e2fbb81bb5 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-20 21:42:15 +08:00
GL
6fa9e38562 2024-12-20 21:42:02 +08:00
41645a34d9 收集水滴动画的修改 2024-12-20 21:33:49 +08:00
593a412bca 团队bug的修改 2024-12-20 21:13:14 +08:00
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