Commit Graph

568 Commits (688662836a3d3da97e381f3daa2c8edaffe734bc)
 

Author SHA1 Message Date
ZhangBiao 9f9f430976 道具标签不对应修改 2020-07-21 14:36:15 +08:00
gongjiawei f9854d57e6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:25:07 +08:00
gongjiawei 781a1e8453 音频更新 2020-07-21 14:24:57 +08:00
shihongyi a7494e7008 抽卡特权、超级月卡开启时间 2020-07-21 14:23:53 +08:00
jiaoyangna 49d65fe9db Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:16:46 +08:00
jiaoyangna 9fbcc3b77b 【神将】升星,需要四个三星同阵营不应该自动给选择上 2020-07-21 14:16:40 +08:00
gaoxin 70149e951d version文件回滚 2020-07-21 14:10:49 +08:00
gaoxin 528243e0ee Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 14:09:52 +08:00
ZhangBiao 3503afa84b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-21 12:01:53 +08:00
ZhangBiao 8ca0ecab40 2020-07-21 12:01:46 +08:00
gongjiawei 1eae262785 音频更新 2020-07-21 11:41:45 +08:00
gaoxin 0992012713 Merge branch 'master_test' into master_develop 2020-07-21 11:40:13 +08:00
gaoxin f5ed76daa1 Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test 2020-07-21 11:32:58 +08:00
gaoxin 0db4c93ef7 修复登录界面登出事件无法触发的问题 2020-07-21 11:31:26 +08:00
jiaoyangna aa86f77fea 【充值】表里配的5级,实际创角就有入口 2020-07-21 11:31:05 +08:00
ZhangBiao d3caa3d4cf 森罗调整 2020-07-21 10:30:25 +08:00
ZhangBiao 9ed616d8be 2020-07-21 09:38:34 +08:00
JieLing bd8e859703 猕猴桃测试0.1.0 2020-07-20 20:52:30 +08:00
gaoxin 6d3338d6b1 配置修改,version文件修改 2020-07-20 20:30:49 +08:00
gaoxin 02b37b2d67 Merge branch 'master_develop' into master_test 2020-07-20 19:58:43 +08:00
kansa b7aaa633c9 增加轩辕宝境缺少的功能字段 2020-07-20 19:57:57 +08:00
gaoxin 42a2496ef7 修复sdk支付时界面不刷新的问题, 2020-07-20 19:57:49 +08:00
shihongyi 6b007ddcfb 巅峰战奖励调整 2020-07-20 17:45:04 +08:00
shihongyi 89e7841b12 竞技场战斗阶段掉落内容 2020-07-20 17:16:09 +08:00
shihongyi 458c4dd054 斗法排行奖励调整 2020-07-20 17:02:16 +08:00
ZhangBiao 857d32bb96 升级礼包 剩余时间文字修改 2020-07-20 16:56:28 +08:00
ZhangBiao 4a696f3ec0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 16:42:37 +08:00
ZhangBiao 054f1558bc bug修复 2020-07-20 16:42:20 +08:00
zhangqiang f24e7cbef3 排行榜请求修改 2020-07-20 16:38:26 +08:00
liujiaqi 5f0b1ae349 月礼包新增礼包8,新增神将升星自选箱,开服狂欢3日7日奖励更改 2020-07-20 16:32:03 +08:00
zhangqiang f234c1a174 竞技场中文字修改 2020-07-20 16:07:30 +08:00
zhangqiang 99f885ac22 竞技场宝箱奖励位置可配 2020-07-20 16:01:16 +08:00
gongjiawei 4b946aa324 音頻跟新 2020-07-20 15:52:33 +08:00
gongjiawei 78717037c0 音频更新 2020-07-20 15:50:31 +08:00
shihongyi b9042bc782 置换卡池、魂印商店调整 2020-07-20 15:38:46 +08:00
gaoxin ed0a54ab56 sdk更新,修改tapdb的channel对测试服和正式服进行区分 2020-07-20 15:36:25 +08:00
zhangqiang a325bfb781 竞技场排名 2020-07-20 15:34:30 +08:00
liujiaqi 7f61f6317c 嫦娥共工大小调整 2020-07-20 14:31:59 +08:00
gongjiawei b2380c9b62 音频更新 2020-07-20 14:04:23 +08:00
zhangqiang c471a9ccd5 竞技场替换宝箱效果图替换 2020-07-20 11:28:19 +08:00
ZhangBiao 97bfdd53b6 十绝阵开启阶段加入公会不可挑战十绝阵 2020-07-20 11:21:16 +08:00
ZhangBiao 43f7ca10bc 2020-07-20 11:02:40 +08:00
ZhangBiao b57eb71974 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 10:41:08 +08:00
ZhangBiao f9ecb13bd3 战斗跳过按钮 2020-07-20 10:40:55 +08:00
shihongyi e10ec6728f 调整部分成就前置 2020-07-20 10:28:08 +08:00
ZhangBiao 055c5f6926 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-20 10:02:21 +08:00
ZhangBiao c0d053c65c 免费抽刷新时间 2020-07-20 10:02:12 +08:00
gaoxin f27b97d128 打包配置修改 2020-07-19 08:59:14 +08:00
gaoxin 7e96307883 Merge branch 'master_test' of http://60.1.1.230/gaoxin/JL_Client into master_test 2020-07-18 21:07:01 +08:00
JieLing 7350a1cf85 测试version文件修改 2020-07-18 21:06:23 +08:00