Commit Graph

7944 Commits (b0f868485e88a3eae1ae64b7220a0c31d6655af6)
 

Author SHA1 Message Date
jiaoyangna 9540951a28 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-13 10:38:39 +08:00
jiaoyangna 877ec25063 【ID1009791】
幸运探宝够12张券时开启红点提示
2021-07-13 10:35:39 +08:00
jiaoyangna e444a1283c 【ID1009791】
幸运探宝够12张券时开启红点提示
2021-07-13 10:35:03 +08:00
JieLing 1fcde77049 Merge branch 'china/dev' into china/test 2021-07-12 22:32:05 +08:00
gaoxin 3d3797345d 【角色升级】添加非正常升级校验 2021-07-12 20:11:15 +08:00
JLIOSM1 683a13bf2a 【IOS】修改iOS包的AB包目录结构 2021-07-12 18:31:52 +08:00
jiaoyangna ff8d774c2f 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-12 18:06:06 +08:00
gaoxin facb0fdf4a 【角色升级】删除升级校验 2021-07-12 17:29:39 +08:00
jiaoyangna db2f2312a7 超值基金提交 2021-07-12 17:29:14 +08:00
jiaoyangna 75ffbf8d0b 超值基金提交 2021-07-12 17:28:24 +08:00
zhangqiang 90b577bc16 【心魔试炼】 2021-07-12 16:35:54 +08:00
gaoxin 58b2c30ea9 【角色升级】修复升级错误的问题 2021-07-12 15:59:14 +08:00
jiaoyangna 763c45ebd0 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 7371405fbd)
2021-07-12 11:16:54 +08:00
jiaoyangna 7371405fbd 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
2021-07-12 11:13:12 +08:00
JieLing 2606314be5 Merge branch 'china/dev' into china/test 2021-07-12 10:36:28 +08:00
gaoxin 39b9488286 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-12 10:33:16 +08:00
gaoxin febee39f82 【英雄升级】英雄长按升级时不再进行切换操作 2021-07-12 10:33:05 +08:00
gaoxin 6ab4fd2495 【关闭多点触控】 2021-07-12 10:28:57 +08:00
jiaoyangna a233fb2c7d 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面

(cherry picked from commit 4d588e2948)
2021-07-12 10:19:54 +08:00
jiaoyangna 4d588e2948 【ID1017258】
【碎片合成】碎片仅够合成一个神将时,合成后不自动关闭道具详情界面
2021-07-12 10:19:13 +08:00
JieLing 437fa8c930 Merge branch 'china/dev' into china/test 2021-07-10 20:33:32 +08:00
jiaoyangna 5450b9201a 心愿添加问号确认按钮 2021-07-10 18:50:39 +08:00
jiaoyangna b97b5da01d 抽卡红点提交 2021-07-10 18:27:28 +08:00
jiaoyangna f710e20c60 抽卡红点提交 2021-07-10 18:12:50 +08:00
gaoxin 96475f3085 【角色升级】添加突破最大等级判断 2021-07-10 17:29:31 +08:00
wangzhenxing 5dd8dded1d Merge branch 'china/dev-c-battle' into china/dev 2021-07-10 15:27:50 +08:00
jiaoyangna 1ead3c126d 抽卡红点提交 2021-07-10 14:56:28 +08:00
jiaoyangna b03751a132 无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a)
2021-07-10 14:02:18 +08:00
jiaoyangna bbf89bbd3a 无尽副本九元露修改提交 2021-07-10 14:00:03 +08:00
ZhangBiao 2126197987 【神将升级】升级加校验 2021-07-09 19:20:55 +08:00
jiaoyangna 4531a9636a 神将界面层级修改提交
(cherry picked from commit 1e18e57b12)
2021-07-09 18:41:11 +08:00
jiaoyangna 1e18e57b12 神将界面层级修改提交 2021-07-09 18:40:52 +08:00
jiaoyangna 429bbb32cd Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 18:38:19 +08:00
jiaoyangna ee344a1a39 神将界面切换遮罩修改
(cherry picked from commit 513cd35d5c)
2021-07-09 18:38:15 +08:00
jiaoyangna 513cd35d5c 神将界面切换遮罩修改 2021-07-09 18:37:53 +08:00
gaoxin e8a86baed8 【物品特效】修复魂印界面特效显示位置错误 2021-07-09 18:33:14 +08:00
gaoxin 224f0c8c82 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 18:28:24 +08:00
gaoxin 1d739a9d9d 【物品特效】魂印各界面显示修改 2021-07-09 18:28:18 +08:00
jiaoyangna 5531dca914 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置,增加特效突出效果

(cherry picked from commit eaf814bbfa)
2021-07-09 18:22:52 +08:00
jiaoyangna eaf814bbfa 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置,增加特效突出效果
2021-07-09 18:22:13 +08:00
jiaoyangna fe5fc7fa68 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置

(cherry picked from commit 7c960704aa)
2021-07-09 18:02:08 +08:00
jiaoyangna 7c960704aa 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置
2021-07-09 18:01:41 +08:00
gaoxin f7e5775495 【登录】修改判断提审和正式服的方式 2021-07-09 17:33:21 +08:00
gaoxin e3eff1e553 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 17:22:58 +08:00
gaoxin 5d51821dbe 【物品特效】修复魂印宝箱详细界面不显示特效的问题 2021-07-09 17:22:51 +08:00
jiaoyangna 36a4a6241f 无尽副本修改提交
(cherry picked from commit 2686f970d7)
2021-07-09 17:11:29 +08:00
jiaoyangna 751f7cd84b 【ID1009609】
【优化】无尽副本优化

(cherry picked from commit dd1f598515)
2021-07-09 17:11:23 +08:00
gaoxin 6405a0ad4d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 17:06:01 +08:00
gaoxin 1f4499e8bb 【物品特效】修复魂印特效显示错误 2021-07-09 17:05:55 +08:00
jiaoyangna 2686f970d7 无尽副本修改提交 2021-07-09 17:04:25 +08:00