副本红点提交

dev_chengFeng
jiaoyangna 2020-07-29 17:50:15 +08:00
parent c0d8db5253
commit b2af34a2b3
9 changed files with 469 additions and 46 deletions

View File

@ -10193,13 +10193,14 @@ RectTransform:
m_Children:
- {fileID: 8969929218646538148}
- {fileID: 4608416308169033978}
- {fileID: 375223397497548971}
m_Father: {fileID: 9193158905020371500}
m_RootOrder: 2
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: 2.9, y: -286.6}
m_SizeDelta: {x: 1078.7, y: 384.5}
m_AnchoredPosition: {x: 2.9, y: -261.5}
m_SizeDelta: {x: 1081.5, y: 363}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1639556681086997609
CanvasRenderer:
@ -20260,6 +20261,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u65E5\u5E38\u526F\u672C"
LanguageIndex: 10241
--- !u!1 &3031619714612119660
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1451784685098100798}
- component: {fileID: 1505554049211081270}
- component: {fileID: 8055999611149513513}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1451784685098100798
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3031619714612119660}
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: 2}
m_Children: []
m_Father: {fileID: 8329884962036650588}
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: -47.99997, y: -18.00003}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1505554049211081270
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3031619714612119660}
m_CullTransparentMesh: 0
--- !u!114 &8055999611149513513
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3031619714612119660}
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 &3055522540678329051
GameObject:
m_ObjectHideFlags: 0
@ -20542,7 +20617,7 @@ RectTransform:
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: 226.5, y: -151}
m_AnchoredPosition: {x: 226.5, y: -164.1}
m_SizeDelta: {x: 572.9, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2237096159616910850
@ -20618,7 +20693,7 @@ RectTransform:
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: 224.9, y: -151}
m_AnchoredPosition: {x: 224.9, y: -162.1}
m_SizeDelta: {x: 572.9, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7188490705615992323
@ -26072,6 +26147,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3897294384390762468
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6665710735538482627}
- component: {fileID: 7966756187828456433}
- component: {fileID: 6744971125463164037}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &6665710735538482627
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897294384390762468}
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: 2}
m_Children: []
m_Father: {fileID: 4193361005049235218}
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: -34.99994, y: -5}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 1, y: 1}
--- !u!222 &7966756187828456433
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897294384390762468}
m_CullTransparentMesh: 0
--- !u!114 &6744971125463164037
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3897294384390762468}
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 &3900292603000702420
GameObject:
m_ObjectHideFlags: 0
@ -36499,7 +36648,7 @@ RectTransform:
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: 222.41995, y: -151}
m_AnchoredPosition: {x: 222.41995, y: -161.9}
m_SizeDelta: {x: 572.9, y: 39}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7825300325483899798
@ -36571,12 +36720,13 @@ RectTransform:
m_Children:
- {fileID: 3571774736793126988}
- {fileID: 3582918339532414036}
- {fileID: 2725678084001925036}
m_Father: {fileID: 9193158905020371500}
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}
m_AnchoredPosition: {x: 4.9, y: 203}
m_AnchoredPosition: {x: 4.9, y: 221.9}
m_SizeDelta: {x: 1081.5, y: 363}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8619251534374498413
@ -36728,6 +36878,80 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u656C\u8BF7\u671F\u5F85"
--- !u!1 &4855932119863929017
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 375223397497548971}
- component: {fileID: 8761972145376693076}
- component: {fileID: 7272835401864215965}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &375223397497548971
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4855932119863929017}
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: 2}
m_Children: []
m_Father: {fileID: 6721404764757822392}
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: -34.99997, y: -5.0000153}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 1, y: 1}
--- !u!222 &8761972145376693076
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4855932119863929017}
m_CullTransparentMesh: 0
--- !u!114 &7272835401864215965
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4855932119863929017}
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 &4892133023688319706
GameObject:
m_ObjectHideFlags: 0
@ -36958,6 +37182,7 @@ RectTransform:
m_Children:
- {fileID: 4857275258040740634}
- {fileID: 7677851812191043880}
- {fileID: 1451784685098100798}
m_Father: {fileID: 9193158905020371500}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -47846,6 +48071,80 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6356459965477956039
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2725678084001925036}
- component: {fileID: 6678333310411746944}
- component: {fileID: 811818516579414912}
m_Layer: 5
m_Name: redPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2725678084001925036
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6356459965477956039}
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: 2}
m_Children: []
m_Father: {fileID: 6220988610552597111}
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: -35, y: -5}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 1, y: 1}
--- !u!222 &6678333310411746944
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6356459965477956039}
m_CullTransparentMesh: 0
--- !u!114 &811818516579414912
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6356459965477956039}
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 &6362041349314885727
GameObject:
m_ObjectHideFlags: 0
@ -48123,12 +48422,13 @@ RectTransform:
m_Children:
- {fileID: 1585159437907033727}
- {fileID: 7111445310199131159}
- {fileID: 6665710735538482627}
m_Father: {fileID: 9193158905020371500}
m_RootOrder: 3
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: 8, y: -812.3}
m_AnchoredPosition: {x: 8, y: -774.1}
m_SizeDelta: {x: 1092.1, y: 403.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2434477764692453100
@ -48371,8 +48671,8 @@ RectTransform:
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: 0, y: 5.750122}
m_SizeDelta: {x: 1023, y: 356}
m_AnchoredPosition: {x: -17.513, y: 5.750122}
m_SizeDelta: {x: 1046.5, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2258266246584829152
CanvasRenderer:
@ -54139,8 +54439,8 @@ RectTransform:
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: 0, y: 5.750122}
m_SizeDelta: {x: 1023, y: 356}
m_AnchoredPosition: {x: -14.625, y: 5.750122}
m_SizeDelta: {x: 1052.3, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &391777160202845864
CanvasRenderer:

View File

@ -583,10 +583,10 @@ RedPointType = {
RankingSort = 112, --排行榜
----副本相关------
ExploreMain = 114, --主界面副本探索
OrdinaryExplore = 115, --普通副本
HeroExplore = 116, --英雄副本
EpicExplore = 117, --试炼副本
LegendExplore = 118, --传说副本
OrdinaryExplore = 115, --大闹天宫副本
HeroExplore = 116, --日常副本
EpicExplore = 117, --心魔副本
LegendExplore = 118, --车迟斗法副本
-- 充值
Recharge = 120,

View File

@ -37,6 +37,8 @@ this.recommendFightAbility={}
--每日副本
this.dailyChallengeInfo={}
this.dailyCarbons={}
CARBON_TYPE = {
NORMAL = 1,
TRIAL = 2,
@ -65,8 +67,6 @@ function this.Initialize()
end)
end
-- 判断每日副本是否已经通过
function this.IsDailyCarbonPass(id)
if this.dailyChallengeInfo~=nil then
@ -79,8 +79,6 @@ function this.IsDailyCarbonPass(id)
return false
end
function this.UpdateEliteCarbonTicketData()
local dt = Time.fixedDeltaTime
this.remainTime = this.remainTime - dt
@ -108,6 +106,7 @@ function this.UpdateEliteCarbonTicketRequest(itemIdList)
end)
end
function this.RefreshEliteCarbonTicket(itemData)
if itemData and #itemData > 0 then
for i = 1, #itemData do
@ -805,12 +804,79 @@ end
-- 红点检测方法
function this.CarbonRedCheck(redType)
if redType == RedPointType.HeroExplore then
return this.CheckEliteCarbonRedpot()
--日常
if redType == RedPointType.HeroExplore then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
for k,v in pairs(this.GetDailyCarbons(0)) do
if v and v.state then
return true
end
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.OrdinaryExplore then
-- if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) then
-- else
-- return false
-- end
--车迟斗法
elseif redType == RedPointType.LegendExplore then
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.CARDELAY) and PlayerManager.familyId ~= 0
and (GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Challenge)
or GuildCarDelayManager.RefreshRedPoint(GuildCarDelayProType.Loot)) then
LogGreen("1111111111")
return true
else
LogGreen("22222222222")
return false
end
end
end
--日常副本红点数据
--1 金币副本 2 经验副本 3角色碎片副本 4 每日法宝副本 5每日魂印副本 0全部
function this.GetDailyCarbons(index)
if not this.dailyCarbons then
this.dailyCarbons={}
end
if index == 0 then
for i = 1, 4 do
this.GetCarBonState(i)
end
return this.dailyCarbons
else
this.GetCarBonState(index)
return this.dailyCarbons[index]
end
end
function this.GetCarBonState(index)
if not this.dailyCarbons[index] then
this.dailyCarbons[index] = {}
this.dailyCarbons[index].id = index + 66
end
local curData=ConfigManager.GetAllConfigsDataByKey(ConfigName.DailyChallengeConfig,"Type",index)
--local buyTimeId= curData[1].PrivilegeId[1]
local freeTimeId=curData[1].PrivilegeId[2]
--local storeData=ConfigManager.GetConfigDataByDoubleKey(ConfigName.StoreConfig,"StoreId",7,"Limit",buyTimeId)--商店表数据
--local buyTime= ShopManager.GetShopItemRemainBuyTimes(SHOP_TYPE.FUNCTION_SHOP,storeData.Id) --购买次数
local freeTime=PrivilegeManager.GetPrivilegeRemainValue(freeTimeId) --免费次数
if freeTime > 0 and ActTimeCtrlManager.SingleFuncState(this.dailyCarbons[index].id) then
this.dailyCarbons[index].state = true
else
this.dailyCarbons[index].state = false
end
end
--普通副本红点进入地图入口检测方法
function this.CarbonRedShow()
local isShow = false

View File

@ -20,7 +20,8 @@ local type = {
liveSize = Vector2(1024, 1145),
tipBg = "r_Dungeon_richangdian",
resetTime = string.format("<color=#7884B9>%s</color>",specialConfig[58].Value),
tip = string.format("<color=#7884B9>%s</color>",specialConfig[59].Value)
tip = string.format("<color=#7884B9>%s</color>",specialConfig[59].Value),
redPointType = RedPointType.HeroExplore
},
[2] = {
id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔
@ -31,7 +32,8 @@ local type = {
liveSize = Vector2(1024, 1145),
tipBg = "r_Dungeon_shijiandian",
resetTime = string.format("<color=#7EB2B6>%s</color>",specialConfig[60].Value),
tip = string.format("<color=#7EB2B6>%s</color>",specialConfig[61].Value)
tip = string.format("<color=#7EB2B6>%s</color>",specialConfig[61].Value),
redPointType = RedPointType.EpicExplore
},
[3] = {
id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
@ -42,7 +44,8 @@ local type = {
liveSize = Vector2(1024, 1145),
tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[62].Value),
tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[63].Value)
tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[63].Value),
redPointType = RedPointType.OrdinaryExplore
},
[4] = {
id = FUNCTION_OPEN_TYPE.CARDELAY, --车迟斗法
@ -53,7 +56,8 @@ local type = {
liveSize = Vector2(1024, 1145),
tipBg = "r_Dungeon_wujingdian",
resetTime = string.format("<color=#DB9A9A>%s</color>",specialConfig[64].Value),
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[65].Value)
tip = string.format("<color=#DB9A9A>%s</color>",specialConfig[65].Value),
redPointType = RedPointType.LegendExplore
},
default = {id = -1,bg = "r_Dungeon_rendi_01"}
},
@ -72,13 +76,15 @@ local type = {
liveSize = Vector2(1612, 1802),
tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#BA9AC2>%s</color>",specialConfig[66].Value),
tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[67].Value)
tip = string.format("<color=#BA9AC2>%s</color>",specialConfig[67].Value),
redPointType = -1
},
default = {id = -1,bg = "r_Dungeon_rendi_01"}
}
}
local carbonType = 0
local carbons = {}
--初始化组件(用于子类重写)
function CarbonTypePanelV2:InitComponent()
this.dailyCarbonBtn = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/DailyCarbonBtn")
@ -147,6 +153,17 @@ function CarbonTypePanelV2:BindEvent()
UIManager.OpenPanel(UIName.VipPanelV2)
end
)
for k,v in ipairs(carbons) do
local data
if not type[PlayerManager.carbonType][k] then
data = type[PlayerManager.carbonType].default
else
data = type[PlayerManager.carbonType][k]
end
if data.redPointType ~= -1 then
BindRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
end
end
end
--添加事件监听(用于子类重写)
@ -223,6 +240,7 @@ function this.UpdateCarbonContent()
else
data = type[carbonType][k]
end
Util.GetGameObject(v, "bg"):GetComponent("Image").sprite = Util.LoadSprite(data.bg)
if data.id == -1 then
Util.GetGameObject(v, "bg/carbon"):SetActive(false)
@ -251,6 +269,8 @@ function this.UpdateCarbonContent()
Util.AddOnceClick(v,function()
this.BtnClick(data.id)
end)
end
if data.id == -1 then
Util.SetGray(v,true)
@ -407,6 +427,7 @@ function CarbonTypePanelV2:OnClose()
end
this.isPlayDoorAudio = false
carbonType = 0
end
--界面销毁时调用(用于子类重写)
@ -417,6 +438,18 @@ function CarbonTypePanelV2:OnDestroy()
end
carbons = {}
this.playerHead=nil
for k,v in ipairs(carbons) do
local data
if not type[PlayerManager.carbonType][k] then
data = type[PlayerManager.carbonType].default
else
data = type[PlayerManager.carbonType][k]
end
if data.redPointType ~= -1 then
ClearRedPointObject(data.redPointType,Util.GetGameObject(v, "redPoint"))
end
end
end
return CarbonTypePanelV2

View File

@ -14,10 +14,15 @@ local carbonIndex=0--副本索引
--顶部背景图
local titleBg={
--金币
[1]={bg="r_richang_banner_5",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,658.37,0)},
--经验
[2]={bg="r_richang_banner_4",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)},
--神将
[3]={bg="r_richang_banner_3",titleTip = specialConfig[43].Value,pos = Vector3.New(257.08,658.37,0)},
--法宝
[4]={bg="r_richang_banner_2",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)},
--魂印
[5]={bg="r_richang_banner_1",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,651.24,0)},
}
--难度图片
@ -118,6 +123,13 @@ function DailyCarbonPanel:OnShow()
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
end
function DailyCarbonPanel:RefreshRedPotShow()
local tabs = Util.GetGameObject(this.tabBox,"box").transform
for i = 1,tabs.childCount do
Util.GetGameObject(tabs:GetChild(i-1),"Redpot").gameObject:SetActive(CarbonManager.GetDailyCarbons(i).state)
end
end
function DailyCarbonPanel:OnClose()
end
@ -130,6 +142,7 @@ end
function this.FiveRefresh()
this.RefreshShow(1)
DailyCarbonPanel:RefreshRedPotShow()
end
--刷新面板
@ -144,6 +157,7 @@ function this.RefreshShow(i)
this.titleTip.gameObject:GetComponent("RectTransform").localPosition =titleBg[i].pos
this.SetTimeTip()
this.SetScroll(i)
DailyCarbonPanel:RefreshRedPotShow()
end
--设置滚动条
@ -270,10 +284,12 @@ function this.SetData(root, data, ldata)
end
NetManager.DailyChallengeRequest(data.Id,type,function(msg)
local fightData = BattleManager.GetBattleServerData(msg)
CheckRedPointStatus(RedPointType.HeroExplore)
CheckRedPointStatus(RedPointType.EpicExplore)
CheckRedPointStatus(RedPointType.OrdinaryExplore)
if type==1 then --挑战
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.DAILY_CHALLENGE , function(result)
if result.result ==0 then
elseif result.result==1 then
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()
PrivilegeManager.RefreshPrivilegeUsedTimes(data.PrivilegeId[2],1)

View File

@ -26,9 +26,12 @@ function this.OnLevelChange()
end
--
function this.OnFunctionOpen(funcId)
LogGreen(funcId.."funcId")
if not AppConst.isGuide then
LogGreen("不在引导内")
return
end
LogGreen(tostring(AppConst.isGuide))
local guideId = GlobalSystemConfig[funcId].GuideId
if guideId and guideId ~= 0 then
table.insert(_FuncGuideList, guideId)

View File

@ -125,6 +125,8 @@ function this.ExecuteBehavior(beType, beArgs)
end
_trigger.onPointerUp = _trigger.onPointerUp + endFunc
elseif beType == 2 then --点击界面按钮
LogGreen(beArgs)
LogGreen(UIManager.uiNode.gameObject.name)
local btn = Util.GetGameObject(UIManager.uiNode, beArgs):GetComponent("Button")
this.button:GetComponent("Button").onClick:RemoveAllListeners()
Util.AddClick(this.button, function()

View File

@ -114,7 +114,6 @@ function this.RefreshRedPoint(progress)
return false
end
end
end
function this.SetCarPlayTimeData(time)
if this.progress == GuildCarDelayProType.Challenge then

View File

@ -133,15 +133,15 @@ function this.InitRedPointAllRelate()
-- 外敌
RPData:SetParent(RedPointType.SecretTer_Boss, RedPointType.Alien)
RPData:SetParent(RedPointType.SecretTer_CallAlianInvasionTime, RedPointType.Alien)
--剧情副本
RPData:SetParent(RedPointType.NormalExplore_OpenMap, RedPointType.OrdinaryExplore)
RPData:SetParent(RedPointType.NormalExplore_GetStarReward, RedPointType.OrdinaryExplore)
--试炼副本
RPData:SetParent(RedPointType.EpicExplore_OpenCarbon, RedPointType.EpicExplore)
RPData:SetParent(RedPointType.EpicExplore_GetReward, RedPointType.EpicExplore)
--精英副本
RPData:SetParent(RedPointType.HeroExplore_OpenMap, RedPointType.HeroExplore)
RPData:SetParent(RedPointType.HeroExplore_Feats, RedPointType.HeroExplore)
-- --剧情副本
-- RPData:SetParent(RedPointType.NormalExplore_OpenMap, RedPointType.OrdinaryExplore)
-- RPData:SetParent(RedPointType.NormalExplore_GetStarReward, RedPointType.OrdinaryExplore)
-- --试炼副本
-- RPData:SetParent(RedPointType.EpicExplore_OpenCarbon, RedPointType.EpicExplore)
-- RPData:SetParent(RedPointType.EpicExplore_GetReward, RedPointType.EpicExplore)
-- --精英副本
-- RPData:SetParent(RedPointType.HeroExplore_OpenMap, RedPointType.HeroExplore)
-- RPData:SetParent(RedPointType.HeroExplore_Feats, RedPointType.HeroExplore)
--秘盒红点
RPData:SetParent(RedPointType.SecretBox_Red1, RedPointType.SecretBox)
--角色招募红点
@ -270,15 +270,15 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.SecretTer_IsCanFight, FightPointPassManager.IsShowFightRP)
-- 外敌
RPData:AddCheckFunc(RedPointType.SecretTer_CallAlianInvasionTime, AdventureManager.HaveCallAlianInvasionTime,FUNCTION_OPEN_TYPE.FIGHT_ALIEN)
--普通副本
RPData:AddCheckFunc(RedPointType.NormalExplore_OpenMap, CarbonManager.CarbonRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
RPData:AddCheckFunc(RedPointType.NormalExplore_GetStarReward, CarbonManager.CarbonGetRewardRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
--试炼副本
RPData:AddCheckFunc(RedPointType.EpicExplore_OpenCarbon, CarbonManager.CarbonTrialOpen,FUNCTION_OPEN_TYPE.NORMALCARBON)
RPData:AddCheckFunc(RedPointType.EpicExplore_GetReward, CarbonManager.CheckTrialRedPoint,FUNCTION_OPEN_TYPE.NORMALCARBON)
--精英本
RPData:AddCheckFunc(RedPointType.HeroExplore_OpenMap, CarbonManager.CarbonHeroRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
RPData:AddCheckFunc(RedPointType.HeroExplore_Feats, CarbonManager.CheckHeroRedPoint,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- --普通副本
-- RPData:AddCheckFunc(RedPointType.NormalExplore_OpenMap, CarbonManager.CarbonRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- RPData:AddCheckFunc(RedPointType.NormalExplore_GetStarReward, CarbonManager.CarbonGetRewardRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- --试炼副本
-- RPData:AddCheckFunc(RedPointType.EpicExplore_OpenCarbon, CarbonManager.CarbonTrialOpen,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- RPData:AddCheckFunc(RedPointType.EpicExplore_GetReward, CarbonManager.CheckTrialRedPoint,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- --精英本
-- RPData:AddCheckFunc(RedPointType.HeroExplore_OpenMap, CarbonManager.CarbonHeroRedShow,FUNCTION_OPEN_TYPE.NORMALCARBON)
-- RPData:AddCheckFunc(RedPointType.HeroExplore_Feats, CarbonManager.CheckHeroRedPoint,FUNCTION_OPEN_TYPE.NORMALCARBON)
--秘盒红点
RPData:AddCheckFunc(RedPointType.SecretBox_Red1, SecretBoxManager.CheckSecretRedPoint,FUNCTION_OPEN_TYPE.SECRETBOX)
--角色招募红点
@ -361,6 +361,10 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION)
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)
RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING)
RPData:AddCheckFunc(RedPointType.LegendExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.CARDELAY)
end