Commit Graph

668 Commits (b37009ea257303cf047970f9ad1e3dc1e4ad9128)

Author SHA1 Message Date
zhangqiang b37009ea25 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-18 17:32:48 +08:00
zhangqiang d727e866a7 英雄升级卡顿优化 2020-08-18 17:32:26 +08:00
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
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 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
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 88fff64e80 修改短音效的播放方式 2020-07-30 10:57:46 +08:00
gaoxin 83999b75d5 战斗内添加日志上报功能 2020-07-30 10:57:29 +08:00
jiaoyangna c328d4683c 特效添加提交 2020-07-30 10:08:58 +08:00
jiaoyangna 3f414f3d83 森罗编队提交 2020-07-29 21:08:41 +08:00
ZhangBiao ee4ecf49c2 森罗环境 炸弹 终于完了 2020-07-29 20:18:19 +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
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
gongjiawei 73301996e7 音频更新 2020-07-29 16:55:10 +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
ZhangBiao 72fef2124a 2020-07-29 16:27:56 +08:00