【山河社稷图】编队bug
parent
f6fb0c2071
commit
d1e27ccdc3
|
|
@ -350,7 +350,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7187177280355369542
|
||||
|
|
@ -544,7 +544,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8112824231352002669
|
||||
|
|
@ -1015,7 +1015,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -1343,7 +1343,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2402411172302772721
|
||||
|
|
@ -1450,7 +1450,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -1852,7 +1852,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -2286,7 +2286,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -2915,7 +2915,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -4409,7 +4409,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -4513,7 +4513,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3398797905345004907
|
||||
|
|
@ -5633,7 +5633,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8902139217839717834
|
||||
|
|
@ -6225,7 +6225,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -6490,7 +6490,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986336414083366
|
||||
|
|
@ -6564,7 +6564,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986336540594234
|
||||
|
|
@ -6751,7 +6751,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -7252,7 +7252,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -7974,7 +7974,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -8050,7 +8050,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -8710,7 +8710,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986337289940763
|
||||
|
|
@ -8938,7 +8938,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986337356595519
|
||||
|
|
@ -9194,7 +9194,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 56ec0d5b7fd75be43b0e594e19d099ec, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: e6469ea858ce09344b711c566787cfa0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
@ -9420,7 +9420,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986337646844635
|
||||
|
|
@ -10007,7 +10007,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6761986338010098148
|
||||
|
|
@ -10784,7 +10784,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 11.5}
|
||||
m_AnchoredPosition: {x: 0, y: 27.1}
|
||||
m_SizeDelta: {x: 50, y: 69}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4580004963830104085
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ function this.RrefreshFormation(parameter)
|
|||
-- 编队界面的数据
|
||||
newFormation.teamHeroInfos = {}
|
||||
newFormation.teamPokemonInfos = {}
|
||||
newFormation.teamId = FormationTypeDef.EXPEDITION
|
||||
newFormation.teamId = FormationTypeDef.FIGHT_LEVEL
|
||||
newFormation.teamName = curTeam.teamName
|
||||
newFormation.teamPokemonInfos = curTeam.teamPokemonInfos
|
||||
-- 成员数据
|
||||
|
|
|
|||
|
|
@ -167,9 +167,10 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
local name=Util.GetGameObject(nameParent,"Text"):GetComponent("Text")
|
||||
-- local pos=Util.GetGameObject(o,"Pos"):GetComponent("Image")
|
||||
local yuanImage=Util.GetGameObject(o,"yuanImage")
|
||||
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
|
||||
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
||||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
Util.GetGameObject(o,"hpProgress"):SetActive(false)
|
||||
-- local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
|
||||
-- local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
||||
-- local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
local liveName = GetResourcePath(heroConfig.Live)
|
||||
|
|
@ -192,7 +193,7 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
yuanImage:SetActive(false)
|
||||
lv.text=curMonsterConfig.level
|
||||
|
||||
bg.sprite = Util.LoadSprite(GetFormationHeroCardStarBg[curMonsterConfig.Star])
|
||||
bg.sprite = Util.LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star])
|
||||
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star])
|
||||
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
|
|
@ -206,10 +207,10 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
SetTextVerTial(name.gameObject,Vector3.New(35,-7.45,0),nil,nil,8)
|
||||
|
||||
|
||||
local curHeroHpVal = 1
|
||||
hp.fillAmount = curHeroHpVal
|
||||
hpPass.fillAmount = curHeroHpVal
|
||||
rage.fillAmount = 0.5
|
||||
-- local curHeroHpVal = 1
|
||||
-- hp.fillAmount = curHeroHpVal
|
||||
-- hpPass.fillAmount = curHeroHpVal
|
||||
-- rage.fillAmount = 0.5
|
||||
end
|
||||
function this.LeftOrRightBtnClickEvent()
|
||||
curShowIndex = not curShowIndex
|
||||
|
|
|
|||
|
|
@ -141,22 +141,18 @@ end
|
|||
--设置单个上阵英雄信息
|
||||
function this.SetCardSingleData(o,monsterId, _pos)
|
||||
local curMonsterConfig = MonsterConfig[monsterId]
|
||||
o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("bd_xinkapaifan")
|
||||
o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_chengyuankuang_kuang")
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, curMonsterConfig.MonsterId)
|
||||
local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image")
|
||||
local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image")
|
||||
-- local live=Util.GetGameObject(o,"Mask/Live")
|
||||
local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text")
|
||||
local pro=Util.GetGameObject(o,"Pro/Image"):GetComponent("Image")
|
||||
local starGrid=Util.GetGameObject(o,"StarGrid")
|
||||
local nameParent = Util.GetGameObject(o,"Name") -- 用于解决本地化问题
|
||||
local name=Util.GetGameObject(nameParent,"Text"):GetComponent("Text")
|
||||
-- local pos=Util.GetGameObject(o,"Pos"):GetComponent("Image")
|
||||
local yuanImage=Util.GetGameObject(o,"yuanImage")
|
||||
local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image")
|
||||
local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image")
|
||||
Util.GetGameObject(o,"hpProgress"):SetActive(false)
|
||||
local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image")
|
||||
|
||||
local live = Util.GetGameObject(o, "Mask/icon"):GetComponent("RawImage")
|
||||
local liveName = GetResourcePath(heroConfig.Live)
|
||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id)
|
||||
|
|
@ -176,9 +172,9 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
end
|
||||
|
||||
yuanImage:SetActive(false)
|
||||
lv.text=curMonsterConfig.level
|
||||
lv.text=curMonsterConfig.Level
|
||||
|
||||
bg.sprite = Util.LoadSprite(GetFormationHeroCardStarBg[curMonsterConfig.Star])
|
||||
bg.sprite = Util.LoadSprite(GetHeroCardStarBg[curMonsterConfig.Star])
|
||||
fg.sprite = Util.LoadSprite(GetHeroCardStarFg[curMonsterConfig.Star])
|
||||
|
||||
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
|
||||
|
|
@ -190,12 +186,6 @@ function this.SetCardSingleData(o,monsterId, _pos)
|
|||
end
|
||||
name.text=GetLanguageStrById(heroConfig.ReadingName)
|
||||
SetTextVerTial(name.gameObject,Vector3.New(35,-7.45,0),nil,nil,8)
|
||||
|
||||
|
||||
local curHeroHpVal = 1
|
||||
hp.fillAmount = curHeroHpVal
|
||||
hpPass.fillAmount = curHeroHpVal
|
||||
rage.fillAmount = 0.5
|
||||
end
|
||||
function this:OnClose()
|
||||
if fun then
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ function this.MakeAEmptyTeam(teamId)
|
|||
oTeam.teamName = Language[10685]-- 1001
|
||||
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
||||
oTeam.teamName = Language[10678]-- 1301
|
||||
elseif teamId == FormationTypeDef.FIGHT_LEVEL then
|
||||
oTeam.teamName = "山河社稷图"-- 1701
|
||||
end
|
||||
oTeam.teamHeroInfos = {}
|
||||
oTeam.teamPokemonInfos = {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue