Merge branch 'china/dev-c' into 0功能/修行玩法
commit
d0d20db65b
File diff suppressed because it is too large
Load Diff
|
@ -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
|
||||
|
@ -3858,8 +3858,8 @@ 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: 303.60004, y: -40.999977}
|
||||
m_SizeDelta: {x: 190, y: 116}
|
||||
m_AnchoredPosition: {x: 309.60004, y: -40.999977}
|
||||
m_SizeDelta: {x: 216, y: 116}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3156151472197042922
|
||||
CanvasRenderer:
|
||||
|
@ -3889,7 +3889,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: 199e74fa77e340c41815c9b3d3ae3d3b, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 3a19d32f59f4c2647be996277c6a2703, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -4012,8 +4012,8 @@ 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: 303.59998, y: -41}
|
||||
m_SizeDelta: {x: 190, y: 116}
|
||||
m_AnchoredPosition: {x: 309.6, y: -41.9}
|
||||
m_SizeDelta: {x: 216, y: 116}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3156151472522459426
|
||||
CanvasRenderer:
|
||||
|
@ -4043,7 +4043,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: 199e74fa77e340c41815c9b3d3ae3d3b, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 3a19d32f59f4c2647be996277c6a2703, 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
|
||||
-- 成员数据
|
||||
|
|
|
@ -6,6 +6,7 @@ local boxList = {}
|
|||
local levelList = {}
|
||||
local chapterId = 0
|
||||
local chapterData = {}
|
||||
local allMissionDailyBoxItemPres = {}
|
||||
--初始化组件(用于子类重写)
|
||||
function FightLevelSingleChapterPanel:InitComponent()
|
||||
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
|
||||
|
@ -25,6 +26,12 @@ function FightLevelSingleChapterPanel:InitComponent()
|
|||
this.rightBtn=Util.GetGameObject(self.gameObject,"middle/rightBtn")
|
||||
this.leftBtnClick=Util.GetGameObject(self.gameObject,"middle/leftBtn/GameObject")
|
||||
this.rightBtnClick=Util.GetGameObject(self.gameObject,"middle/rightBtn/GameObject")
|
||||
|
||||
--宝箱预览
|
||||
this.rewardMaskBtn = Util.GetGameObject(self.gameObject, "middle/rewardMaskBtn")
|
||||
this.RewardPanelGetInfo = Util.GetGameObject(self.gameObject, "middle/rewardMaskBtn/RewardPanel/getInfo"):GetComponent("Text")
|
||||
this.RewardPanelGrid = Util.GetGameObject(self.gameObject, "middle/rewardMaskBtn/RewardPanel/ViewRect/grid")
|
||||
Util.GetGameObject(self.gameObject, "middle/rewardMaskBtn/RewardPanel/Image/Text"):GetComponent("Text").text = Language[10763]
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
|
@ -39,6 +46,9 @@ function FightLevelSingleChapterPanel:BindEvent()
|
|||
Util.AddClick(this.rightBtnClick, function()
|
||||
this.LeftOrRightBtnClickEvent(2)
|
||||
end)
|
||||
Util.AddClick(this.rewardMaskBtn, function()
|
||||
this.rewardMaskBtn:SetActive(false)
|
||||
end)
|
||||
end
|
||||
function FightLevelSingleChapterPanel:OnSortingOrderChange()
|
||||
--特效层级重设
|
||||
|
@ -58,6 +68,7 @@ function FightLevelSingleChapterPanel:OnShow()
|
|||
|
||||
this.OnShowPanel()
|
||||
this.LeftOrRightBtnClickEvent()
|
||||
this.rewardMaskBtn:SetActive(false)
|
||||
end
|
||||
function this.OnShowPanel()
|
||||
chapterData = FightLevelManager.GetChapterData(chapterId)
|
||||
|
@ -201,12 +212,14 @@ function this.SetlevelBox(_rewardBoxDatas)
|
|||
else
|
||||
Util.GetGameObject(boxList[i], "redPoint"):SetActive(false)
|
||||
Util.AddOnceClick(boxList[i], function()
|
||||
this.FindBoxRewardInfo(missionConfigData)
|
||||
end)
|
||||
end
|
||||
elseif _rewardBoxDatas[i].state == 1 then
|
||||
Util.GetGameObject(boxList[i], "getFinish"):SetActive(true)
|
||||
Util.AddOnceClick(boxList[i], function()
|
||||
PopupTipPanel.ShowTip("奖励已领取!")
|
||||
-- PopupTipPanel.ShowTip("奖励已领取!")
|
||||
this.FindBoxRewardInfo(missionConfigData)
|
||||
end)
|
||||
end
|
||||
|
||||
|
@ -257,12 +270,39 @@ function this.GetCurLevelIsOpen(levelDatas)
|
|||
end
|
||||
return 0
|
||||
end
|
||||
--宝箱奖励预览
|
||||
function this.FindBoxRewardInfo(missionConfigData)
|
||||
local curConfig = missionConfigData
|
||||
this.RewardPanelGetInfo.text = string.format("收集%s星获得:",curConfig.Star)
|
||||
local showItem = ConfigManager.GetConfigData(ConfigName.RewardGroup,curConfig.StarReward)
|
||||
local reward ={}
|
||||
if showItem and showItem.ShowItem then
|
||||
reward = showItem.ShowItem
|
||||
end
|
||||
if reward then
|
||||
for i = 1, math.max(#allMissionDailyBoxItemPres, #reward) do
|
||||
local go = allMissionDailyBoxItemPres[i]
|
||||
if not go then
|
||||
go = SubUIManager.Open(SubUIConfig.ItemView, this.RewardPanelGrid.transform)
|
||||
go.gameObject.name = "frame"..i
|
||||
allMissionDailyBoxItemPres[i] = go
|
||||
end
|
||||
go.gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #reward do
|
||||
allMissionDailyBoxItemPres[i].gameObject:SetActive(true)
|
||||
allMissionDailyBoxItemPres[i]:OnOpen(false,reward[i],0.75)
|
||||
end
|
||||
end
|
||||
this.rewardMaskBtn:SetActive(true)
|
||||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function FightLevelSingleChapterPanel:OnClose()
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function FightLevelSingleChapterPanel:OnDestroy()
|
||||
allMissionDailyBoxItemPres = {}
|
||||
|
||||
end
|
||||
|
||||
|
|
|
@ -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