全民福利红点提交

dev_chengFeng
wangzhenxing 2022-12-16 17:04:19 +08:00
parent 7a45ce0103
commit 093d259331
9 changed files with 208 additions and 8 deletions

View File

@ -1,5 +1,79 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1034655735040035080
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 84585537616164264}
- component: {fileID: 8798715919191998016}
- component: {fileID: 3376030060532953973}
m_Layer: 5
m_Name: red
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &84585537616164264
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034655735040035080}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1797943222019789551}
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}
m_AnchoredPosition: {x: 40.1, y: 26}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8798715919191998016
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034655735040035080}
m_CullTransparentMesh: 0
--- !u!114 &3376030060532953973
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1034655735040035080}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &1313944979821781127
GameObject:
m_ObjectHideFlags: 0
@ -331,7 +405,8 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 84585537616164264}
m_Father: {fileID: 4423395231852162617}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -295,7 +295,7 @@ 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: -194.27}
m_AnchoredPosition: {x: 0, y: -194.27002}
m_SizeDelta: {x: -115, y: -1012.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &263232123
@ -1686,6 +1686,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &807845447921307680
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8594876307279777964}
- component: {fileID: 324640988120751842}
- component: {fileID: 8566654674745549065}
m_Layer: 5
m_Name: red
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8594876307279777964
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 807845447921307680}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1523959801539440574}
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}
m_AnchoredPosition: {x: 41.6, y: 44.3}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &324640988120751842
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 807845447921307680}
m_CullTransparentMesh: 0
--- !u!114 &8566654674745549065
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 807845447921307680}
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &812222573940880244
GameObject:
m_ObjectHideFlags: 0
@ -3102,7 +3176,8 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 8594876307279777964}
m_Father: {fileID: 794766830}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -169,6 +169,15 @@ function this:OnSortingOrderChange()
v.sub:OnSortingOrderChange(self.sortingOrder)
end
end
function ActivityMainPanel:OnFocus()
for k,v in pairs(subViewList) do
if v.sub.OnFocus then
v.sub:OnFocus()
end
end
end
----==========================一级页签相关===========================================
-- tab按钮自定义显示设置
function this.PageTabAdapter(tab, index, status)

View File

@ -33,9 +33,7 @@ function this.GetRedPointStatus(index)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
for _, missionInfo in ipairs(activityInfo.mission) do
local rewardInfo = activityRewardConfig[missionInfo.missionId]
LogError("rewardInfo.Values[1][1]=="..rewardInfo.Values[1][1])
if rewardInfo and rewardInfo.Values[1][1] == index*10000 then
LogError("missionInfo.state===="..missionInfo.state)
redPoint = missionInfo.state==1
if redPoint then
return true

View File

@ -37,6 +37,8 @@ function GrowthGiftPage:InitComponent()
self.scrollItem = Util.GetGameObject(self.gameObject, "rzyBg/scrollItem")
self.itemPre = Util.GetGameObject(self.gameObject, "rzyBg/ItemPre")
self.btn_qmfl=Util.GetGameObject(self.gameObject, "rzyBg/bg/btn_qmfl")
self.red_qmfl=Util.GetGameObject(self.gameObject, "rzyBg/bg/btn_qmfl/red")
self.red_qmfl:SetActive(false)
self.btn_qmfl:GetComponent("Image").sprite=self.spLoader:LoadSprite("GM_qmfl_botton_zh")
--设置滚动条
local rootHight = self.scrollItem.transform.rect.height
@ -74,6 +76,11 @@ function GrowthGiftPage:OnOpen(_activityConfig,_index,parent)
self.parent = parent
end
function GrowthGiftPage:OnFocus()
self.red_qmfl:SetActive(RecruitTreasureManager.GetQuanMinRed(self.curActiId))
end
function GrowthGiftPage:OnSortingOrderChange()
end
@ -101,6 +108,8 @@ function GrowthGiftPage:OnShow(_sortingOrder)
end
end
end
LogError("self.curActiId:=="..self.curActiId)
self.red_qmfl:SetActive(RecruitTreasureManager.GetQuanMinRed(self.curActiId))
--LogGreen("self.curActiId:"..self.curActiId)
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
self.titleBgIma.sprite = self.spLoader:LoadSprite(self.actConfig.Icon[3])

View File

@ -249,11 +249,18 @@ end
function this.GetGrowthRedPointState()
local redPoint = false
local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
local hasGift = OperatingManager.HasGoodsByShowType(4)
if openId then
local isGet=RecruitTreasureManager.GetQuanMinRed(openId)
if isGet then
return true
end
end
if not hasGift then return false end
local giftGoodsInfo = OperatingManager.IsGrowthGiftGoodsAvailable(GoodsTypeDef.GrowthReward)
if not giftGoodsInfo then return false end
local openId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)
if openId then
-- 判断对应礼包是否购买
local globalActConfigs = ConfigManager.TryGetConfigData(ConfigName.GlobalActivity, openId)
@ -272,7 +279,7 @@ function this.GetGrowthRedPointState()
end
end
end
end
end
return redPoint
end

View File

@ -43,6 +43,8 @@ end
--绑定事件(用于子类重写)
function QuanMinFLPanel:BindEvent()
Util.AddClick(self.btn_close, function()
CheckRedPointStatus(RedPointType.GrowthGift)
CheckRedPointStatus(RedPointType.recruitTreasure)
self:ClosePanel()
end)
end
@ -211,6 +213,7 @@ end
--界面关闭时调用(用于子类重写)
function QuanMinFLPanel:OnClose()
self.gameObject:SetActive(false)
end
--界面销毁时调用(用于子类重写)
function QuanMinFLPanel:OnDestroy()

View File

@ -2,7 +2,7 @@ RecruitTreasureManager = {}
local this = RecruitTreasureManager
local summonTreasure = ConfigManager.GetConfig(ConfigName.SummonTreasure)
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityGroups,"PageType",ActivityTypeDef.RecruitTreasure)
local UniversalWelfareConfig=ConfigManager.GetConfig(ConfigName.UniversalWelfareConfig)
function this.Initialize()
this.treasureData = {}
end
@ -116,7 +116,24 @@ function this.GetRedPointStatus(red)
return true
end
end
local isShow=this.GetQuanMinRed(actId)
return isShow
end
function this.GetQuanMinRed(actId)
local activityData=ActivityGiftManager.GetActivityInfoByType(10502)
if activityData and activityData.mission then
for i = 1, #activityData.mission do
local mission=activityData.mission[i]
if UniversalWelfareConfig[mission.missionId] and UniversalWelfareConfig[mission.missionId].GlobalActivity==actId then
if activityData.mission[i].state==1 then
return true
end
end
end
end
return false
end
return this

View File

@ -42,6 +42,8 @@ function RecruitTreasurePanel:InitComponent()
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 2
this.btn_qmfl=Util.GetGameObject(self.transform, "bg/topBar/btn_qmfl")
this.btn_qmfl_red=Util.GetGameObject(self.transform, "bg/topBar/btn_qmfl/red")
this.btn_qmfl_red:SetActive(false)
this.btn_qmfl:GetComponent("Image").sprite =this.spLoader:LoadSprite("GM_qmfl_botton_zh")
this.tabbox = Util.GetGameObject(self.gameObject, "bg/pageContent/tabbox")
end
@ -125,6 +127,10 @@ function RecruitTreasurePanel:OnOpen(_activityConfig,_index,parent)
this.parent = parent
end
function RecruitTreasurePanel:OnFocus()
this.btn_qmfl_red:SetActive(RecruitTreasureManager.GetQuanMinRed(curId))
end
-- 打开,重新打开时回调
function RecruitTreasurePanel:OnShow(_sortingOrder)
@ -133,6 +139,7 @@ function RecruitTreasurePanel:OnShow(_sortingOrder)
this.actType = this.actConfig.ActiveType > 0 and this.actConfig.ActiveType or this.actConfig.FunType
curId=ActivityGiftManager.GetActivityIdByType(this.actType)
LogError("this.acttype===="..this.actType.." curid=="..curId)
this.btn_qmfl_red:SetActive(RecruitTreasureManager.GetQuanMinRed(curId))
this.btn_qmfl:SetActive(ActivityGiftManager.GetActivityInfoByType(10502)~=nil and this.actType==7 and ActivityGiftManager.CheckIsHaveHaveQMFL(this.actType,curId) )
this.titleImage.sprite = this.spLoader:LoadSprite(this.actConfig.Icon[3])
local activeNum = 0