Commit Graph

3059 Commits (5847735f79f6d2853edf0788199f8dc08a6576a3)

Author SHA1 Message Date
gaoxin 5847735f79 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 20:03:26 +08:00
gaoxin 8c2a1c9a5b 【引导】引导GM添加 2021-03-31 20:03:21 +08:00
jiaoyangna 56605c0ab7 购买特权 刷新礼包 修改 2021-03-31 19:56:31 +08:00
jiaoyangna 02fde882a8 妖晶不足跳转修改 2021-03-31 19:33:12 +08:00
jiaoyangna 85c09e3094 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:30:56 +08:00
jiaoyangna 104f52f61b 特权礼包滑动位置 修改 2021-03-31 19:30:45 +08:00
zhangqiang 4698fc6dbf 【福利签到】bug 2021-03-31 19:26:44 +08:00
jiaoyangna 61426fba07 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:08:04 +08:00
jiaoyangna e73cf4533b 报错修改 2021-03-31 19:07:50 +08:00
gaoxin 5f16021a0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 19:06:34 +08:00
gaoxin 9c080a0cac 【激素探索】按钮扫光光效修改 2021-03-31 19:06:16 +08:00
jiaoyangna 292515e12e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:41:47 +08:00
ZhangBiao 2204717b5a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:40:34 +08:00
jiaoyangna 4365e8afff Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:39:02 +08:00
jiaoyangna f8245898b0 特权礼包修改提交 2021-03-31 18:38:57 +08:00
zhangqiang c2df1a807b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 18:29:00 +08:00
zhangqiang d131bdbadd 【适配】 2021-03-31 18:28:46 +08:00
jiaoyangna 5574c4bdac 灵兽特权 显示光效修改 2021-03-31 18:02:37 +08:00
jiaoyangna 0c43f05161 灵兽秘卷修改 2021-03-31 18:00:44 +08:00
ZhangBiao 9b533a698b 【适配】 2021-03-31 17:55:47 +08:00
jiaoyangna 39b457f544 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 17:55:39 +08:00
jiaoyangna 29d8059755 特效修改 2021-03-31 17:55:33 +08:00
zhangqiang 60353d6dbd 【归元优化】bug 2021-03-31 17:40:51 +08:00
zhangqiang c6425d9fe9 【称号坐骑时装】三界降魔 2021-03-31 17:30:05 +08:00
jiaoyangna d5c743e302 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 17:25:16 +08:00
jiaoyangna c8dd5845ac 成长礼包修改提交 2021-03-31 17:25:11 +08:00
ZhangBiao d970a91c95 【三界除魔】入口消失修复
(cherry picked from commit 31f1354b19)
2021-03-31 17:01:50 +08:00
jiaoyangna 14e2e0dd2a 挑战特权商店特效显示 2021-03-31 16:09:15 +08:00
zhangqiang 7102efae35 【车迟斗法】当前排名奖励箱子和奖励列表箱子内容不一样 2021-03-31 15:58:47 +08:00
zhangqiang c5a233df09 【称号坐骑时装】逍遥游 2021-03-31 15:39:40 +08:00
jiaoyangna ce617c94be 累计充值修改提交 2021-03-31 14:50:11 +08:00
jiaoyangna fbe2dc4769 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:43:11 +08:00
jiaoyangna 2fa125f70e 特权礼包特效修改 2021-03-31 14:43:08 +08:00
ZhangBiao 5142db7d00 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:33:11 +08:00
ZhangBiao c287216995 【适配】限时神装 2021-03-31 14:33:01 +08:00
gaoxin 50fcc0e03b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:29:26 +08:00
gaoxin 35ed5c2854 【挂机】修复关卡未解锁时按钮状态显示错误的问题 2021-03-31 14:28:57 +08:00
jiaoyangna 6af6f89c18 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 14:25:47 +08:00
jiaoyangna 43da7e2d51 十绝阵提交 2021-03-31 14:25:43 +08:00
ZhangBiao 94714c1ce4 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 13:32:44 +08:00
ZhangBiao beee0ed0b3 【适配】无尽副本 2021-03-31 13:32:23 +08:00
zhangqiang 3b7b310c8b 【适配】 2021-03-31 12:00:55 +08:00
jiaoyangna 9350e899f9 特权礼包倒计时修改提交 2021-03-31 11:55:16 +08:00
jiaoyangna c2f1f923ee Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 11:27:09 +08:00
jiaoyangna 8c87d221fb 活动 动态加载改名 2021-03-31 11:26:55 +08:00
zhangqiang d2ab50c096 【特权优化】公会漏提 2021-03-31 11:20:45 +08:00
ZhangBiao 18dc0e7d0f Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-31 10:37:50 +08:00
ZhangBiao 210a2069a5 【福星高照】拍脸修改 2021-03-31 10:28:48 +08:00
zhangqiang 81c7353e3e 【特权优化】vip漏提 2021-03-31 10:17:36 +08:00
zhangqiang 4c7bd53d20 【称号坐骑时装】战力向后的发送请求 2021-03-31 10:16:52 +08:00