Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d9e3cfe729
|
|
@ -2915,7 +2915,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 1328281160499532570}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 2.9121184, y: 2.9121184, z: 2.9121184}
|
||||
m_LocalScale: {x: 2, y: 2, z: 2}
|
||||
m_Children:
|
||||
- {fileID: 760474955983389260}
|
||||
m_Father: {fileID: 3470195748214042733}
|
||||
|
|
|
|||
|
|
@ -5081,7 +5081,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000057485686, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000061035156, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &5729675956691850897
|
||||
|
|
@ -17098,7 +17098,7 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 50
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 4
|
||||
|
|
@ -19668,7 +19668,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 0.000028742843, y: -73.150055}
|
||||
m_AnchoredPosition: {x: 0.000030517578, y: -73.150055}
|
||||
m_SizeDelta: {x: 0, y: 151}
|
||||
m_Pivot: {x: 0, y: 0.5}
|
||||
--- !u!114 &4796361513380277662
|
||||
|
|
|
|||
|
|
@ -109,6 +109,7 @@ function this:BindEvent()
|
|||
|
||||
for i = 1, #msg.drop.Hero do
|
||||
HeroManager.UpdateHeroDatas(msg.drop.Hero[i])
|
||||
ExpeditionManager.InitHeroHpValue(msg.drop.Hero[i].id)
|
||||
end
|
||||
curSelectHero = HeroManager.GetSingleHeroData(msg.drop.Hero[1].id)
|
||||
this.ShowCurrPosHeroReplace(curIndex)
|
||||
|
|
|
|||
|
|
@ -432,6 +432,22 @@ function this.AllFormationDeleCurHeroId(heroDid)
|
|||
end
|
||||
end
|
||||
end
|
||||
-- 归元时检测无尽 和 大闹天宫阵容是否需要下阵
|
||||
function this.ResolvDownBattleCurHeroId(heroDid)
|
||||
for i, team in pairs(this.formationList) do
|
||||
local removeIndex
|
||||
if i == FormationTypeDef.EXPEDITION or i == FormationTypeDef.FORMATION_ENDLESS_MAP then
|
||||
for j = 1, #team.teamHeroInfos do
|
||||
if team.teamHeroInfos[j] and team.teamHeroInfos[j].heroId == heroDid then
|
||||
removeIndex = j
|
||||
end
|
||||
end
|
||||
if removeIndex then
|
||||
table.remove( team.teamHeroInfos, removeIndex)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- 获取当前光环的加成数据 type 编队类型
|
||||
function this.GetCurFormationElementAdd(teamHeroInfos)
|
||||
|
|
|
|||
|
|
@ -147,6 +147,9 @@ function this.GetCurBoss()
|
|||
return curBoss
|
||||
end
|
||||
function this.GetBlood()
|
||||
if blood < 0 then
|
||||
blood = 10000
|
||||
end
|
||||
return blood
|
||||
end
|
||||
function this.GetCanSweep()
|
||||
|
|
|
|||
|
|
@ -2910,6 +2910,7 @@ function this.ResetHero(dynamicloadId)
|
|||
heroDatas[dynamicloadId].lv = 1
|
||||
heroDatas[dynamicloadId].breakId = 0
|
||||
end
|
||||
FormationManager.ResolvDownBattleCurHeroId(dynamicloadId)
|
||||
end
|
||||
--神将合成
|
||||
function this.ByCompoundHeroGetAllHeros()
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ function this:BindEvent()
|
|||
curHeroHp=10000
|
||||
end
|
||||
MapTrialManager.SetHeroHp({curHeroHp},selectHeroDid)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
||||
end)
|
||||
end)
|
||||
--购买道具按钮
|
||||
|
|
|
|||
Loading…
Reference in New Issue