From cd99dd509ba2f1d513513b6c70d1f060e11332df Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 6 Nov 2020 16:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E7=BB=98=E5=8A=A0=E8=BD=BD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Hero/HeroManager.lua | 15 +++++++++++++++ .../~Lua/Modules/RoleInfo/RoleSkinPanel.lua | 3 +-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index ce60c031e2..c351b92937 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3309,6 +3309,21 @@ function this.LoadHerolive(_heroData, _objPoint) end) return testLive end + +--根据界面数据加载动态立绘 +function this.LoadHerolive1(data, _objPoint) + --TODO:动态加载立绘 + local testLive = poolManager:LoadLive(GetResourcePath(data.Live), _objPoint.transform, + Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0)) + local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic") + local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle + poolManager:SetLiveClearCall(GetResourcePath(data.Live), testLive, function () + SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle + end) + return testLive +end + function this.SortHeroDatas(_heroDatas) local teamHero = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL) --上阵最优先,星级优先,同星级等级优先,同星级同等级按sortId排序。排序时降序排序。 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua index b258e4a176..d3070ba89a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua @@ -151,8 +151,7 @@ function RoleSkinPanel:BtnAction(skinId,data) else poolManager:UnLoadLive(curHeroData.live, parent.curLiveObj) curLiveName = GetResourcePath(data.Live) - parent.curLiveObj = poolManager:LoadLive(GetResourcePath(data.Live), parent.curObj.transform, - Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0)) + parent.curLiveObj = HeroManager.LoadHerolive1(data,parent.curObj) PopupTipPanel.ShowTip("未获得此皮肤!") end end