Commit Graph

1177 Commits (17b6db91e2199608ca47448c5e3cdf2f022a0726)
 

Author SHA1 Message Date
liujiaqi 348d58260f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:36:02 +08:00
liujiaqi f811464f17 姑获鸟被动技能修正 2020-07-30 14:35:39 +08:00
skuld 1c2196d750 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:30:15 +08:00
skuld 0ee18e9a20 修改商店的帮助文本 2020-07-30 14:29:45 +08:00
gaoxin 1379fe1f0e 部分log删除 2020-07-30 14:13:20 +08:00
gaoxin 58728fa555 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:01:00 +08:00
gaoxin c5f6b68906 rendertexture优化修改 2020-07-30 14:00:55 +08:00
gaoxin 19a2229fb8 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 11:01:59 +08:00
gaoxin e79d5ce4db 删除bugl配置 2020-07-30 11:01:41 +08:00
shihongyi 544ced56b7 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 10:59:39 +08:00
shihongyi 0b4ed8e5d8 修改天宫商店QA 为友情商店内容的bug 2020-07-30 10:58:49 +08:00
altair 6b88e994e1 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 10:58:27 +08:00
altair 2ece05ff7e 修改推荐队伍配置 2020-07-30 10:58:18 +08:00
gaoxin 88fff64e80 修改短音效的播放方式 2020-07-30 10:57:46 +08:00
gaoxin 83999b75d5 战斗内添加日志上报功能 2020-07-30 10:57:29 +08:00
shihongyi 3687d855f6 极速次数临时调整为3次 2020-07-30 10:56:04 +08:00
shihongyi a98f298a14 81116 宝箱 bug 2020-07-30 10:20:40 +08:00
jiaoyangna 511fdb1c95 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 10:09:03 +08:00
jiaoyangna c328d4683c 特效添加提交 2020-07-30 10:08:58 +08:00
lihaiyang bca23e2cd3 挨个对比查验全部表格 2020-07-29 21:39:14 +08:00
liujiaqi b6d0fc740f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 21:10:05 +08:00
liujiaqi 4df8a00031 吴刚被动修正 2020-07-29 21:09:43 +08:00
jiaoyangna 3f414f3d83 森罗编队提交 2020-07-29 21:08:41 +08:00
ZhangBiao 6158c5be1e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 20:36:16 +08:00
ZhangBiao ee4ecf49c2 森罗环境 炸弹 终于完了 2020-07-29 20:18:19 +08:00
lihaiyang 8e34523865 修改第三天全服狂欢 折扣奖励价格 2020-07-29 20:18:11 +08:00
shihongyi 68e130bd50 探宝礼包描述bug 2020-07-29 20:10:57 +08:00
ZhangBiao f806272897 GM 2020-07-29 19:35:29 +08:00
ZhangBiao e852022166 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 18:36:45 +08:00
ZhangBiao 971622a4c5 限时兑换 文字修改 2020-07-29 18:36:36 +08:00
jiaoyangna b54534db2f chechihongdian update 2020-07-29 18:27:07 +08:00
jiaoyangna 47b7beaa08 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 18:16:30 +08:00
jiaoyangna c78cebde62 hongdianjiance tijao 2020-07-29 18:16:11 +08:00
JieLing dadf5e2fe9 音效播放时机放在特效之前 2020-07-29 18:11:25 +08:00
gaoxin 2e5b87250b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 18:05:45 +08:00
gaoxin d9a26568e4 添加战斗日志上报功能 2020-07-29 18:05:40 +08:00
liujiaqi 3fd67ed10d 预览战斗修改 2020-07-29 17:54:45 +08:00
jiaoyangna 66bfd4f4c9 车迟提交 2020-07-29 17:53:39 +08:00
jiaoyangna b9084626eb Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:51:40 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
altair 5af034b02d 修改技能特效 2020-07-29 17:43:54 +08:00
altair d7fb50a6d6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:17:25 +08:00
altair ade2d10899 增加标注 2020-07-29 17:17:10 +08:00
kansa d8e08b5c44 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 17:05:53 +08:00
kansa 348cf2a3d3 修改车迟斗法boss形象和boss战斗中位置 2020-07-29 17:05:25 +08:00
liujiaqi 05dae1a326 我要变强,优化 2020-07-29 17:05:09 +08:00
lihaiyang 4b71bd7221 修改杂货商店蓝色碎片价格 2020-07-29 16:58:35 +08:00
gongjiawei 73301996e7 音频更新 2020-07-29 16:55:10 +08:00
shihongyi f142563b1d 秘宝商店标签名字 2020-07-29 16:51:41 +08:00
ZhangBiao e334375798 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-29 16:28:06 +08:00