Commit Graph

5297 Commits (0497fc30f590469efb2b35cc8d77a68959d4563b)

Author SHA1 Message Date
ZhangBiao 0497fc30f5 【山河试炼】按钮状态颜色修改 2021-07-14 14:10:06 +08:00
ZhangBiao 3a3bcf21b8 【山河试炼】提交 2021-07-14 13:48:29 +08:00
ZhangBiao 6d56325c26 【山河试炼】按钮判断方式提交 2021-07-14 11:41:14 +08:00
ZhangBiao 55f71e2c89 Revert "Revert "【山河试炼】增加主城红点检测""
This reverts commit 67e44741f6.
2021-07-14 11:36:55 +08:00
ZhangBiao c8b8a84d47 【山河试炼】差红点检测 2021-07-14 11:36:33 +08:00
ZhangBiao 227def7404 【山河试炼】代码提交 2021-07-14 11:33:33 +08:00
ZhangBiao 6be1886d2f 【山河试炼】开坑 2021-07-14 11:30:09 +08:00
gaoxin e85939abc7 【角色升级】修复高星级无法升级的问题 2021-07-13 11:19:01 +08:00
gaoxin 3d3797345d 【角色升级】添加非正常升级校验 2021-07-12 20:11:15 +08:00
gaoxin facb0fdf4a 【角色升级】删除升级校验 2021-07-12 17:29:39 +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
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 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
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 b02b315f78 Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-08 18:41:26 +08:00
ZhangBiao fc8e199a43 【鸿蒙阵】使者处于突破等级且突破,共鸣神将不算突破 2021-07-08 18:41:14 +08:00
jiaoyangna fa30243bf5 玉皇大帝修改提交
(cherry picked from commit 6ea9ee51c0)
2021-07-08 18:30:29 +08:00
zhangqiang 21ec904da5 【心魔试炼】点击快速战斗偶先报错卡死 2021-07-08 18:08:16 +08:00
zhangqiang c723fa04af 【飘邈之旅】页签的入口文字要与图片统一成“飘邈之旅”字 2021-07-08 16:20:22 +08:00
ZhangBiao e250223aa2 【鸿蒙阵】增加logerror
(cherry picked from commit 30f2a8cb1a)
2021-07-08 15:55:04 +08:00
wangzhenxing f247221fcc 【战斗】=========被动104 267 319 修改; 战斗显示修改 击杀同时给敌人上buff 不显示buff图标提示(除不灭。死亡技能) 2021-07-07 20:29:37 +08:00
zhangqiang 9c2dee5856 【缥缈之旅】没解锁天数完成了任务,礼包显示灰点 2021-07-07 15:56:29 +08:00
wangzhenxing dad8dbf11b [公会红包]=============红包抢完显示白片修改 2021-07-07 15:09:06 +08:00
jiaoyangna df4a9b0d74 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-07 11:57:49 +08:00