Commit Graph

7809 Commits (4d11ade910a192c64c9eb82d86836316ba9dc006)
 

Author SHA1 Message Date
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
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
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
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
jiaoyangna dd1f598515 【ID1009609】
【优化】无尽副本优化
2021-07-09 15:22:10 +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
jiaoyangna eae0af74e5 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移  调整间距
2021-07-09 14:45:11 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
jiaoyangna 92c22544e0 修改抽卡界面描述 2021-07-09 14:08:17 +08:00
gaoxin 49b55f863a 【地图资源导入】 2021-07-09 13:59:43 +08:00
jiaoyangna 894e7d7c46 抽卡动画播放时。去掉跳过按钮,改为点击屏幕任意位置,即可跳过动画,界面内增加 2021-07-09 13:39:24 +08:00
jiaoyangna 55b4379c47 【ID1009654】
【优化】优化抽卡界面
2021-07-09 12:01:28 +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
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
wangzhenxing 33b37451e1 【战斗】=============被动 108 200 283 322 修改 新增被动 337 2021-07-09 11:54:02 +08:00
ZhangBiao 5e1897515b 【商店】商店黑屏修复 2021-07-09 11:10:38 +08:00
ZhangBiao 3194181f65 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:42:23 +08:00