Commit Graph

494 Commits

Author SHA1 Message Date
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
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
b563233d2f 收集水滴接口的接入 2024-12-20 21:03:36 +08:00
GL
e6f69939e9 2024-12-20 18:02:18 +08:00
GL
069fd83170 火炎 2024-12-20 17:40:13 +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
ef0587c815 修bug 2024-12-20 12:03:29 +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
934f3f8c51 该改了宝石接口 2024-12-18 23:15:00 +08:00
wulongxiao
585a77b1b9 玩家名字修改 2024-12-18 21:04:28 +08:00
wulongxiao
4a7ba77ae7 头像闹测 2024-12-18 20:52:56 +08:00
wulongxiao
0264d1f162 2.1 2024-12-18 20:49:42 +08:00
wulongxiao
6649d55ab5 xiubug 2024-12-18 20:32:37 +08:00
GL
b292efafdd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 17:49:41 +08:00
GL
421a21182d 怪物移动路径偏差 2024-12-18 17:49:27 +08:00
wulongxiao
1427b46560 新生态树模块 2024-12-18 17:30:57 +08:00
wulongxiao
c89639c13c 修复一开始账单 2024-12-18 17:15:32 +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
06c24cd887 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 17:04:59 +08:00
wulongxiao
ab765c38d8 账单详情整完了 2024-12-18 17:04:21 +08:00
GL
9fb026c006 攻击改为CD攻击,血条缓减 2024-12-18 16:55:26 +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
wulongxiao
2a06aceea6 账单 2024-12-18 14:20:31 +08:00
3b5c92a7f3 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-18 12:03:36 +08:00
b9b9a831fa 生态书团队接口的接入 2024-12-18 12:03:24 +08:00
wulongxiao
7671494f91 脚本 2024-12-18 12:02:38 +08:00
wulongxiao
8c77ba8500 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-17 22:55:40 +08:00
f0eecf4313 用户注销接口的接入 2024-12-17 22:44:43 +08:00
a378a947b2 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-17 22:23:38 +08:00
85e175c117 更新用户信息接口的接入 2024-12-17 22:23:25 +08:00
GL
bafec4e1cd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-17 18:08:05 +08:00
GL
eff9ec23d1 企鹅动画修改 2024-12-17 18:07:54 +08:00
wulongxiao
fd0f8bf8cb Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-12-17 18:04:11 +08:00
wulongxiao
0a885e2514 弹窗管理 2024-12-17 18:03:58 +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
GL
3f8f429755 怪物受击变色,僵直,飘字放大,残血屏幕红色闪烁 2024-12-16 17:46:38 +08:00
wulongxiao
d560ce058d 怪物死亡动画,萌妖攻击动画,战魂掉落动画,修bug 2024-12-14 23:20:55 +08:00
wulongxiao
b9db3ff518 add 2024-12-14 21:15:57 +08:00
wulongxiao
ab29549151 bug 2024-12-14 17:34:12 +08:00
19e18177f7 重新进入场景卡牌显示的bug,以及摄像机的改变,暂停返回主界面的修改 2024-12-14 00:14:40 +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
8ac9c95887 待优化:1:接口的验证码调整,2:敌人点击信息调整,3:敌人波次信息调整,4:波次调整
2024年12月13日,08点47分——wlx——ll
2024-12-13 08:48:10 +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
d55412e486 火焰攻击 2024-12-12 23:04:13 +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
cb20481357 怪物正常死亡 2024-12-09 23:48:01 +08:00
5a1e673363 可以出怪了 2024-12-09 23:24:46 +08:00
d3f6d3b850 1.5 2024-12-09 18:01:59 +08:00
98a4ed6480 界面逻辑完成 2024-12-09 11:56:41 +08:00
6ece6fbca5 放置萌妖 2024-12-08 04:55:59 +08:00
d5f9d056ca 战斗场景的添加和修改 2024-12-08 02:52:59 +08:00
1143d8c6a4 登录界面所有接口的定义 2024-12-06 17:09:43 +08:00
wulongxiao
f6d8db5a5c 接口测试 2024-12-06 16:18:17 +08:00
03574c54a1 工会UI的制作 2024-11-25 17:58:55 +08:00
776eb7322d 动画的修改 2024-11-25 15:53:48 +08:00
7ebea3d3ed 游戏中心动画的修改 2024-11-25 14:35:52 +08:00
a56a2add03 完成所有UI界面的切换 2024-11-24 23:18:10 +08:00
huyulong
f177df2670 制作岛主竞拍和证书界面 2024-11-22 11:51:22 +08:00
huyulong
8e76a2de45 修改了一些UI的问题 2024-11-20 15:27:02 +08:00
a3b4ccbf70 养成界面的动画的制作 2024-11-19 16:48:27 +08:00
wulongxiao
e4be734866 修复bug 2024-11-18 15:46:45 +08:00
ffdce0a623 修改登录进度条 2024-11-18 10:42:48 +08:00
33f9f25140 所有场景制作完成 2024-11-17 01:54:23 +08:00
de1b5fb316 养成界面动画的完成 2024-11-16 18:38:34 +08:00
072b0dcd4b 生态树的修改以及全网界面UI的制作以及锁妖塔的跳转 2024-11-16 18:25:44 +08:00
887c2f1b5e 领奖提现UI以及弹窗的完成 2024-11-16 17:56:30 +08:00
384f902d0e 完成场景,以及图片中文命名的更改 2024-11-16 07:10:28 +08:00
wulongxiao
6b3332dda4 宝石矿完成 2024-11-16 01:53:21 +08:00
wulongxiao
c86ae668fd Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-16 01:20:50 +08:00
wulongxiao
3c52cf8589 金沙矿全部制作完成 2024-11-16 01:20:28 +08:00
7413db81c6 主场景 2024-11-16 01:07:21 +08:00
bad526453c Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-16 00:22:59 +08:00
huyulong
13a403c7f8 修复老鼠转向问题 2024-11-15 23:57:06 +08:00
huyulong
09cf4ae9e3 修改精灵挖矿Unity崩溃的Bug 2024-11-15 23:36:34 +08:00
b0a0f2425f Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 22:57:28 +08:00
huyulong
c12208a8e2 jingsha wakuang 2024-11-15 22:44:04 +08:00
7fbf181970 修改了拉新会的UI 2024-11-15 21:40:33 +08:00
huyulong
1b4fbd7eaf add放逻辑代码的文件夹 2024-11-15 19:26:15 +08:00
wulongxiao
f0cc3ac44a 宝石岛更新了一点点 2024-11-15 18:48:38 +08:00
wulongxiao
99ff9cdfe1 金币岛完成90%,需要调整一下动画时间 2024-11-15 17:29:16 +08:00
wulongxiao
84ab13deee 重新岛屿控制,船控制代码 2024-11-15 16:10:51 +08:00
wulongxiao
8cf83787cd add_fish 2024-11-15 16:09:17 +08:00
3bf8b7f673 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 15:22:55 +08:00
wulongxiao
0514fe07ec 写了一个SpriteAniationpro在communal的ui里,可以选择image播放帧动画,存储个不同状态的动画,通过指定,播放指定的图集,在代码销毁时会自带消除 2024-11-15 15:21:16 +08:00
c0e5cbc88a Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-15 15:14:27 +08:00
e8ac7ee13f add 2024-11-15 15:13:21 +08:00
wulongxiao
66a9acc373 scene_jibidao_80%_get_wulongxiao_2024年11月15日_12点12分 2024-11-15 12:12:52 +08:00
73b3f469d0 11.15:更新生态书UI界面以及养成界面岛主与游戏点击弹出暂未开放的弹窗 2024-11-15 11:23:25 +08:00
6c4c00cbfb add 2024-11-14 20:14:49 +08:00
5f4fc9aeb1 Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-14 17:23:20 +08:00
9a1035ae3b add 2024-11-14 17:23:08 +08:00
wulongxiao
dcf050a2ea add 2024-11-14 17:18:51 +08:00
4c3380fa79 add 2024-11-14 16:15:28 +08:00
d467595a04 add 2024-11-14 16:05:27 +08:00
d5fe981425 add 2024-11-14 10:09:34 +08:00
c1ed2c8805 add 2024-11-14 09:57:30 +08:00
9c80f3f1d3 add 2024-11-14 09:30:55 +08:00
9905b03b4f add 2024-11-13 17:58:34 +08:00
072a7e73ac add 2024-11-13 15:07:51 +08:00
da0423271f add 2024-11-13 11:15:09 +08:00
hyskai
06a797c146 add 2024-11-12 23:18:51 +08:00
935d5d0111 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 21:11:32 +08:00
887063e696 ADD 2024-11-12 21:10:56 +08:00
五条悟
f6883778c5 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 17:45:54 +08:00
e30b300ec7 add 2024-11-12 17:41:06 +08:00
五条悟
4af70eb693 Merge branch 'main' of http://sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks 2024-11-12 17:39:29 +08:00
五条悟
0970585eaf 111 2024-11-12 17:39:14 +08:00
781e30d010 addItem 2024-11-12 17:35:15 +08:00
1653402fa8 add 2024-11-11 12:04:41 +08:00
e8ac7e032e ADD 2024-11-09 00:00:46 +08:00
14e843f081 add 2024-11-08 16:29:30 +08:00
a98c8de2eb add 2024-11-08 00:41:10 +08:00
8010108fb8 add 2024-11-07 20:27:33 +08:00
bdabe1b7b8 add 2024-11-07 18:03:20 +08:00
842fd23e78 add 2024-11-07 14:20:59 +08:00
281f0f9e02 ADD 2024-11-07 00:06:45 +08:00
a845f2f72e add 2024-11-05 17:31:45 +08:00
2149c29713 add 2024-11-05 14:29:51 +08:00
0d502ea39d add 2024-11-05 08:07:27 +08:00
87e51ab6ec add 2024-11-05 07:19:41 +08:00
6430a45dcc add 2024-11-05 07:05:29 +08:00
hyskai
e595df5aa7 add 2024-11-05 06:41:16 +08:00
hyskai
dd956bbfee Merge branch 'main' of http://192.168.2.19:3000/shurongsen/Cute_demon_attacks
# Conflicts:
#	meng_yao/Assets/script/cultivation_Jinsha_mine_slices/RoomJinsha.cs
2024-11-05 05:12:13 +08:00