Commit Graph

744 Commits (6c6f28f634de696e2321dabecb6c74fcec96fdb5)

Author SHA1 Message Date
jiaoyangna 6c6f28f634 fix bug 2020-08-03 18:40:20 +08:00
jiaoyangna 3ff95a1796 fix bug 2020-08-03 17:23:28 +08:00
jiaoyangna ffdb4c9666 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 17:07:35 +08:00
jiaoyangna 3c6043d32c destroy guildmaincitypanel close playerheadview 2020-08-03 17:07:24 +08:00
ZhangBiao ab93491cfe Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 16:59:50 +08:00
ZhangBiao 9b28e7c140 森罗bug修改 2020-08-03 16:59:37 +08:00
zhangqiang 72dd128c1f 添加星级天赋描述叠加 去掉无用打印 2020-08-03 16:49:44 +08:00
ZhangBiao a9f8f39280 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 16:11:21 +08:00
ZhangBiao 0cd5ffca9d 魂印特效关闭 2020-08-03 16:11:04 +08:00
jiaoyangna 54aae5181f fix bug 2020-08-03 15:51:48 +08:00
gaoxin 70cd06da2b 计算战斗力卡顿的问题优化 2020-08-03 15:36:29 +08:00
ZhangBiao 880b52763f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 15:20:39 +08:00
ZhangBiao 434aaeccff 魂印特效 无用log删除 2020-08-03 15:20:18 +08:00
jiaoyangna 5f20e3e100 fixed bug 2020-08-03 13:37:21 +08:00
jiaoyangna 01e5a62715 #115003 UnityLogError
E:/Git/JL/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua:373: table index is nil ,
UnityEngine.Application.CallLogCallback(String, String, LogType, Boolean)   公会红包红点的问题
2020-08-03 10:36:45 +08:00
jiaoyangna 89dbd09856 resolve hero tails update 2020-08-03 10:32:20 +08:00
jiaoyangna 4ab47f9a01 resolve hero commit 2020-08-03 10:31:43 +08:00
gaoxin 0a19c1dd82 优化红点检测机制为分帧刷新,优化人物升级红点检测 2020-08-01 13:15:27 +08:00
gaoxin 054c04c465 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-01 11:17:49 +08:00
gaoxin 6bfebc928f 战斗日志打印文件名修改,战斗数据optiondata变为userdata 2020-08-01 11:16:33 +08:00
zhangqiang b6de5d609a 排行切磋完出来 排行榜为空 修复 2020-08-19 04:47:37 +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
zhangqiang 93c1913a73 适配修改 2020-08-19 03:31:43 +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
zhangqiang fc7552f55f 车迟抢夺玩家人物头像属性修改 四元阵修改预设文字 2020-08-19 02:25:01 +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
gaoxin 8be398717d 文件名重复修改 2020-07-31 15:09:04 +08:00
zhangqiang b853030d8a 巅峰战被淘汰还可自动进入战斗bug修复 2020-08-19 00:09:35 +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
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