Commit Graph

1055 Commits (bff0e3a1eeeed60d42721d266bb704eb70cf9c0e)
 

Author SHA1 Message Date
ZhangBiao bff0e3a1ee 2020-07-31 10:09:25 +08:00
ZhangBiao 18d94c1026 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 10:01:57 +08:00
ZhangBiao a7d0f4e522 八日登陆 特效修改 2020-07-31 10:00:56 +08:00
jiaoyangna 6f5092140f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 09:47:31 +08:00
jiaoyangna d3a71d96aa upstar view material head frame error commit 2020-07-31 09:47:06 +08:00
altair 80eb12321b 修改姜子牙特效 2020-07-30 19:29:12 +08:00
gaoxin ffb6850010 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 18:50:47 +08:00
gaoxin e786a479f5 服务器维护时,不再请求连接服务器 2020-07-30 18:50:41 +08:00
gongjiawei 3d0c82e4b0 音频更新 2020-07-30 17:51:17 +08:00
jiaoyangna df84dd8577 mubiaojaingli effect update 2020-07-30 17:01:33 +08:00
jiaoyangna 1b2a752871 effect update 2020-07-30 16:37:58 +08:00
jiaoyangna b6578e618e effect update 2020-07-30 16:27:17 +08:00
jiaoyangna ca080676df Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 16:03:37 +08:00
zhangqiang 588d2152b2 抽卡主城红点修改 2020-08-15 23:46:17 +08:00
jiaoyangna 0146c814ee effectprefab update 2020-07-30 16:03:30 +08:00
jiaoyangna eb85035485 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 15:15:00 +08:00
jiaoyangna d00afc69cf 添加特效 2020-08-06 15:14:47 +08:00
jiaoyangna 34f5e28e3d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-06 14:24:24 +08:00
jiaoyangna 180d7122be cardelay update 2020-08-06 14:23:05 +08:00
jiaoyangna a1e08138d0 expedition head frame update 2020-08-06 13:55:35 +08:00
zhangqiang f3e4b9f951 向后端发送主线战力变化 修改 2020-08-15 20:10:47 +08:00
zhangqiang ce7c70820b 界面适配 跳转竞技场进攻阵容检测 2020-08-15 19:02:20 +08:00
gaoxin 9ab747a189 屏幕适配修改 2020-07-30 15:49:20 +08:00
zhangqiang 1ac12b1721 妖精单抽提示数量错误修改 2020-08-15 23:23:38 +08:00
szxhzz e6468cd003 音频更新 2020-07-30 15:18:59 +08:00
altair 153c2b986b Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-30 14:43:01 +08:00
altair bc213b95b3 增加雷震子特效 2020-07-30 14:42:48 +08:00
kansa b154b2a873 删除多余的vip特权显示 2020-07-30 14:37:03 +08:00
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