Commit Graph

2770 Commits (fb7bdbbe2975b939b3f5f45bf25fd01a2ef77ef7)

Author SHA1 Message Date
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 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 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
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 c8661ab384 【首领来袭】任务过小修改, 2021-03-17 16:17:41 +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
ZhangBiao 4efb36a195 【八日登陆】资源修改 2021-03-17 14:37:56 +08:00
jiaoyangna ee30858c07 添加一个红点 2021-03-17 14:20:51 +08:00
jiaoyangna 909ed03c04 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 13:33:22 +08:00
ZhangBiao bf3d732b69 【中文本地化】 2021-03-17 12:05:44 +08:00
jiaoyangna 32c239fcb2 活动开启条件提交 2021-03-17 12:02:32 +08:00
jiaoyangna 31b808209e 主界面修改提交 2021-03-17 11:55:02 +08:00
jiaoyangna dfd3c4acc6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 11:54:40 +08:00
ZhangBiao 15dec90220 【本地化】修改 2021-03-17 11:29:43 +08:00
jiaoyangna a7c5bcce1a 主界面修改提交 2021-03-17 11:07:47 +08:00
jiaoyangna 5d89fe2a79 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-17 10:38:11 +08:00
jiaoyangna 36f4efedc8 主城优化修改 2021-03-17 10:38:07 +08:00
gaoxin 15103f5032 【ios】引导战斗添加 2021-03-17 09:52:50 +08:00
gaoxin c8c81215ce 【图鉴】根据表配置控制显示隐藏 2021-03-16 18:06:57 +08:00
jiaoyangna 3fe1267e86 功能隐藏
(cherry picked from commit 2f2cf25801)
2021-03-16 17:43:59 +08:00
jiaoyangna 8ec9b44626 功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e)
2021-03-16 17:38:29 +08:00
ZhangBiao e758730d4a 【首领来袭】 2021-03-16 17:25:11 +08:00
ZhangBiao 003d2e8ba5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-16 17:09:35 +08:00
ZhangBiao c2cab749f4 【首领来袭】位置调整 2021-03-16 17:09:18 +08:00
JieLing c945f53946 【修改bug】提交 竞技场 + 试炼奖励优化list重叠 2021-03-16 16:06:55 +08:00
ZhangBiao 6dda93f175 【国内测试】无法登录修复 2021-03-16 15:29:38 +08:00
ZhangBiao 4528e23541 Merge branch 'china/dev' into 0活动开发聚集地/限时神装 2021-03-16 14:49:47 +08:00