Commit Graph

1185 Commits (31c993438bf34188ffb2b4e7554e12059090dca8)
 

Author SHA1 Message Date
altair c47507f128 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 19:40:07 +08:00
zhangqiang b6de5d609a 排行切磋完出来 排行榜为空 修复 2020-08-19 04:47:37 +08:00
altair 991fb91fca 修改法宝名称及图标 2020-07-31 19:39:58 +08:00
zhangqiang 93c1913a73 适配修改 2020-08-19 03:31:43 +08:00
gaoxin 4c93923b39 尝试修复编队和角色装备界面报错的问题 2020-07-31 18:24:13 +08:00
gaoxin a4bcead414 无用log删除 2020-07-31 18:04:11 +08:00
gaoxin 75fc98d59e Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 18:03:31 +08:00
gaoxin 8903bf3334 法宝资源替换新增 2020-07-31 18:03:27 +08:00
gongjiawei 7590410807 音频更新 2020-07-31 17:58:25 +08:00
altair 00d93db9a0 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:43:53 +08:00
altair 10f2b6b5d0 修改道具名称 2020-07-31 16:43:44 +08:00
skuld 3f5fdf3ec1 修改大闹天宫BOSS名字 2020-07-31 16:42:35 +08:00
gaoxin c2f436a3d6 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:28:19 +08:00
gaoxin 056fbe171e loading界面资源替换 2020-07-31 16:28:13 +08:00
skuld 85c64ecb85 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:27:39 +08:00
zhangqiang fc7552f55f 车迟抢夺玩家人物头像属性修改 四元阵修改预设文字 2020-08-19 02:25:01 +08:00
skuld 23173aee60 修改大闹天宫的敌人节点形象和缩放 2020-07-31 16:27:28 +08:00
gaoxin 1891302ccf Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 16:05:21 +08:00
jiaoyangna 242896fede add soulprint effect commit 2020-08-02 09:16:45 +08:00
altair f21effe024 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 15:10:58 +08:00
altair 9631ef5425 修改技能描述 2020-07-31 15:10:48 +08:00
gaoxin e41cba0d58 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 15:09:10 +08:00
gaoxin 8be398717d 文件名重复修改 2020-07-31 15:09:04 +08:00
zhangqiang b853030d8a 巅峰战被淘汰还可自动进入战斗bug修复 2020-08-19 00:09:35 +08:00
kansa 1859513d3b 修改车迟斗法怪物id错误导致的bug 2020-07-31 15:00:14 +08:00
altair e61d1ae05d Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-07-31 13:31:57 +08:00
zhangqiang 39083460c1 献祭坛适配 2020-08-18 21:54:30 +08:00
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
altair 3b32ac2645 增加降龙罗汉特效 2020-07-31 13:31:07 +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
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