Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
7651474b75
|
@ -3399,7 +3399,7 @@ PropertyType = {
|
||||||
[1] = "海军",
|
[1] = "海军",
|
||||||
[2] = "海贼",
|
[2] = "海贼",
|
||||||
[3] = "四皇",
|
[3] = "四皇",
|
||||||
[4] = "七武海",
|
[4] = "强者",
|
||||||
[5] = "传奇",
|
[5] = "传奇",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -332,7 +332,7 @@ Language = {
|
||||||
[10331] = GetLanguageStrById("海军宝藏"),
|
[10331] = GetLanguageStrById("海军宝藏"),
|
||||||
[10332] = GetLanguageStrById("海贼宝藏"),
|
[10332] = GetLanguageStrById("海贼宝藏"),
|
||||||
[10333] = GetLanguageStrById("四皇宝藏"),
|
[10333] = GetLanguageStrById("四皇宝藏"),
|
||||||
[10334] = GetLanguageStrById("七武海宝藏"),
|
[10334] = GetLanguageStrById("强者宝藏"),
|
||||||
[10335] = GetLanguageStrById("日"),
|
[10335] = GetLanguageStrById("日"),
|
||||||
[10336] = GetLanguageStrById("、周"),
|
[10336] = GetLanguageStrById("、周"),
|
||||||
[10337] = GetLanguageStrById("周"),
|
[10337] = GetLanguageStrById("周"),
|
||||||
|
|
|
@ -1067,7 +1067,7 @@ function this.GetSkillCombat(id)
|
||||||
HitScale=combat.HitScale,
|
HitScale=combat.HitScale,
|
||||||
HitRecycleTime=combat.HitRecycleTime,
|
HitRecycleTime=combat.HitRecycleTime,
|
||||||
HitTimeScale=combat.HitTimeScale,
|
HitTimeScale=combat.HitTimeScale,
|
||||||
|
SkillTimeScale=combat.SkillTimeScale,
|
||||||
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
|
@ -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.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.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000)
|
||||||
self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic")
|
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)
|
||||||
end
|
end
|
||||||
local combatId2 = BattleManager.GetCombatIdBySkin(self.role.superSkill[1],self.skinId)
|
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.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.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000)
|
||||||
self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
|
self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
|
||||||
|
self.RoleSkillLiveGoGraphic2.AnimationState.TimeScale=combat2.SkillTimeScale/1000
|
||||||
-- local t= self.RoleLiveGOGraphic.SkeletonData.animations
|
-- local t= self.RoleLiveGOGraphic.SkeletonData.animations
|
||||||
self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
|
self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
|
||||||
self.RoleSkillLiveGo2:SetActive(true)
|
self.RoleSkillLiveGo2:SetActive(true)
|
||||||
|
|
|
@ -167,7 +167,7 @@ function PlayerView:onCreate(go, role, position, root)
|
||||||
self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000)
|
self.RoleSkillLiveGoTran.sizeDelta = Vector2.New(1000, 1000)
|
||||||
self.RoleSkillLiveGoGraphic = self.RoleSkillLiveGo:GetComponent("SkeletonGraphic")
|
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
|
||||||
|
|
||||||
end
|
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.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.RoleSkillLiveGoTran2.sizeDelta = Vector2.New(1000, 1000)
|
||||||
self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
|
self.RoleSkillLiveGoGraphic2 = self.RoleSkillLiveGo2:GetComponent("SkeletonGraphic")
|
||||||
|
self.RoleSkillLiveGoGraphic2.AnimationState.TimeScale=self.combat2.SkillTimeScale/1000
|
||||||
-- local t= self.RoleLiveGOGraphic.SkeletonData.animations
|
-- local t= self.RoleLiveGOGraphic.SkeletonData.animations
|
||||||
self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
|
self.RoleSkillLiveGoGraphic2.AnimationState:SetAnimation(0, "idle", true)
|
||||||
self.RoleSkillLiveGo2:SetActive(true)
|
self.RoleSkillLiveGo2:SetActive(true)
|
||||||
|
|
|
@ -13,7 +13,7 @@ local mirrors = {
|
||||||
id = Language[10331], --人杰
|
id = Language[10331], --人杰
|
||||||
bg = "UI_hz_xy_01",
|
bg = "UI_hz_xy_01",
|
||||||
tip = string.format("<color=#E5DDBF>%s</color>", GetLanguageStrById(specialConfig[71].Value)),
|
tip = string.format("<color=#E5DDBF>%s</color>", GetLanguageStrById(specialConfig[71].Value)),
|
||||||
name="七武海宝藏"
|
name="强者宝藏"
|
||||||
},
|
},
|
||||||
[2] = {
|
[2] = {
|
||||||
id = Language[10332], --佛禅
|
id = Language[10332], --佛禅
|
||||||
|
|
|
@ -118,6 +118,7 @@ end
|
||||||
--设置按钮选中
|
--设置按钮选中
|
||||||
function this.SetBtnSelect(_parObj)
|
function this.SetBtnSelect(_parObj)
|
||||||
this.selectBtn.transform:SetParent(_parObj.transform)
|
this.selectBtn.transform:SetParent(_parObj.transform)
|
||||||
|
this.selectBtn.transform:SetAsFirstSibling()
|
||||||
this.selectBtn.transform.localScale = Vector3.one
|
this.selectBtn.transform.localScale = Vector3.one
|
||||||
this.selectBtn.transform.localPosition=Vector3.zero
|
this.selectBtn.transform.localPosition=Vector3.zero
|
||||||
end
|
end
|
||||||
|
|
|
@ -429,6 +429,7 @@ end
|
||||||
--设置阵营按钮选中
|
--设置阵营按钮选中
|
||||||
function this.SetBtnSelect(_parObj)
|
function this.SetBtnSelect(_parObj)
|
||||||
this.selectBtn.transform:SetParent(_parObj.transform)
|
this.selectBtn.transform:SetParent(_parObj.transform)
|
||||||
|
this.selectBtn.transform:SetAsFirstSibling()
|
||||||
this.selectBtn.transform.localScale = Vector3.one
|
this.selectBtn.transform.localScale = Vector3.one
|
||||||
this.selectBtn.transform.localPosition=Vector3.zero
|
this.selectBtn.transform.localPosition=Vector3.zero
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue