diff --git a/Assets/ManagedResources/Prefabs/Live2d/haizei/live2d_hongfa.prefab b/Assets/ManagedResources/Prefabs/Live2d/haizei/live2d_hongfa.prefab index 509ba2d81c..3ea06ffcbb 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/haizei/live2d_hongfa.prefab +++ b/Assets/ManagedResources/Prefabs/Live2d/haizei/live2d_hongfa.prefab @@ -69,7 +69,7 @@ MonoBehaviour: initialSkinName: default initialFlipX: 0 initialFlipY: 0 - startingAnimation: + startingAnimation: idle startingLoop: 1 timeScale: 1 freeze: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index 8ce5edc973..7ae05d92ff 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -3147,7 +3147,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -2, y: -0.1} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 39, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2643405721069577264 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/live2d_dahezhanshi.prefab b/Assets/ManagedResources/Prefabs/live2d_dahezhanshi.prefab index b425e0598a..7373ab947c 100644 --- a/Assets/ManagedResources/Prefabs/live2d_dahezhanshi.prefab +++ b/Assets/ManagedResources/Prefabs/live2d_dahezhanshi.prefab @@ -69,7 +69,7 @@ MonoBehaviour: initialSkinName: default initialFlipX: 0 initialFlipY: 0 - startingAnimation: + startingAnimation: idle startingLoop: 1 timeScale: 1 freeze: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index ae27f47f2e..aeaef55f55 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -4268,16 +4268,14 @@ end --根据界面数据加载动态立绘 function this.LoadHerolive(_heroData, _objPoint) --TODO:动态加载立绘 - local t=(_heroData.id==10016 or _heroData.id==21063 or _heroData.id==21064) and _heroData.painting or _heroData.live - LogError(t) + local t=_heroData.painting + local testLive = poolManager:LoadLive(t, _objPoint.transform, Vector3.one * _heroData.scale, Vector3.New(_heroData.position[1], _heroData.position[2], 0)) local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic") local clip="idle" - if (_heroData.id==10016 or _heroData.id==21063 or _heroData.id==21064)then - clip="animation" - end - local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "animation", true) end + + local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, clip, true) end SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle poolManager:SetLiveClearCall(_heroData.live, testLive, function () SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle @@ -4289,7 +4287,7 @@ end --根据界面数据加载动态立绘 function this.LoadHerolive1(data, _objPoint) --TODO:动态加载立绘 - local testLive = poolManager:LoadLive(GetResourcePath(data.Live), _objPoint.transform, + local testLive = poolManager:LoadLive(GetResourcePath(data.Painting), _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 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 9259d1b5a7..5152c64489 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -228,7 +228,7 @@ function RoleInfoPanel:BindEvent() Util.AddClick(this.dragView.gameObject, function() local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", false) end) --装备 @@ -450,7 +450,7 @@ function this:RightBtnOnClick() this.rightLiveObj = HeroManager.LoadHerolive(rightHeroData,this.rightObj) SetHEeroLiveToward(this.rightLiveObj,rightToward,rightHeroData.position) local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", false) this.rightBtn:GetComponent("Button").enabled = true isClickLeftOrRightBtn = true this:UpdateHeroInfoData() @@ -519,7 +519,7 @@ function this:LeftBtnOnClick() end SetHEeroLiveToward(this.leftLiveObj,leftToward,leftHeroData.position) local SkeletonGraphic = this.curLiveObj:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false) + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", false) this.leftBtn:GetComponent("Button").enabled = true isClickLeftOrRightBtn = true this:UpdateHeroInfoData()