备战界面设置界面修改
parent
0fa9e66802
commit
bc2603a3f2
|
@ -31,7 +31,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1581072650}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -403,8 +403,8 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 15530334}
|
||||
- {fileID: 1700820782}
|
||||
- {fileID: 15530334}
|
||||
m_Father: {fileID: 5323020496514661247}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -522,7 +522,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1581072650}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
@ -854,7 +854,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: 0b995aca1fd38a84cb89d90c5620561c, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 70880bb948d704640910d7f25d8c5294, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -1285,7 +1285,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5655121485874319116
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5162,7 +5162,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &2900301469612778193
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -15201,8 +15201,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -50}
|
||||
m_SizeDelta: {x: 0, y: -100}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000068665}
|
||||
m_SizeDelta: {x: 0, y: 0.00012207}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &133445662559762497
|
||||
CanvasRenderer:
|
||||
|
|
|
@ -132,7 +132,7 @@ function this:InitComponent()
|
|||
-- end
|
||||
end
|
||||
this.selectBtn = Util.GetGameObject(this.gameObject, "Grid/selectBtn")
|
||||
|
||||
this.selectTxt=Util.GetGameObject(this.gameObject, "Grid/selectBtn/Text"):GetComponent("Text")
|
||||
--副本扫荡
|
||||
this.mopUpGo = Util.GetGameObject(self.transform, "root/showMopUp")
|
||||
this.btnMpoUpBack = Util.GetGameObject(self.transform, "showMopUp/bg/btnBack")
|
||||
|
@ -636,6 +636,7 @@ function this.OnClickTabBtn(_proId, isTop,isAni)
|
|||
this.selectBtn.transform:SetParent(tabs[_proId].transform)
|
||||
this.selectBtn.transform:DOAnchorPos(Vector3.zero,0)
|
||||
this.selectBtn.transform:DOScale(Vector3.one,0)
|
||||
this.selectTxt.text=PropertyType[_proId]
|
||||
-- 定制显示
|
||||
local heros = {}
|
||||
if this.opView.GetHeroList then
|
||||
|
|
|
@ -92,6 +92,16 @@ function this.GetHeroGiftAddPro(_id)
|
|||
LogError("英雄gift======================nil")
|
||||
return data
|
||||
end
|
||||
local addPro=0
|
||||
if this.playerGifts and #this.playerGifts>0 then
|
||||
for i=1,#this.playerGifts do
|
||||
local id=this.playerGifts[i]
|
||||
if equipConfig[id] and equipConfig[id].HeroGitUp and equipConfig[id].HeroGitUp>0 then
|
||||
addPro=addPro + equipConfig[id].HeroGitUp
|
||||
end
|
||||
end
|
||||
end
|
||||
--HeroGitUp
|
||||
local list=this.allHeroGifts[_id]
|
||||
for i=1,#list do
|
||||
local id=list[i]
|
||||
|
@ -118,8 +128,12 @@ function this.GetHeroGiftAddPro(_id)
|
|||
-- data[pro2[k][1]] = data[pro2[k][1]] + pro2[k][2]
|
||||
-- end
|
||||
-- end
|
||||
|
||||
end
|
||||
-- if addPro>0 then
|
||||
-- for k, v in pairs(data) do
|
||||
-- data[k]=math.floor(v*(1+addPro/10000)+0.5)
|
||||
-- end
|
||||
-- end
|
||||
return data
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue