diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 2343c91565..918ccdbb3d 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3399,7 +3399,7 @@ PropertyType = { [1] = "海军", [2] = "海贼", [3] = "四皇", - [4] = "七武海", + [4] = "强者", [5] = "传奇", } diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 3d4db188b8..65a4e9b454 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -332,7 +332,7 @@ Language = { [10331] = GetLanguageStrById("海军宝藏"), [10332] = GetLanguageStrById("海贼宝藏"), [10333] = GetLanguageStrById("四皇宝藏"), - [10334] = GetLanguageStrById("七武海宝藏"), + [10334] = GetLanguageStrById("强者宝藏"), [10335] = GetLanguageStrById("日"), [10336] = GetLanguageStrById("、周"), [10337] = GetLanguageStrById("周"), diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 296b8ee5cf..12e1ca030a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -1067,7 +1067,7 @@ function this.GetSkillCombat(id) HitScale=combat.HitScale, HitRecycleTime=combat.HitRecycleTime, HitTimeScale=combat.HitTimeScale, - + SkillTimeScale=combat.SkillTimeScale, } end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua index c2b31f404a..edd732ca95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua @@ -120,6 +120,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.RoleSkillLiveGoTran.localScale = combat.CloseRangeHitScale==nil and Vector3.one or Vector3.New( combat.CloseRangeHitScale[1]/1000, combat.CloseRangeHitScale[2]/1000,1) 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) end local combatId2 = BattleManager.GetCombatIdBySkin(self.role.superSkill[1],self.skinId) @@ -139,6 +140,7 @@ function EnemyView:onCreate(go, role, position, root, isBoss,enemyId) self.RoleSkillLiveGoTran2.localScale = combat2.CloseRangeHitScale==nil and Vector3.one 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 -- local t= self.RoleLiveGOGraphic.SkeletonData.animations self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true) self.RoleSkillLiveGo2:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index 3cde5b81b8..d058dd133a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -167,7 +167,7 @@ function PlayerView:onCreate(go, role, position, root) self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000) self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic") self.RoleSkillLiveGoGraphic.AnimationState:SetAnimation(0, "idle", true) - + self.RoleSkillLiveGoGraphic.AnimationState.TimeScale=self.combat.SkillTimeScale/1000 end @@ -189,6 +189,7 @@ function PlayerView:onCreate(go, role, position, root) self.RoleSkillLiveGoTran2.localScale = self.combat2.CloseRangeHitScale==nil and Vector3.one or Vector3.New( self.combat2.CloseRangeHitScale[1]/1000, self.combat2.CloseRangeHitScale[2]/1000,1) self.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000) self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic") + self.RoleSkillLiveGoGraphic2.AnimationState.TimeScale=self.combat2.SkillTimeScale/1000 -- local t= self.RoleLiveGOGraphic.SkeletonData.animations self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true) self.RoleSkillLiveGo2:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index 7a4c2a519c..9d5238b2f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -13,7 +13,7 @@ local mirrors = { id = Language[10331], --人杰 bg = "UI_hz_xy_01", tip = string.format("%s", GetLanguageStrById(specialConfig[71].Value)), - name="七武海宝藏" + name="强者宝藏" }, [2] = { id = Language[10332], --佛禅 diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 0be1b9437c..93ab6a1ae3 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -118,6 +118,7 @@ end --设置按钮选中 function this.SetBtnSelect(_parObj) this.selectBtn.transform:SetParent(_parObj.transform) + this.selectBtn.transform:SetAsFirstSibling() this.selectBtn.transform.localScale = Vector3.one this.selectBtn.transform.localPosition=Vector3.zero end diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 583b62450e..f2fad271f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -429,6 +429,7 @@ end --设置阵营按钮选中 function this.SetBtnSelect(_parObj) this.selectBtn.transform:SetParent(_parObj.transform) + this.selectBtn.transform:SetAsFirstSibling() this.selectBtn.transform.localScale = Vector3.one this.selectBtn.transform.localPosition=Vector3.zero end