Commit Graph

2427 Commits (a09870522a92c74b2ed393b1427a7b5f436a41ea)

Author SHA1 Message Date
wangzhenxing a09870522a [皮肤]伤害统计界面添加皮肤显示 2020-11-09 15:52:43 +09:00
ZhangBiao 454a70668d 【易经宝库】格子点击位置不准确修复 曾加tips 2020-11-09 15:39:25 +08:00
zhangqiang e72cac2afb 【逍遥游】 通关后返回问题修复 2020-11-09 15:25:02 +08:00
ZhangBiao 181fe789a4 【易经宝库】最终奖励选择bug修复
(cherry picked from commit c4745e8c7c)
2020-11-09 13:48:08 +08:00
ZhangBiao 82dc9fac73 【易经宝库】第三层抽取完成后bug修复
(cherry picked from commit 9ca403ebff)
2020-11-09 11:12:28 +08:00
wangzhenxing bcabd3b36d gm 测试战斗添加设置皮肤 2020-11-09 10:12:45 +09:00
jiaoyangna 351785e3fc Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2020-11-06 21:11:18 +08:00
jiaoyangna d4687b2b74 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 21:05:43 +08:00
jiaoyangna 3a481d6d5f [皮肤]修改提交 2020-11-06 21:05:39 +08:00
gaoxin 05fb2f5e7f 【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误 2020-11-06 20:45:44 +08:00
gaoxin 4622263234 【战斗】修复战斗中受击特效及音效错误的问题,修复假战斗星级显示错误 2020-11-06 20:45:21 +08:00
jiaoyangna 93d9212f85 皮肤加成属性修改 2020-11-06 20:39:00 +08:00
jiaoyangna 0a772f466b 皮肤提交 2020-11-06 20:36:38 +08:00
jiaoyangna 98ff210ae2 皮肤解锁提示 2020-11-06 20:21:20 +08:00
gaoxin 53b6f4483f Merge branch 'master_xma_local' into master_develop
# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_yl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_ls_zl_vo_01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_bz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_fh03.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_hd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_ql01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_yl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl02.mp3.meta
#	Assets/ManagedResources/Audio/Skill/skill/Audio_ls_zl03.mp3.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_dhdj_00042_s1_t3.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t1.png.meta
#	Assets/ManagedResources/Icon/Hero/c_swk_00015_s1_t3.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2020-11-06 19:56:52 +08:00
jiaoyangna bd92d5339d Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 19:54:49 +08:00
jiaoyangna 22038419b7 神医天降提交 2020-11-06 19:54:00 +08:00
zhangqiang 34d67b93f6 【巅峰赛】 赛程 三局第一局结果有问题 修改 2020-11-06 18:32:48 +08:00
wangzhenxing 5128a02eba [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:58:28 +08:00
jiaoyangna a6904526d3 协议提交 2020-11-06 17:26:58 +08:00
jiaoyangna 41f62176f2 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 17:19:34 +08:00
jiaoyangna fe9b73aa0b 协议提交 2020-11-06 17:19:24 +08:00
zhangqiang 98d4b3b024 【达人奖励排行】 显示问题修复 2020-11-06 17:18:17 +08:00
wangzhenxing 04deaa28d6 [皮肤] 胜利最佳输出界面显示皮肤 2020-11-06 17:52:54 +09:00
ZhangBiao 73c94dee90 Merge branch '0活动开发聚集地/易经宝库' into master_develop
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_dhdj_00042_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 17:34:27 +08:00
zhangqiang 2ed3fc9fc5 【达人奖励排行】 显示问题修复 2020-11-06 17:19:14 +08:00
gaoxin 3baf785576 【角色信息】修复角色信息界面滑动立绘报错的问题 2020-11-06 16:54:38 +08:00
zhangqiang 2e470d6ef6 【易经宝库】 特效层级调整
(cherry picked from commit ac64980843)
2020-11-06 16:52:57 +08:00
zhangqiang aa2db3e25e 【大闹天宫】 节点boss 站位错误 修复 2020-11-06 16:51:44 +08:00
zhangqiang 7121be9c04 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:49:18 +08:00
zhangqiang ac64980843 【易经宝库】 特效层级调整 2020-11-06 16:49:12 +08:00
jiaoyangna 6a95033b8b Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:39:45 +08:00
jiaoyangna cd99dd509b 立绘加载错误修改 2020-11-06 16:37:52 +08:00
ZhangBiao fab6570a26 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:17:21 +08:00
ZhangBiao 5e130a7585 Merge branch '0活动开发聚集地/易经宝库' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-11-06 16:17:12 +08:00
jiaoyangna ccdba2b2df Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2020-11-06 16:11:47 +08:00
jiaoyangna 5251bc4059 [神将界面修改] 2020-11-06 16:11:37 +08:00
ZhangBiao 36759d8044 【易经宝库】增加稿子动效 2020-11-06 16:06:08 +08:00
zhangqiang 44350558c5 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:49:08 +08:00
zhangqiang 39e8e1f894 【巅峰赛】 头像特效设置层级有问题 线上 2020-11-06 15:31:29 +08:00
ZhangBiao b98490f233 【易经宝库】差一个稿子的动效 2020-11-06 15:11:19 +08:00
gaoxin f1ca8398d3 【战斗】假战斗随机种子读表 2020-11-06 15:04:11 +08:00
wangzhenxing 4a6d8b393f 技能提交去除log 2020-11-06 15:04:05 +08:00
wangzhenxing ab4f97fa0a 皮肤修改提交 2020-11-06 15:03:56 +08:00
jiaoyangna 767541c1a6 编队界面皮肤位置修改 2020-11-06 14:30:44 +08:00
gaoxin 30ac8733da 【战斗】假战斗随机种子读表 2020-11-06 14:15:03 +08:00
ZhangBiao b516a8c202 【易经宝库】没有QA 无法购买 2020-11-06 13:36:48 +08:00
wangzhenxing 04fce03cd8 battlemanager修改提交 2020-11-06 13:32:04 +08:00
wangzhenxing 1123b38709 协议提交 2020-11-06 13:31:45 +08:00
wangzhenxing 3e917799bb 解决冲突提交 2020-11-06 13:31:30 +08:00