Commit Graph

4486 Commits (63b9348e5429164fd8e6ec13069f01c0e1325979)
 

Author SHA1 Message Date
ZhangBiao 63b9348e54 充值界面 2021-03-18 11:31:10 +08:00
ZhangBiao 30c05503c1 【累充】 2021-03-18 11:23:15 +08:00
jiaoyangna 0209a90c27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 11:13:26 +08:00
jiaoyangna 11a5cf2a99 【首充】孙悟空页面详情天赋显示错误 2021-03-18 11:13:10 +08:00
ZhangBiao 476251b484 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:47:28 +08:00
ZhangBiao 0d1c61ec89 【累计充值】 2021-03-18 10:47:20 +08:00
zhangqiang 88b1230c42 【本地化魂印】专属魂印适用范围不显示 2021-03-18 10:41:54 +08:00
ZhangBiao e26d838851 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:30:29 +08:00
ZhangBiao 95ee2d301d 【主题活动】 2021-03-18 10:30:21 +08:00
ZhangBiao 2ba7583da3 【中文元修改】 2021-03-18 10:27:36 +08:00
gaoxin 3498c8803b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:16:47 +08:00
gaoxin 4c30b42f61 【bug】修复替换装备时按钮文字错误 2021-03-18 10:16:34 +08:00
ZhangBiao fb7bdbbe29 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:11:10 +08:00
ZhangBiao 8c90b7fe7c 【自选宝箱】 2021-03-18 10:11:00 +08:00
gaoxin 778ed8e886 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 10:07:08 +08:00
gaoxin 64ee4697f5 【bug】点击替换装备,装备图标跟穿戴着的图标一样 2021-03-18 10:07:03 +08:00
jiaoyangna 98e2ad0e3b 【美元显示】解锁青龙秘宝 2021-03-18 09:56:02 +08:00
jiaoyangna 4715c7d469 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 20:43:50 +08:00
jiaoyangna 9f1f204588 主界面提交 2021-03-17 20:43:47 +08:00
ZhangBiao 84788732a2 首充金额修改 2021-03-17 19:06:15 +08:00
ZhangBiao 1688bd41fb 【八日登录】图片位置修改 2021-03-17 18:01:58 +08:00
JieLing ca3bcb612d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:37:06 +08:00
JieLing 40c0ed6075 【sdk】国内sdk适应修改 2021-03-17 17:36:50 +08:00
jiaoyangna f35e638e22 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:34:20 +08:00
jiaoyangna d6b008742b gm 提交 2021-03-17 17:34:14 +08:00
gaoxin 7b28309e1c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 17:30:18 +08:00
gaoxin 40bfa7c586 【配置】国内相关修改 2021-03-17 17:30:13 +08:00
zhangqiang f2b3df9721 【修改提交】 2021-03-17 17:27:53 +08:00
zhangqiang 6eb9050d4a 【轩辕宝镜】不进版本但是可以通过穿戴界面道具跳转 2021-03-17 17:17:20 +08:00
zhangqiang d5f34e516c 【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉 2021-03-17 16:56:02 +08:00
gaoxin 8cf2670d6b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:54:02 +08:00
gaoxin 80209e4a35 【引导战斗】加入 2021-03-17 16:53:48 +08:00
wangzhenxing 7185fb678f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:46:02 +08:00
wangzhenxing 433a6b243c [战斗]=============被动191修改,buff图标叠加添加免疫和连接符 2021-03-17 16:45:26 +08:00
gaoxin 2db591318f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:45:19 +08:00
gaoxin 6f52e3e338 【bug】统一一键合成时的文字提示 2021-03-17 16:45:13 +08:00
wangzhenxing 7d576d8c0c [战斗]=============被动225修改 增加最大血量客户端特殊处理 2021-03-17 16:43:28 +08:00
jiaoyangna adb3a1e750 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:20:22 +08:00
ZhangBiao 2e685100ea Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:17:50 +08:00
ZhangBiao c8661ab384 【首领来袭】任务过小修改, 2021-03-17 16:17:41 +08:00
zhangqiang 38a6548a52 【充值】开服成长礼包道具太多,会重叠。 2021-03-17 16:15:55 +08:00
jiaoyangna 5963eb170b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:04:31 +08:00
ZhangBiao b630889891 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 16:01:02 +08:00
ZhangBiao 17990d0dc8 【自选宝箱】修改 2021-03-17 16:00:52 +08:00
zhangqiang 125a393167 【修bug】 2021-03-17 15:54:45 +08:00
gaoxin aa30b1ed6e 【bug】修复升级神将立即关闭界面,再次打开界面时显示错误 2021-03-17 15:29:23 +08:00
jiaoyangna 95351b5bd1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 15:03:54 +08:00
zhangqiang 7cc397c43f 【资源替换】技能新字替换 2021-03-17 14:58:54 +08:00
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna ee30858c07 添加一个红点 2021-03-17 14:20:51 +08:00