Commit Graph

7693 Commits (7d5968f058a2be8151ffc8c562f0977f28b6ef59)
 

Author SHA1 Message Date
jiaoyangna 7d5968f058 超值基金
(cherry picked from commit 7cca06a5d7)
2021-07-14 17:00:22 +08:00
jiaoyangna dc363d25c4 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 9e1366ff27)
2021-07-14 17:00:14 +08:00
jiaoyangna 977faf9b04 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit ff14ff62ee)
2021-07-14 17:00:07 +08:00
jiaoyangna a8fd256812 ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 53e0f1adcc)
2021-07-14 16:59:59 +08:00
jiaoyangna 047c5c26f7 globaldefine冲突修改 2021-07-14 16:59:03 +08:00
jiaoyangna f1a7e93595 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit ff8d774c2f)
2021-07-14 16:57:15 +08:00
jiaoyangna 6aea37d365 Revert "Revert "超值基金提交""
This reverts commit 23fa4e0ab1.
2021-07-14 16:56:27 +08:00
zhangqiang e4469de1c3 【游心】场景提交 2021-07-14 16:01:05 +08:00
jiaoyangna 23fa4e0ab1 Revert "超值基金提交"
This reverts commit 75ffbf8d0b.
2021-07-13 14:39:31 +08:00
gaoxin e85939abc7 【角色升级】修复高星级无法升级的问题 2021-07-13 11:19:01 +08:00
jiaoyangna 4ff85486ed 【ID1009791】
幸运探宝够12张券时开启红点提示

(cherry picked from commit 877ec25063)
2021-07-13 10:39:30 +08:00
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
gaoxin 3d3797345d 【角色升级】添加非正常升级校验 2021-07-12 20:11:15 +08:00
gaoxin facb0fdf4a 【角色升级】删除升级校验 2021-07-12 17:29:39 +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
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
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 b03751a132 无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a)
2021-07-10 14:02:18 +08:00
jiaoyangna 4531a9636a 神将界面层级修改提交
(cherry picked from commit 1e18e57b12)
2021-07-09 18:41:11 +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
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 fe5fc7fa68 【ID1009655】
【优化】主题活动默认放到第一排第一个按钮位置

(cherry picked from commit 7c960704aa)
2021-07-09 18:02:08 +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
ZhangBiao a00e8d0966 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 16:56:33 +08:00
ZhangBiao 958254f93d 【神将升级】升级加校验 2021-07-09 16:56:05 +08:00
gaoxin 1a33172a27 【地图】节点27是特效节点 2021-07-09 15:02:11 +08:00
gaoxin c33b24ba18 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-09 14:57:02 +08:00
gaoxin be7cc055a1 【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示 2021-07-09 14:56:57 +08:00
jiaoyangna 21b85bedff 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距

(cherry picked from commit eae0af74e5)
2021-07-09 14:47:17 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
gaoxin 49b55f863a 【地图资源导入】 2021-07-09 13:59:43 +08:00
gaoxin b11fe20dfd 【Android】删除对某特殊sdk的配置 2021-07-09 11:58:35 +08:00
gaoxin b45278e389 【version】删除AssetBundles中无用的version配置 2021-07-09 11:57:46 +08:00