【首充】======界面逻辑显示修改
parent
5935f7a269
commit
6e360fa353
|
|
@ -35894,6 +35894,7 @@ GameObject:
|
|||
- component: {fileID: 1481527223116321039}
|
||||
- component: {fileID: 1481527223116321038}
|
||||
- component: {fileID: 4591342464696123865}
|
||||
- component: {fileID: 7808126542128160076}
|
||||
m_Layer: 5
|
||||
m_Name: tabsContent
|
||||
m_TagString: Untagged
|
||||
|
|
@ -35949,13 +35950,42 @@ MonoBehaviour:
|
|||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
m_ChildAlignment: 4
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 179, y: 100}
|
||||
m_Spacing: {x: 5, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
--- !u!114 &7808126542128160076
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1481527223116321136}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: ff423d7f2dcdb204ca377c232a1144c1, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1481527223208621136
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -90,11 +90,11 @@ function FirstRechargePanel:InitComponent()
|
|||
self.rewardGrid = Util.GetGameObject(self.transform, "frame/rewardBg/rewardBg")
|
||||
self.rewardGridPos = self.rewardGrid.transform.localPosition
|
||||
self.itemWidth = self.rewardGrid:GetComponent("HorizontalLayoutGroup").spacing
|
||||
|
||||
self.preList={}
|
||||
self.dayRewardList = {}
|
||||
-- for i = 1, kMaxDay do
|
||||
--
|
||||
-- end
|
||||
for i = 1, 4 do
|
||||
table.insert(self.preList,Util.GetGameObject(self.transform, "frame/tabsContent/tabs_"..i))
|
||||
end
|
||||
|
||||
--bottomPart
|
||||
self.reChargeBtn = Util.GetGameObject(self.transform, "frame/rechargeBtn")
|
||||
|
|
@ -183,7 +183,7 @@ function FirstRechargePanel:OnOpen(context,_fun)
|
|||
self.ani.enabled = true
|
||||
end, qyTime):Start()
|
||||
Timer.New(function ()
|
||||
self.tabs[1]:SetActive(true)
|
||||
--self.tabs[1]:SetActive(true)
|
||||
self.closeBtn:GetComponent("Button").enabled = true
|
||||
end, qyTime + 1):Start()
|
||||
end
|
||||
|
|
@ -207,6 +207,7 @@ function FirstRechargePanel:OnShow()
|
|||
table.insert(_MoneyDataNum[index], missInfo)
|
||||
end
|
||||
end
|
||||
|
||||
-- 判断数据
|
||||
local minIndex
|
||||
for index, dataList in pairs(_MoneyDataNum) do
|
||||
|
|
@ -215,18 +216,30 @@ function FirstRechargePanel:OnShow()
|
|||
table.sort(dataList,function(a,b)
|
||||
return a.missionId < b.missionId
|
||||
end)
|
||||
|
||||
-- 找到最小的
|
||||
if not minIndex or index < minIndex then
|
||||
minIndex = index
|
||||
local isAll=true
|
||||
for key, value in pairs(dataList) do
|
||||
if value.state~=1 then
|
||||
isAll=false
|
||||
end
|
||||
end
|
||||
if isAll then
|
||||
-- table.remove(_MoneyDataNum,index)
|
||||
self.preList[index]:SetActive(false)
|
||||
else
|
||||
-- 找到最小的
|
||||
if not minIndex or index < minIndex then
|
||||
minIndex = index
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
-- 如果想看的不存在就显示最小的
|
||||
if not _MoneyDataNum[self.selectTabIndex] or #_MoneyDataNum[self.selectTabIndex] <= 0 then
|
||||
-- if not _MoneyDataNum[self.selectTabIndex] or #_MoneyDataNum[self.selectTabIndex] <= 0 then
|
||||
self.selectTabIndex = minIndex
|
||||
end
|
||||
--end
|
||||
|
||||
self.reChargeTips.text = Language[10664]..string.format(MoneyUtil.GetMoneyUnitName(),AccumRecharge)--string.format(Language[10665], AccumRecharge)
|
||||
self:OnTabChanged(self.selectTabIndex)
|
||||
|
|
@ -307,7 +320,6 @@ end
|
|||
|
||||
function FirstRechargePanel:ShowContent(index)
|
||||
local tempData = {}
|
||||
|
||||
for _, missionInfo in ipairs(_MoneyDataNum[index]) do
|
||||
table.insert(tempData, activityRewardConfig[missionInfo.missionId])
|
||||
end
|
||||
|
|
@ -323,7 +335,6 @@ function FirstRechargePanel:ShowContent(index)
|
|||
else
|
||||
if not self.dayRewardList[i] then
|
||||
--local go = newObjToParent(self.rewardDay,self.rewardGrid)
|
||||
LogError("i==="..i)
|
||||
local go=self.rewardGrid.transform:GetChild(i-1).gameObject
|
||||
self.dayRewardList[i] = DayRewardItem.new(self,go)
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue