红点提交

dev_chengFeng
jiaoyangna 2021-01-13 14:29:56 +08:00
parent 9d6130b915
commit 687c5fa957
3 changed files with 93 additions and 10 deletions

View File

@ -6024,6 +6024,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: -409}
m_SizeDelta: {x: 1, y: 325.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2065398199750087224
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3952618305166867692}
- component: {fileID: 5689163252243015713}
- component: {fileID: 4446609091234121262}
m_Layer: 5
m_Name: redpoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &3952618305166867692
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2065398199750087224}
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: 6526898012636184484}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 1, y: 1}
--- !u!222 &5689163252243015713
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2065398199750087224}
m_CullTransparentMesh: 0
--- !u!114 &4446609091234121262
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2065398199750087224}
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 &2141031415528261336
GameObject:
m_ObjectHideFlags: 0
@ -26832,6 +26906,7 @@ RectTransform:
m_Children:
- {fileID: 8789564629059870571}
- {fileID: 8274709192307696016}
- {fileID: 3952618305166867692}
m_Father: {fileID: 1327116469934475768}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -819,13 +819,19 @@ function this. CarbonRedCheck(redType)
end
end
return false
-- --心魔
-- elseif redType == RedPointType.EpicExplore then
-- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
-- else
-- return false
-- end
--心魔
elseif redType == RedPointType.EpicExplore then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do
if v.SpecialReward and #v.SpecialReward > 0 then
local state = this.GetTrialRewardState(v.Id)
if state == 1 then
return true
end
end
end
end
return false
--大闹天宫
elseif redType == RedPointType.OrdinaryExplore then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
@ -839,7 +845,6 @@ function this. CarbonRedCheck(redType)
if PlayerPrefs.GetInt(text,serData.endTime) ~= serData.endTime then
return true
end
--奖励红点
return TreasureOfHeavenManger.RedPoint()
end
@ -856,6 +861,7 @@ function this. CarbonRedCheck(redType)
end
--日常副本红点数据
--1 金币副本 2 经验副本 3角色碎片副本 4 每日法宝副本 5每日魂印副本 0全部
function this.GetDailyCarbons(index)

View File

@ -14,7 +14,7 @@ function MonsterCampPanel:InitComponent()
this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave")
this.btnRank = Util.GetGameObject(self.gameObject, "Bg/btnRank")
this.btnReward = Util.GetGameObject(self.gameObject, "Bg/btnReward")
this.btnRewardRed = Util.GetGameObject(this.btnReward, "redpoint")
-- 跳过战斗
this.battleJumpRoot = Util.GetGameObject(self.gameObject, "passBattle")
this.battleToggleBg = Util.GetGameObject(this.battleJumpRoot, "Background")
@ -48,6 +48,7 @@ end
--绑定事件(用于子类重写)
function MonsterCampPanel:BindEvent()
BindRedPointObject(RedPointType.EpicExplore,this.btnRewardRed)
Util.AddClick(this.btnBack, function ()
-- UIManager.OpenPanel(UIName.MainPanel)
PlayerManager.carbonType = 1
@ -112,6 +113,7 @@ function MonsterCampPanel:BindEvent()
if rewardFunc then
rewardFunc()
end
CheckRedPointStatus(RedPointType.EpicExplore)
end)
end)
end)
@ -152,7 +154,7 @@ end
--界面销毁时调用(用于子类重写)
function MonsterCampPanel:OnDestroy()
SubUIManager.Close(this.UpView)
ClearRedPointObject(RedPointType.EpicExplore,this.btnRewardRed)
end
function this.InitShow()