福星高照,牛气冲天 提交
parent
daf5a675f8
commit
4ced80cf6a
|
@ -10285,8 +10285,6 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 2592001850472780297}
|
- component: {fileID: 2592001850472780297}
|
||||||
- component: {fileID: 2592001850472780299}
|
|
||||||
- component: {fileID: 2592001850472780298}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: FuXingGaoZhaoPanel
|
m_Name: FuXingGaoZhaoPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -10315,44 +10313,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!223 &2592001850472780299
|
|
||||||
Canvas:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2592001850472780296}
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 3
|
|
||||||
m_RenderMode: 2
|
|
||||||
m_Camera: {fileID: 0}
|
|
||||||
m_PlaneDistance: 100
|
|
||||||
m_PixelPerfect: 0
|
|
||||||
m_ReceivesEvents: 1
|
|
||||||
m_OverrideSorting: 1
|
|
||||||
m_OverridePixelPerfect: 0
|
|
||||||
m_SortingBucketNormalizedSize: 0
|
|
||||||
m_AdditionalShaderChannelsFlag: 0
|
|
||||||
m_SortingLayerID: 0
|
|
||||||
m_SortingOrder: 0
|
|
||||||
m_TargetDisplay: 0
|
|
||||||
--- !u!114 &2592001850472780298
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 2592001850472780296}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_IgnoreReversedGraphics: 1
|
|
||||||
m_BlockingObjects: 0
|
|
||||||
m_BlockingMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
--- !u!1 &2676605576287313200
|
--- !u!1 &2676605576287313200
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -1594,8 +1594,6 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 3026942363793877950}
|
- component: {fileID: 3026942363793877950}
|
||||||
- component: {fileID: 3026942363793877948}
|
|
||||||
- component: {fileID: 3026942363793877949}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: NiuQiChongTianPanel
|
m_Name: NiuQiChongTianPanel
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -1627,44 +1625,6 @@ RectTransform:
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!223 &3026942363793877948
|
|
||||||
Canvas:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3026942363793877951}
|
|
||||||
m_Enabled: 1
|
|
||||||
serializedVersion: 3
|
|
||||||
m_RenderMode: 2
|
|
||||||
m_Camera: {fileID: 0}
|
|
||||||
m_PlaneDistance: 100
|
|
||||||
m_PixelPerfect: 0
|
|
||||||
m_ReceivesEvents: 1
|
|
||||||
m_OverrideSorting: 1
|
|
||||||
m_OverridePixelPerfect: 0
|
|
||||||
m_SortingBucketNormalizedSize: 0
|
|
||||||
m_AdditionalShaderChannelsFlag: 0
|
|
||||||
m_SortingLayerID: 0
|
|
||||||
m_SortingOrder: 0
|
|
||||||
m_TargetDisplay: 0
|
|
||||||
--- !u!114 &3026942363793877949
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3026942363793877951}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_IgnoreReversedGraphics: 1
|
|
||||||
m_BlockingObjects: 0
|
|
||||||
m_BlockingMask:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Bits: 4294967295
|
|
||||||
--- !u!1 &3135705877999607312
|
--- !u!1 &3135705877999607312
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -444,6 +444,6 @@ SubUIConfig = {
|
||||||
[22] = {name = "page13",assetName = "page13",script = "Modules/DynamicActivity/XinJiangLaiXi"},--新将来袭
|
[22] = {name = "page13",assetName = "page13",script = "Modules/DynamicActivity/XinJiangLaiXi"},--新将来袭
|
||||||
[23] = {name = "page14",assetName = "page14",script = "Modules/DynamicActivity/XiangYaoDuoBao"},--降妖夺宝
|
[23] = {name = "page14",assetName = "page14",script = "Modules/DynamicActivity/XiangYaoDuoBao"},--降妖夺宝
|
||||||
[24] = { name = "ShopView", assetName = "ShopView", script = "View/ShopViewNew" },
|
[24] = { name = "ShopView", assetName = "ShopView", script = "View/ShopViewNew" },
|
||||||
[25] = { name = "FuXingGaoZhaoPanel", assetName = "FuXingGaoZhaoPanel", script = "FuXingGaoZhao/FuXingGaoZhaoPanel" },
|
[25] = { name = "FuXingGaoZhaoPanel", assetName = "FuXingGaoZhaoPanel", script = "Modules/FuXingGaoZhao/FuXingGaoZhaoPanel" },
|
||||||
[26] = { name = "NiuQiChongTianPanel", assetName = "NiuQiChongTianPanel", script = "NiuQiChongTian/NiuQiChongTianPanel" },
|
[26] = { name = "NiuQiChongTianPanel", assetName = "NiuQiChongTianPanel", script = "Modules/NiuQiChongTian/NiuQiChongTianPanel" },
|
||||||
}
|
}
|
|
@ -68,6 +68,9 @@ function LeiJiChongZhiPage:SetTime()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
end
|
end
|
||||||
local timeDown = endtime
|
local timeDown = endtime
|
||||||
|
if timeDown < 0 then
|
||||||
|
return
|
||||||
|
end
|
||||||
this.time.text = Language[10023]..TimeToDHMS(timeDown)
|
this.time.text = Language[10023]..TimeToDHMS(timeDown)
|
||||||
self.timer = Timer.New(function()
|
self.timer = Timer.New(function()
|
||||||
timeDown = timeDown - 1
|
timeDown = timeDown - 1
|
||||||
|
@ -75,6 +78,7 @@ function LeiJiChongZhiPage:SetTime()
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
this.time.text = Language[10023]..TimeToDHMS(0)
|
this.time.text = Language[10023]..TimeToDHMS(0)
|
||||||
|
this.Refresh(true,true)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
this.time.text = Language[10023]..TimeToDHMS(timeDown)
|
this.time.text = Language[10023]..TimeToDHMS(timeDown)
|
||||||
|
|
|
@ -15,7 +15,6 @@ function FuXingGaoZhaoPanel:InitComponent()
|
||||||
self.rewardList = {}
|
self.rewardList = {}
|
||||||
self.itemPreList={} --item预设容器
|
self.itemPreList={} --item预设容器
|
||||||
self.data = {}
|
self.data = {}
|
||||||
self.func = {}
|
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
self.backBtn = Util.GetGameObject(self.gameObject,"Content/btnBack")
|
self.backBtn = Util.GetGameObject(self.gameObject,"Content/btnBack")
|
||||||
self.effect = Util.GetGameObject(self.gameObject,"Content/UI_effect_LuckyCatPanel_normal")
|
self.effect = Util.GetGameObject(self.gameObject,"Content/UI_effect_LuckyCatPanel_normal")
|
||||||
|
@ -79,17 +78,17 @@ function FuXingGaoZhaoPanel:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function EveryDayGift:OnOpen(_activityConfig,_index,parent)
|
function FuXingGaoZhaoPanel:OnOpen(_activityConfig,_index,parent)
|
||||||
self.actConfig = _activityConfig
|
self.actConfig = _activityConfig
|
||||||
self.pageIndex = _index
|
self.pageIndex = _index
|
||||||
self.parent = parent
|
self.parent = parent
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 打开,重新打开时回调
|
-- 打开,重新打开时回调
|
||||||
function FuXingGaoZhaoPanel:OnShow()
|
function FuXingGaoZhaoPanel:OnShow(_sortingOrder)
|
||||||
self.gameObject:SetActive(true)
|
self.gameObject:SetActive(true)
|
||||||
Util.AddParticleSortLayer(self.effect, self.sortingOrder - sortingOrder)
|
Util.AddParticleSortLayer(self.effect, _sortingOrder - sortingOrder)
|
||||||
sortingOrder = self.sortingOrder
|
sortingOrder = _sortingOrder
|
||||||
self.actId = self.actConfig.ActId
|
self.actId = self.actConfig.ActId
|
||||||
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||||
if self.actConfig.IfBack == 1 then
|
if self.actConfig.IfBack == 1 then
|
||||||
|
@ -169,7 +168,7 @@ function FuXingGaoZhaoPanel:SetSingleReward(go,sdata,index)
|
||||||
self.itemPreList[index]:OnOpen(false, sdata.Reward, 0.85,false, false, false, sortingOrder)
|
self.itemPreList[index]:OnOpen(false, sdata.Reward, 0.85,false, false, false, sortingOrder)
|
||||||
mask:SetActive(sdata.State == 1)
|
mask:SetActive(sdata.State == 1)
|
||||||
local effect = Util.GetGameObject(self.itemPreList[index].gameObject,"effects/UI_Effect_jinkuang_Fang")
|
local effect = Util.GetGameObject(self.itemPreList[index].gameObject,"effects/UI_Effect_jinkuang_Fang")
|
||||||
self.itemPreList[index]:SetEffectLayer(self.sortingOrder)
|
self.itemPreList[index]:SetEffectLayer(sortingOrder)
|
||||||
effect:SetActive((self.data.ActState == 1) and (sdata.State == 0) and (sdata.Progress <= GetTimeStamp()))
|
effect:SetActive((self.data.ActState == 1) and (sdata.State == 0) and (sdata.Progress <= GetTimeStamp()))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -193,6 +192,9 @@ function FuXingGaoZhaoPanel:OnDestroy()
|
||||||
self.timer:Stop()
|
self.timer:Stop()
|
||||||
self.timer = nil
|
self.timer = nil
|
||||||
end
|
end
|
||||||
|
for k,v in pairs(self.itemPreList) do
|
||||||
|
SubUIManager.Close(v)
|
||||||
|
end
|
||||||
self.itemPreList={}
|
self.itemPreList={}
|
||||||
self.rewardList={}
|
self.rewardList={}
|
||||||
end
|
end
|
||||||
|
|
|
@ -3,7 +3,6 @@ local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
local sortingOrder = 0
|
local sortingOrder = 0
|
||||||
|
|
||||||
self.activityId = 0
|
|
||||||
function NiuQiChongTianPanel:New(gameObject)
|
function NiuQiChongTianPanel:New(gameObject)
|
||||||
local b = {}
|
local b = {}
|
||||||
b.gameObject = gameObject
|
b.gameObject = gameObject
|
||||||
|
@ -82,10 +81,10 @@ function NiuQiChongTianPanel:OnOpen(_activityConfig,_index,parent)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 打开,重新打开时回调
|
-- 打开,重新打开时回调
|
||||||
function NiuQiChongTianPanel:OnShow()
|
function NiuQiChongTianPanel:OnShow(_sortingOrder)
|
||||||
self.gameObject:SetActive(true)
|
self.gameObject:SetActive(true)
|
||||||
Util.AddParticleSortLayer(self.effect5, self.sortingOrder - sortingOrder)
|
Util.AddParticleSortLayer(self.effect5, _sortingOrder - sortingOrder)
|
||||||
sortingOrder = self.sortingOrder
|
sortingOrder = _sortingOrder
|
||||||
self.activityId = self.actConfig.ActId
|
self.activityId = self.actConfig.ActId
|
||||||
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||||
if self.actConfig.IfBack == 1 then
|
if self.actConfig.IfBack == 1 then
|
||||||
|
@ -101,35 +100,33 @@ function NiuQiChongTianPanel:OnShow()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self.TabCtrl = TabBox.New()
|
local NiuQiChongTianPanelTabAdapter = function(tab, index, status)
|
||||||
self.TabCtrl:SetTabAdapter(self.TabAdapter,self)
|
local tabLab = Util.GetGameObject(tab, "Text")
|
||||||
self.TabCtrl:SetChangeTabCallBack(self.SwitchView,self)
|
local redPoint = Util.GetGameObject(tab, "Redpot")
|
||||||
self.TabCtrl:Init(self.tabBox, _TabData, self.curIndex)
|
if _TabData[index].rpType > 0 then
|
||||||
end
|
if self.redPointList[_TabData[index].rpType] then
|
||||||
|
ClearRedPointObject(_TabData[index].rpType, self.redPointList[_TabData[index].rpType])
|
||||||
-- tab节点显示自定义
|
end
|
||||||
function NiuQiChongTianPanel:TabAdapter(tab, index, status)
|
BindRedPointObject(_TabData[index].rpType,redPoint)
|
||||||
local tabLab = Util.GetGameObject(tab, "Text")
|
self.redPointList[_TabData[index].rpType] = redPoint
|
||||||
local redPoint = Util.GetGameObject(tab, "Redpot")
|
|
||||||
if _TabData[index].rpType > 0 then
|
|
||||||
if self.redPointList[_TabData[index].rpType] then
|
|
||||||
ClearRedPointObject(_TabData[index].rpType, self.redPointList[_TabData[index].rpType])
|
|
||||||
end
|
end
|
||||||
BindRedPointObject(_TabData[index].rpType,redPoint)
|
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status])
|
||||||
self.redPointList[_TabData[index].rpType] = redPoint
|
tabLab:GetComponent("Text").text = _TabData[index].name
|
||||||
|
tabLab:GetComponent("Text").color = _TabFontColor[status]
|
||||||
end
|
end
|
||||||
Util.GetGameObject(tab,"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status])
|
|
||||||
tabLab:GetComponent("Text").text = _TabData[index].name
|
|
||||||
tabLab:GetComponent("Text").color = _TabFontColor[status]
|
|
||||||
end
|
|
||||||
|
|
||||||
--切换
|
local NiuQiChongTianPanelSwitchView = function(index,bool)
|
||||||
function NiuQiChongTianPanel:SwitchView(index,bool)
|
self.curPage = index
|
||||||
self.curPage = index
|
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
||||||
self.rewardData = NiuQiChongTianManager.GetNeedRewardData(self.curPage)
|
|
||||||
|
self:SetProgress()
|
||||||
|
self:SetReward(bool)
|
||||||
|
end
|
||||||
|
|
||||||
self:SetProgress()
|
self.TabCtrl = TabBox.New()
|
||||||
self:SetReward(bool)
|
self.TabCtrl:SetTabAdapter(NiuQiChongTianPanelTabAdapter)
|
||||||
|
self.TabCtrl:SetChangeTabCallBack(NiuQiChongTianPanelSwitchView)
|
||||||
|
self.TabCtrl:Init(self.tabBox, _TabData, self.curIndex)
|
||||||
end
|
end
|
||||||
|
|
||||||
function NiuQiChongTianPanel:SetProgress()
|
function NiuQiChongTianPanel:SetProgress()
|
||||||
|
@ -218,9 +215,9 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
||||||
if data.state == 0 then
|
if data.state == 0 then
|
||||||
UIManager.OpenPanel(UIName.RecruitPanel)
|
UIManager.OpenPanel(UIName.RecruitPanel)
|
||||||
elseif data.state == 1 then
|
elseif data.state == 1 then
|
||||||
NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTianPanel,data.id,function (msg)
|
NetManager.TakeMissionRewardRequest(TaskTypeDef.NiuQiChongTian,data.id,function (msg)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||||
CheckRedPointStatus(RedPointType.NiuQiChongTianPanel + self.curPage)
|
CheckRedPointStatus(RedPointType.NiuQiChongTian + self.curPage)
|
||||||
CheckRedPointStatus(RedPointType.NiuQiChongTian_4)
|
CheckRedPointStatus(RedPointType.NiuQiChongTian_4)
|
||||||
self.SwitchView(self.curPage,true)
|
self.SwitchView(self.curPage,true)
|
||||||
end)
|
end)
|
||||||
|
@ -240,7 +237,13 @@ end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function NiuQiChongTianPanel:OnDestroy()
|
function NiuQiChongTianPanel:OnDestroy()
|
||||||
self.spLoader:Destroy()
|
for k,v in pairs(self.itemsGrid) do
|
||||||
|
for i = 1,#v do
|
||||||
|
SubUIManager.Close(v[i])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
SubUIManager.Close(self.ScrollView)
|
||||||
|
self.spLoader:Destroy(self.ScrollView)
|
||||||
sortingOrder = 0
|
sortingOrder = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue