Commit Graph

1047 Commits (c981f24ed01ec602e54d388fcbfd5cb28af4600c)

Author SHA1 Message Date
jiaoyangna 94e0dc10df Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:42:25 +08:00
jiaoyangna 010f44b1b0 commit zhihuan 2020-08-27 21:41:30 +08:00
gaoxin a7fea145f6 修复日周月礼包不显示的问题 2020-08-27 21:40:01 +08:00
gaoxin aea5077487 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 21:34:43 +08:00
gaoxin b78d3e667e 每日充值金额显示不在计算差值 2020-08-27 21:34:38 +08:00
jiaoyangna f2f3b77260 biandui update 2020-08-27 21:29:03 +08:00
jiaoyangna f25bdb2d17 神将置换去掉检测编队 2020-08-27 21:17:47 +08:00
jiaoyangna 283ffca275 神将置换不检测无尽副本 2020-08-27 21:01:05 +08:00
jiaoyangna 3961935716 【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换 2020-08-27 20:45:27 +08:00
jiaoyangna ff4d3e35c1 pozhenzhuxian redpoint update 2020-08-27 19:52:05 +08:00
jiaoyangna 9ed09dc1d2 tiangong serecttreasure commit 2020-08-27 19:41:51 +08:00
zhangqiang fa3003fdc6 云梦祈福修改提交 2020-08-27 19:28:06 +08:00
gaoxin 51abf7d496 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:35:51 +08:00
gaoxin 82606d8fbe 每日周月礼包根据后端数据判断显隐 2020-08-27 18:35:32 +08:00
ZhangBiao a69ef6ca5c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:31:56 +08:00
ZhangBiao 2a2eac8cbb 森罗战斗失败两次弹出失败 2020-08-27 18:31:39 +08:00
jiaoyangna 227f5a9a38 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:24:44 +08:00
jiaoyangna 6aaa749852 activitydetail effect commit 2020-08-27 18:24:05 +08:00
ZhangBiao 82ec03a605 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 18:16:02 +08:00
ZhangBiao 021a7dc5a7 森罗换层卡死问题修复 2020-08-27 18:15:53 +08:00
gaoxin 1ce0e4b15c 战斗怒气文字修改 2020-08-27 17:26:55 +08:00
zhangqiang d452d76d05 显示活动选中修改 替换出包图片资源 2020-08-27 16:54:26 +08:00
jiaoyangna cb50189d13 处于传记页签时,切换后仍选中传记,但显示变为情报页签内容 2020-08-27 16:50:04 +08:00
jiaoyangna a6382ff8d2 选中传记页签后,按钮变为“传说” 2020-08-27 16:44:25 +08:00
jiaoyangna a350ec795d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 16:05:51 +08:00
jiaoyangna ca618e9f33 add xuanyuan des 2020-08-27 16:05:46 +08:00
zhangqiang fe3ff00677 增加魂印战力 2020-08-27 15:21:08 +08:00
ZhangBiao 114c910cd8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 15:18:27 +08:00
ZhangBiao 52643c3937 大闹天宫入口开启修改 2020-08-27 15:18:17 +08:00
jiaoyangna 1c17724594 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 15:02:03 +08:00
jiaoyangna cb69e474b9 qinglong task redpoint commit 2020-08-27 14:53:27 +08:00
JieLing 987ad6a325 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 14:29:21 +08:00
JieLing 78729f680d 修复公会界面监听事件错误,导致公会技能升级卡顿的问题 2020-08-27 14:29:14 +08:00
ZhangBiao 1243629056 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 13:59:21 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
zhangqiang a2bd473d75 再次修改工会技能升级 2020-08-29 16:23:31 +08:00
zhangqiang 220a8f216e 大闹天宫背景 大闹天宫女例会比例 公会技能更新战力调整位置 2020-08-29 16:15:41 +08:00
jiaoyangna 8b27411fd8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 12:01:07 +08:00
jiaoyangna 19465ac1b2 【宝物】共鸣界面等级上限显示不正确 2020-08-27 12:01:01 +08:00
jiaoyangna a4b73c33b2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-01 00:06:49 +08:00
jiaoyangna 2833c3a269 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-10-01 00:06:24 +08:00
jiaoyangna 9bc710ce58 qinglong commit 2020-10-01 00:05:54 +08:00
JieLing 4160f6d2a5 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-27 11:54:39 +08:00
liujiaqi e3ce0b2c1b 小女孩剧情位置修改 2020-08-27 11:54:32 +08:00
zhangqiang 162180894b 车迟抢夺记录排续 2020-08-29 15:40:24 +08:00
JieLing 0f3b38f85e 修复主界面巅峰赛按钮时间显示错误的问题 2020-08-27 11:49:58 +08:00
liujiaqi 3effb209bb 新男女角色 2020-08-27 11:27:05 +08:00
zhangqiang c315cf768d 竞技场排行 2020-08-27 10:52:35 +08:00
ZhangBiao 1e4f936810 无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复 2020-08-27 10:49:44 +08:00
zhangqiang 08a37d89d0 删除编队英雄去掉无尽副本判断 2020-08-27 09:40:25 +08:00
jiaoyangna d43d4970e7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 23:14:58 +08:00
jiaoyangna 1b5c0e361a qinglong commit 2020-08-26 23:14:51 +08:00
gaoxin 94612d54e4 剧情立绘替换 2020-08-26 23:10:03 +08:00
zhangqiang 47a16583ee 达人排行点击事件修复 2020-08-26 23:07:04 +08:00
gaoxin db0a09ab68 修复副本界面通关后战斗力背景图标不关闭的问题 2020-08-26 22:37:31 +08:00
gaoxin 3dc8330e4b 修复连续点击导致战斗界面打开多次导致报错,立绘重叠的问题 2020-08-26 22:37:23 +08:00
zhangqiang 241a858968 首冲十星展示 法宝返回顺序修复 2020-08-26 22:15:23 +08:00
jiaoyangna a7c7bd26ff Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 21:57:23 +08:00
jiaoyangna 50a40cc7b6 破阵诛仙修改 2020-08-26 21:57:10 +08:00
zhangqiang 7044422ebf 装备合成bug修复 2020-08-26 21:55:39 +08:00
jiaoyangna 9a0d461ada jwel commit 2020-08-26 21:37:19 +08:00
jiaoyangna 1cdaf20d08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 21:35:04 +08:00
jiaoyangna a6e3ddcd7d 【宝物】精炼,弹服务器开小差 2020-08-26 21:34:48 +08:00
zhangqiang 812450c032 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:56:48 +08:00
zhangqiang 6dec0b0307 修改公会技能升级 更新英雄战力 2020-08-26 20:56:28 +08:00
gaoxin dbebfeddf7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:54:37 +08:00
gaoxin ee71156c2c 修复背包界面装备战斗力不显示的问题 2020-08-26 20:53:56 +08:00
jiaoyangna 1482d308cb 日常副本修改 2020-08-26 20:37:31 +08:00
jiaoyangna b987f3124a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:31:07 +08:00
jiaoyangna 1cc497b2fd qinglong commit 2020-08-26 20:30:52 +08:00
gaoxin 8b0c138f68 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:20:53 +08:00
gaoxin 4b41b5def9 副本界面显示优化 2020-08-26 20:20:40 +08:00
jiaoyangna f28c176f18 add activity status 2020-08-26 20:17:37 +08:00
jiaoyangna 3c6a636d0d qinglong commit 2020-08-26 20:04:36 +08:00
jiaoyangna 03048116e4 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 20:04:13 +08:00
jiaoyangna c2ec9c93f8 【秘宝试炼】周试炼刷新后时间显示负,青龙秘宝结束不关闭 2020-08-26 20:04:02 +08:00
zhangqiang 86361419cc 神将合成bug 2020-08-26 19:44:29 +08:00
ZhangBiao f47dc8f441 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 19:08:31 +08:00
ZhangBiao 134b70ce33 成长礼包美元符号位置 2020-08-26 19:08:21 +08:00
gaoxin a972b4993b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:33:57 +08:00
gaoxin e834044de0 修复战斗最后一回合结束还会再打一次的问题 2020-08-26 18:33:47 +08:00
jiaoyangna 8a4f24ce77 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:35 +08:00
jiaoyangna f62a007edb qinglong commit 2020-08-26 18:29:27 +08:00
ZhangBiao 87891b2798 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 18:29:10 +08:00
ZhangBiao 42b0ffe95d 月基金价格修改 2020-08-26 18:29:02 +08:00
gaoxin 093c6d1f41 竞技场按钮功能未开启不再显示 2020-08-26 18:18:12 +08:00
gaoxin 46403f1431 创建角色界面显示优化 2020-08-26 18:17:43 +08:00
gaoxin 80e2f16169 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:58:51 +08:00
gaoxin fcf0557f01 修复公会boss立绘会创建多次的问题 2020-08-26 17:58:46 +08:00
gaoxin bab4148db6 主界面十绝阵,巅峰赛按钮添加 2020-08-26 17:58:23 +08:00
ZhangBiao ed22b5b9d2 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:57:12 +08:00
ZhangBiao 8dd4feeead 乾坤宝囊特效增加 2020-08-26 17:56:59 +08:00
zhangqiang 730a39cd69 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:45:32 +08:00
zhangqiang efaa3e51cc 公会副本刷新问题 2020-08-26 17:45:18 +08:00
ZhangBiao ca6862831a Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 17:22:03 +08:00
ZhangBiao 09c72dc362 神将界面点击前往化虚坛提示75级问题修改 2020-08-26 17:21:50 +08:00
jiaoyangna 4fd97151a5 qinglong commit 2020-08-26 17:13:27 +08:00
jiaoyangna 265f0f8781 qinglong commit 2020-08-26 17:08:04 +08:00
jiaoyangna d8d8dc5721 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-26 16:32:17 +08:00
jiaoyangna 24b4852ea7 qinglong commit 2020-08-26 16:32:12 +08:00