Commit Graph

1095 Commits (70cd06da2ba1730bacc943c6d8dfabe1d9dbecb5)
 

Author SHA1 Message Date
gongjiawei a0957c03ad 音频更新 2020-07-29 10:50:18 +08:00
ZhangBiao 80d9c0b3a7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 02:32:17 +08:00
ZhangBiao 2731d973fb 删除跳过按钮的首充提示 2020-07-29 02:32:07 +08:00
gaoxin 829a102c73 关闭音频 2020-07-29 00:32:53 +08:00
gaoxin 650f872a0c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 00:04:56 +08:00
gaoxin 2980205399 修复假战斗报错的问题 2020-07-29 00:02:19 +08:00
ZhangBiao 7e917243e8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 23:25:53 +08:00
ZhangBiao 4f14ee8599 商店金币位数调整 2020-07-28 23:25:43 +08:00
jiaoyangna 28ad4fb613 update kuang 2020-07-28 23:14:02 +08:00
jiaoyangna 48f57d05f1 headframe update 2020-07-28 23:07:26 +08:00
altair f81db7ac81 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 23:06:10 +08:00
altair 7e7b873e31 修改播放时机 2020-07-28 23:06:03 +08:00
ZhangBiao d2bacc77ca bug修复 2020-07-28 22:41:27 +08:00
jiaoyangna e0302d7e2b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 22:33:57 +08:00
jiaoyangna a37402d40f cardelay update 2020-07-28 22:33:38 +08:00
kansa b462d8056e 修改限时招募和乾坤包囊活动时间 2020-07-28 22:32:47 +08:00
jiaoyangna 36070bc0c0 cardelaycarbon update 2020-07-28 22:25:51 +08:00
ZhangBiao 97b7118e11 2020-07-28 22:05:24 +08:00
ZhangBiao 8639065f06 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 22:00:25 +08:00
zhangqiang 02f92f749f bug 2020-08-04 23:43:14 +08:00
ZhangBiao dea2d14d3f 乾坤宝盒时间修复 2020-07-28 22:00:11 +08:00
wangyuan eff314bf31 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 21:42:19 +08:00
wangyuan 7c7fabc3d0 修改商店物品价格 2020-07-28 21:35:26 +08:00
ZhangBiao 609317ac25 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 21:18:59 +08:00
ZhangBiao fb5d81a7a4 bug修复 2020-07-28 21:18:40 +08:00
wangyuan b2c515de97 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 21:15:31 +08:00
liujiaqi a6a9575b98 1152技能描述 2020-07-28 21:12:39 +08:00
jiaoyangna 0a73f284ef carbon detail update 2020-07-28 20:58:28 +08:00
wangyuan 9ca5a21a96 妖魂魔符换成幸运探宝券和置换玉换成九转金丹 所有道具对应价格表 配置成打折道具 2020-07-28 20:52:40 +08:00
jiaoyangna 5d70187da8 副本修改提交 2020-07-28 20:51:28 +08:00
kansa 77a7c52ca1 修改活动持续时间 2020-07-28 20:27:17 +08:00
altair 6f1932faaa 修改道具描述 2020-07-28 20:24:49 +08:00
ZhangBiao ecfe1f5e33 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:14:40 +08:00
ZhangBiao 8c7b24ad9a bug修复 2020-07-28 20:13:09 +08:00
altair 95df60b0fe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:10:15 +08:00
altair 30aed85812 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:09:49 +08:00
jiaoyangna 5df246c45b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 20:09:46 +08:00
jiaoyangna 43ee7dd577 限时召唤提交 2020-07-28 20:09:41 +08:00
altair 42740e5e19 修改指引文字 2020-07-28 20:09:39 +08:00
gongjiawei 31826a5d08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:45:06 +08:00
gongjiawei b9c15c6c23 音频更新 2020-07-28 19:44:57 +08:00
szxhzz 96fe229ade Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:44:15 +08:00
szxhzz 3814874c3f 音频更新 2020-07-28 19:43:35 +08:00
gongjiawei b9f6ef86e7 音频更新 2020-07-28 19:39:27 +08:00
gongjiawei efbfff0b3e 音頻跟新 2020-07-28 19:35:51 +08:00
szxhzz c879b10480 音频更新 2020-07-28 19:31:04 +08:00
jiaoyangna a3298ae117 星星预设提交 2020-07-28 19:21:16 +08:00
jiaoyangna a30e9e1757 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-28 19:18:50 +08:00
jiaoyangna 8a2a443168 星星提交 2020-07-28 19:18:45 +08:00
szxhzz b0c0bf5da0 配置表更新 2020-07-28 19:08:28 +08:00