diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index 2d0aad98cb..2f96272c03 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -110,7 +110,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) local combat = BattleManager.GetSkillCombat(combatId) self.SkillAttackDisplaceoffset=combat.AttackDisplaceoffset if combat.CloseRangeHit~=nil and combat.CloseRangeHit~="" then - + LogError("combat.CloseRangeHit===="..combat.CloseRangeHit.." combat.id=================="..combat.Id) self.RoleSkillLiveGo=poolManager:LoadLive(combat.CloseRangeHit, go.transform.parent, combat.CloseRangeHitScale==nil and Vector3.one or Vector3.New( combat.CloseRangeHitScale[1]/1000, combat.CloseRangeHitScale[2]/1000,1), Vector3.zero) self.RoleSkillLiveGoTran = self.RoleSkillLiveGo:GetComponent("RectTransform") @@ -121,12 +121,15 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000) self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic") self.RoleSkillLiveGoGraphic.AnimationState.TimeScale=combat.SkillTimeScale/1000 - self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true) + --self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true) + self.RoleSkillLiveGoGraphic.gameObject:SetActive(false) end local combatId2 = BattleManager.GetCombatIdBySkin(self.role.superSkill[1],self.skinId) + LogError("combatId2==========="..combatId2) local combat2 = BattleManager.GetSkillCombat(combatId2) self.superSkillAttackDisplaceoffset=combat2.AttackDisplaceoffset if combat2.CloseRangeHit~=nil and combat2.CloseRangeHit~="" then + self.RoleSkillLiveGo2=poolManager:LoadLive(combat2.CloseRangeHit, go.transform.parent, combat2.CloseRangeHitScale==nil and Vector3.one or Vector3.New( combat2.CloseRangeHitScale[1]/1000, combat2.CloseRangeHitScale[2]/1000,1), Vector3.zero) self.RoleSkillLiveGoTran2 = self.RoleSkillLiveGo2:GetComponent("RectTransform") self.RoleSkillLiveGoTran2:SetParent(self.RoleLiveGO.transform) @@ -137,7 +140,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.RoleSkillLiveGoTran2.localPosition = Vector2.New(0, 0)-- * 0.5 end - self.RoleSkillLiveGoTran2.localScale = self.combat2.CloseRangeHitScale==nil and Vector3.New(10,10,1) or Vector3.New( self.combat2.CloseRangeHitScale[1]/1000, self.combat2.CloseRangeHitScale[2]/1000,1) + self.RoleSkillLiveGoTran2.localScale = combat2.CloseRangeHitScale==nil and Vector3.New(10,10,1) or Vector3.New( combat2.CloseRangeHitScale[1]/1000, combat2.CloseRangeHitScale[2]/1000,1) self.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000) self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic") self.RoleSkillLiveGoGraphic2.AnimationState.TimeScale=combat2.SkillTimeScale/1000 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index e2837da698..f0eaa49fd7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -159,6 +159,7 @@ function PlayerView:onCreate(go, role, position, root) self.combat = BattleManager.GetSkillCombat(combatId) self.SkillAttackDisplaceoffset=self.combat.AttackDisplaceoffset if self.combat.CloseRangeHit~=nil and self.combat.CloseRangeHit~="" then + LogError("self.combat.CloseRangeHit=="..self.combat.CloseRangeHit.." self.combat.id====="..self.combat.Id) self.RoleSkillLiveGo=poolManager:LoadLive(self.combat.CloseRangeHit, go.transform.parent,self.combat.CloseRangeHitScale==nil and Vector3.one or Vector3.New( self.combat.CloseRangeHitScale[1]/1000, self.combat.CloseRangeHitScale[2]/1000,1), Vector3.zero) self.RoleSkillLiveGoTran = self.RoleSkillLiveGo:GetComponent("RectTransform") self.RoleSkillLiveGoTran:SetParent(self.RoleLiveGO.transform) @@ -166,8 +167,9 @@ function PlayerView:onCreate(go, role, position, root) self.RoleSkillLiveGoTran.localScale = self.combat.CloseRangeHitScale==nil and Vector3.one or Vector3.New( self.combat.CloseRangeHitScale[1]/1000, self.combat.CloseRangeHitScale[2]/1000,1) self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000) self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic") - self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true) + --self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true) self.RoleSkillLiveGoGraphic.AnimationState.TimeScale=self.combat.SkillTimeScale/1000 + self.RoleSkillLiveGoGraphic.gameObject:SetActive(false) end