Commit Graph

625 Commits

Author SHA1 Message Date
GL
c4d23e1398 修改Bug 2025-01-02 16:36:21 +08:00
wulongxiao
5593462e2b bug修复 2024-12-30 16:47:34 +08:00
wulongxiao
45c66a4fb4 11 2024-12-30 14:36:08 +08:00
wulongxiao
b676d95df1 add 2024-12-30 14:12:56 +08:00
wulongxiao
662e1755cd add 2024-12-30 14:04:36 +08:00
0f9fa1d443 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-30 13:33:56 +08:00
3dcd2d8fd9 生态树团队的修改以及人物出生地的修改 2024-12-30 13:33:49 +08:00
wulongxiao
9cec6ac2c9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-30 13:28:19 +08:00
wulongxiao
2765f90b20 同步 2024-12-30 13:26:08 +08:00
5244ad40e2 bug的修改 2024-12-30 12:49:29 +08:00
bf08d035f0 bug的修改 2024-12-29 23:34:20 +08:00
c8944bbd66 bug的修改 2024-12-29 21:25:01 +08:00
10fd15ae2c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-29 18:03:07 +08:00
207c891f9b 提现配置提现账户设置接口的接入,以及锻造模块全部接口的接入 2024-12-29 18:02:57 +08:00
wulongxiao
9c3a416efc Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-29 17:28:02 +08:00
wulongxiao
00a95b5426 模式切换动画 2024-12-29 17:27:33 +08:00
533e5906a7 绑定界面制作完成 2024-12-29 15:34:08 +08:00
eb6f1ac3d0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-29 15:30:10 +08:00
87a088ecdd 领奖提现的几口以及绑定UI的提交 2024-12-29 15:30:02 +08:00
wulongxiao
919575ea63 修改 2024-12-29 15:24:04 +08:00
134a7e4bb4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-29 11:52:24 +08:00
wulongxiao
77dcd0ed10 修改load 2024-12-29 11:47:07 +08:00
7b08a6313a 公告信息,首充接口的接入以及工会接口的接入 2024-12-29 11:30:22 +08:00
51b3589d4f 接口的更新以及首充界面Ui的修改 2024-12-28 17:51:16 +08:00
a124c87fed 签到接口以及补签接口的接入完成 2024-12-28 16:34:49 +08:00
a90addfc75 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-28 14:05:24 +08:00
dbe0738539 生态树团队以及全网数据UI的修改 2024-12-28 14:05:14 +08:00
GL
c0fde0e31e 攻击范围显示Bug修复 2024-12-28 11:29:45 +08:00
59b8e3d0a8 拉新榜UI的修改以及接口数据的更新 2024-12-27 22:17:58 +08:00
918367fac6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-27 21:10:19 +08:00
0bae6b0146 资产赠送按钮的修改,拉新榜数据的修改 2024-12-27 21:10:09 +08:00
wulongxiao
2c54ad0c52 修改滑动条 2024-12-27 20:50:06 +08:00
wulongxiao
a3f236504a 伤害统计 2024-12-27 15:36:35 +08:00
d9f6b7e392 bug的修改以及岛跟矿的遮罩,还有公告接口脚本的编写 2024-12-26 22:59:03 +08:00
9b2911d3e9 bug的修改 2024-12-26 18:02:11 +08:00
wulongxiao
9244e767ac Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 14:10:37 +08:00
wulongxiao
33db66b2c9 修bug 2024-12-26 14:10:26 +08:00
GL
64bb3a3dd4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-26 09:12:37 +08:00
9909cc6604 bug的修改以及tmp字体的shader 2024-12-26 04:16:29 +08:00
a52aa4d956 商店脚本的编写 2024-12-25 23:45:44 +08:00
4b921df030 bug的修改 2024-12-25 23:35:36 +08:00
GL
bf9940a02a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 23:10:41 +08:00
GL
d0150783cf bug修复 2024-12-25 21:49:36 +08:00
abe0d8f79b 宠物之家显示的修改 2024-12-25 21:48:50 +08:00
GL
83f8170a05 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 17:48:17 +08:00
GL
d046107f05 眩晕修改 2024-12-25 17:47:54 +08:00
71d6289919 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 17:34:05 +08:00
7cf9324de3 宠物的更新与宠物之家图片的显示 2024-12-25 17:33:42 +08:00
GL
08a40c3ea1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-25 15:47:59 +08:00
GL
98dca6822e 玩家受伤屏幕变红色 2024-12-25 15:39:40 +08:00
0e6609ede6 bug的修改 2024-12-25 15:20:43 +08:00
8048a0c9ec 一些bug的修改 2024-12-25 12:02:14 +08:00
957565017a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 21:12:53 +08:00
df9ae2ba0f bug的修改 2024-12-24 21:12:43 +08:00
wulongxiao
315cc2cbd6 修bug 2024-12-24 17:58:06 +08:00
1ff1a9ed63 养成bug的修改 2024-12-24 17:44:00 +08:00
c082001241 免登录的修改以及商店UI的添加 2024-12-24 17:03:50 +08:00
9d7a4b2338 合并 2024-12-24 15:41:18 +08:00
wulongxiao
63134db4eb 萌妖技能 2024-12-24 15:38:28 +08:00
wulongxiao
43ab8bfbd4 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-24 12:02:42 +08:00
wulongxiao
bf50ed51ad 技能读取 2024-12-24 12:02:32 +08:00
f4e3330f78 生态树图片的切换 2024-12-24 10:56:07 +08:00
c45b92cea7 生态书团队水滴的修改 2024-12-23 22:33:13 +08:00
7940d15c23 萌妖图鉴按钮的切换以及水滴bug的修复 2024-12-23 21:16:37 +08:00
f1364c9fd5 接口bug的修复 2024-12-23 17:53:25 +08:00
eae8f1c465 验证码模块跟用户模块bug的修改完成 2024-12-23 14:02:30 +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
593a412bca 团队bug的修改 2024-12-20 21:13:14 +08:00
b563233d2f 收集水滴接口的接入 2024-12-20 21:03: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
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
GL
852ad0da26 木木 2024-12-20 11:57:47 +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
5391da4770 登录场景的一些修改 2024-12-19 16:04:17 +08:00
d47eda3d04 生态树宠物界面的修改 2024-12-19 15:24:14 +08:00
wulongxiao
5a6988b819 修改登入 2024-12-19 14:43:24 +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
934f3f8c51 该改了宝石接口 2024-12-18 23:15:00 +08:00
wulongxiao
747d4561c2 主页 2024-12-18 21:08:03 +08:00
wulongxiao
585a77b1b9 玩家名字修改 2024-12-18 21:04:28 +08:00
wulongxiao
0264d1f162 2.1 2024-12-18 20:49:42 +08:00
wulongxiao
237e513c91 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 20:32:57 +08:00
wulongxiao
6649d55ab5 xiubug 2024-12-18 20:32:37 +08:00
82305586ef 生态树场景的修改 2024-12-18 18:46:24 +08:00
b6db82d9b6 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 17:07:08 +08:00
4fcaadbddb 浇水接口与生态树界面信息的接入 2024-12-18 17:06:59 +08:00
wulongxiao
ab765c38d8 账单详情整完了 2024-12-18 17:04:21 +08:00
0db2e858d0 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 15:34:52 +08:00
2bac777c5b 生态树团队接口的接入 2024-12-18 15:33:17 +08:00
wulongxiao
224f63369a 账单 2024-12-18 15:32:45 +08:00
GL
05c481b540 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 14:17:41 +08:00
GL
cd6467f09e 飘字修改 2024-12-18 14:17:24 +08:00
b9b9a831fa 生态书团队接口的接入 2024-12-18 12:03:24 +08:00
f0eecf4313 用户注销接口的接入 2024-12-17 22:44:43 +08:00
85e175c117 更新用户信息接口的接入 2024-12-17 22:23:25 +08:00
f9bd7c4607 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-17 17:18:19 +08:00
7ba7ab1b0b 接口的添加 2024-12-17 17:18:09 +08:00
GL
4b9f5a5c6e 老虎动画修改 2024-12-17 17:16:00 +08:00
wulongxiao
e552d26617 接口 2024-12-17 15:31:37 +08:00
wulongxiao
98539732b6 接口 2024-12-16 17:56:36 +08:00
wulongxiao
d560ce058d 怪物死亡动画,萌妖攻击动画,战魂掉落动画,修bug 2024-12-14 23:20:55 +08:00
wulongxiao
ae9baf0325 修飘血速度 2024-12-14 21:20:01 +08:00
19e18177f7 重新进入场景卡牌显示的bug,以及摄像机的改变,暂停返回主界面的修改 2024-12-14 00:14:40 +08:00
wulongxiao
58282af49f addd 2024-12-13 22:40:54 +08:00
wulongxiao
2e547a1aca Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-13 22:29:51 +08:00
wulongxiao
7ef9b7ed83 add 2024-12-13 22:29:17 +08:00
9fa31c3fe2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-13 22:28:32 +08:00
f7221ce036 333 2024-12-13 22:28:16 +08:00
wulongxiao
a9fdee5432 修bug 2024-12-13 07:16:44 +08:00
wulongxiao
73ed00eeeb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-13 05:41:40 +08:00
wulongxiao
2e2191249d add 2024-12-13 05:40:51 +08:00
393c7df378 登录以及注册接口的接入 2024-12-13 02:48:11 +08:00
wulongxiao
24ed443715 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-12 23:17:09 +08:00
wulongxiao
18a806eccc 登录界面的修改 2024-12-12 23:16:37 +08:00
4384dc9ed9 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-12 23:04:34 +08:00
d55412e486 火焰攻击 2024-12-12 23:04:13 +08:00
wulongxiao
64ad0b32ab 替换萌妖主界面商店 2024-12-12 20:08:56 +08:00
wulongxiao
6ef0df6a8b 商店皮肤界面以及按钮的完成 2024-12-12 20:05:51 +08:00
wulongxiao
6efac246c2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-12 19:31:03 +08:00
wulongxiao
cdf170e0ba 商店蓝宝石界面的制作 2024-12-12 19:28:20 +08:00
380e554e5f 火焰 2024-12-12 17:07:02 +08:00
wulongxiao
1be92b21d7 英雄界面换成萌妖图鉴界面 2024-12-12 17:05:28 +08:00
wulongxiao
bdbc2ca291 技能逻辑的完善,萌妖关卡json的编写与读取 2024-12-12 11:54:08 +08:00
wulongxiao
8f2c864bf9 json表的读取,技能的升级,提示框的信息完成 2024-12-11 21:34:19 +08:00
wulongxiao
5aee5d0a47 暂停按钮bug修改,技能升级正在实现 2024-12-11 17:08:26 +08:00
c551810458 怪物信息提示位置完成 2024-12-11 12:01:27 +08:00
b790ad3493 可以从外面进入游戏关卡了,但是还有小玩样没有做:1:出怪提示.2:怪物波数显示详情信息,3:各个面板的信息需要动态获取,4:怪物和萌宠数值需要动态赋值,5萌妖伤害统计萌妖写 2024-12-10 09:14:54 +08:00
2c8442cc78 可以查看详细信息了 2024-12-10 07:32:01 +08:00
1c24cbed4f 2.0 2024-12-10 06:57:53 +08:00
94f1492535 1.5 2024-12-10 00:58:59 +08:00
5a1e673363 可以出怪了 2024-12-09 23:24:46 +08:00
d3f6d3b850 1.5 2024-12-09 18:01:59 +08:00