diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua index e76cbbc047..d95fabad7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapOnHook.lua @@ -1591,22 +1591,21 @@ function this:RoleOnDead(pos) --替换材质 local spineComponent = liveNodes[pos]:GetComponent(SpineComponentName) - --local spineDeadMaterial = poolManager:LoadAsset("spineDead", PoolManager.AssetType.Other); + local spineDeadMaterial = poolManager:LoadAsset("spineDead", PoolManager.AssetType.Other); --local spineMaterial = spineComponent:GetComponent("MeshRenderer").sharedMaterial - --local spineMaterial = spineComponent.material + local spineMaterial = spineComponent.material --local customMaterialOverride = spineComponent.CustomMaterialOverride - --spineDeadMaterial = Material.New(spineDeadMaterial) - --table.insert(DeadMaterial_Tweener, spineDeadMaterial) - --spineDeadMaterial:SetTexture("_MainTex", spineMaterial:GetTexture("_MainTex")) + spineDeadMaterial = Material.New(spineDeadMaterial) + table.insert(DeadMaterial_Tweener, spineDeadMaterial) + spineDeadMaterial:SetTexture("_MainTex", spineMaterial:GetTexture("_MainTex")) --customMaterialOverride:Add(spineMaterial, spineDeadMaterial); + spineComponent.material = spineDeadMaterial local startColor = Color.New(0.07843138, 0.145098, 1, 1) local endColor = Color.New(startColor.r, startColor.g, startColor.b, 1) - if DoColor_Spine_Tweener[pos] then DoColor_Spine_Tweener[pos]:Kill() end - DoColor_Spine_Tweener[pos] = Util.DoColor_Spine(spineComponent, startColor, endColor, 0):OnComplete( function() startColor.a = 1 @@ -1614,7 +1613,6 @@ function this:RoleOnDead(pos) DoColor_Spine_Tweener[pos] = Util.DoColor_Spine(spineComponent, startColor, endColor, 0.8):OnComplete( function() Util.SetColor_Spine(spineComponent, Color.New(1, 1, 1, 1)) - --清除替换材质 --local customMaterialOverride = spineComponent.CustomMaterialOverride --customMaterialOverride:Clear() @@ -1631,14 +1629,12 @@ function this:RoleOnDead(pos) table.remove(DeadMaterial_Tweener, removeIndex) end ]] - roleLiveGo[pos]:SetActive(false) liveNodes[pos]:SetActive(false) spineComponent.AnimationState:SetAnimation(0, RoleAnimationName.Stand, true) this:DelayFunc(0.5, function() poolManager:UnLoadLive(liveNames[pos], liveNodes[pos]) end) - liveNames[pos] = nil liveNodes[pos] = nil end