Commit Graph

1193 Commits (37b4ac65684579cfb4b21df7a3b75c78558db83b)
 

Author SHA1 Message Date
JieLing 37b4ac6568 新SDK arr包替换 2020-08-04 09:46:10 +08:00
JieLing 31031da58d 正式服热更0.1.9 2020-08-03 21:47:11 +08:00
JieLing 25a8f769d2 Merge branch 'master_test' into master_release
# Conflicts:
#	AssetBundles/version.txt
#	Assets/Resources/version.txt
#	BuildABs/Android/files.unity3d
#	BuildABs/Android/lzma/luabytes.unity3d
2020-08-03 21:45:37 +08:00
JieLing 626f55193f 漏提 2020-08-03 21:40:53 +08:00
JieLing 96dcdf350e 热更0.1.13 2020-08-03 21:40:23 +08:00
JieLing 1910aaba2a Merge branch 'master_develop' into master_test 2020-08-03 21:24:18 +08:00
gaoxin 04e6c2fb42 删除不必要的符号 2020-08-03 21:23:16 +08:00
JieLing 99df5eb0a6 热更0.1.12 2020-08-03 21:14:16 +08:00
gaoxin 01b6b4e1fd Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 21:08:43 +08:00
gaoxin b257aa2eef dragview回滚 2020-08-03 21:08:38 +08:00
JieLing bf0ab52d4e Merge branch 'master_develop' into master_test 2020-08-03 20:03:20 +08:00
ZhangBiao f6b827c922 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 20:02:10 +08:00
ZhangBiao c2024a15cb bug修复 2020-08-03 20:01:59 +08:00
zhangqiang 13cad0dd5b 排行榜切磋玩回来立绘丢了问题修改 2020-08-03 19:41:54 +08:00
shihongyi de441aa61d 补充 环境 101~200 怪 2020-08-03 19:22:49 +08:00
gaoxin 5ed5f7b8c4 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
jiaoyangna 55aa9bb91c Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-03 18:40:26 +08:00
jiaoyangna 6c6f28f634 fix bug 2020-08-03 18:40:20 +08:00
JieLing d35920c832 热更 0.1.11 2020-08-03 18:12:25 +08:00
liujiaqi b0a624aaff 孔雀明王、净光天女、幽魂姬主动技能描述修正,
孔雀明王、东陵圣母、杨戬、金翅大鹏、蚩尤天赋描述修正
治疗机制修改为治疗生命百分比最低单位
姜子牙6星激活特性属性修正,吕洞宾4阶突破天赋属性修正,孟婆4阶突破天赋属性修正,夜叉8星激活天赋属性修正,阎罗王8星激活属性天赋修正,水德星君2阶突破天赋属性修正,聚宝盆圣物描述修正
142107 150105 151109 146105 152109 10070102被动技能属性修正
2020-08-03 17:54:36 +08:00
jiaoyangna 3ff95a1796 fix bug 2020-08-03 17:23:28 +08:00
JieLing 2a14f7be18 Merge branch 'master_develop' into master_test
# Conflicts:
#	Assets/ManagedResources/PublicArtRes/Shaders/Default-Diffuse.shader.meta
2020-08-03 17:21:50 +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
JieLing 73a0857bc4 Merge branch '接入SDK' into master_test 2020-08-03 17:02:45 +08:00
JieLing 943b6b516a 新版猕猴桃sdk arr包提交 2020-08-03 17:02:05 +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
JieLing c46b0dc9e9 Merge branch '接入SDK' into master_test 2020-08-01 11:45:34 +08:00
JieLing ec54b43d5b 新aar资源替换0801 2020-08-01 11:45:14 +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
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