[功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能
parent
bbbf5598d6
commit
ebde6e43b0
|
|
@ -44806,6 +44806,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 9158673223480268760}
|
- {fileID: 9158673223480268760}
|
||||||
- {fileID: 3958316192645827337}
|
- {fileID: 3958316192645827337}
|
||||||
|
- {fileID: 6379532960330795117}
|
||||||
m_Father: {fileID: 986452627335843391}
|
m_Father: {fileID: 986452627335843391}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
|
@ -70723,6 +70724,123 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &6901911044717125155
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6379532960330795117}
|
||||||
|
- component: {fileID: 5090937801259970180}
|
||||||
|
- component: {fileID: 908337413429037902}
|
||||||
|
- component: {fileID: 7804761533185754883}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: sixStarHero
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6379532960330795117
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6901911044717125155}
|
||||||
|
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: 1470640894515440942}
|
||||||
|
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: -75.10001, y: -304.1}
|
||||||
|
m_SizeDelta: {x: 132, y: 122}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5090937801259970180
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6901911044717125155}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &908337413429037902
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6901911044717125155}
|
||||||
|
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: 1144aac02180acd459ccb1acdd344c02, 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!114 &7804761533185754883
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6901911044717125155}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Navigation:
|
||||||
|
m_Mode: 3
|
||||||
|
m_SelectOnUp: {fileID: 0}
|
||||||
|
m_SelectOnDown: {fileID: 0}
|
||||||
|
m_SelectOnLeft: {fileID: 0}
|
||||||
|
m_SelectOnRight: {fileID: 0}
|
||||||
|
m_Transition: 1
|
||||||
|
m_Colors:
|
||||||
|
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||||
|
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||||
|
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||||
|
m_ColorMultiplier: 1
|
||||||
|
m_FadeDuration: 0.1
|
||||||
|
m_SpriteState:
|
||||||
|
m_HighlightedSprite: {fileID: 0}
|
||||||
|
m_PressedSprite: {fileID: 0}
|
||||||
|
m_DisabledSprite: {fileID: 0}
|
||||||
|
m_AnimationTriggers:
|
||||||
|
m_NormalTrigger: Normal
|
||||||
|
m_HighlightedTrigger: Highlighted
|
||||||
|
m_PressedTrigger: Pressed
|
||||||
|
m_DisabledTrigger: Disabled
|
||||||
|
m_Interactable: 1
|
||||||
|
m_TargetGraphic: {fileID: 908337413429037902}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
--- !u!1 &7020458089550377753
|
--- !u!1 &7020458089550377753
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,8 @@ GameEvent = {
|
||||||
OnHeadChange = "Player.OnHeadChange",
|
OnHeadChange = "Player.OnHeadChange",
|
||||||
--打关卡升级小提示
|
--打关卡升级小提示
|
||||||
OnShowBattleUpLvTip = "Player.OnShowBattleUpLvTip",
|
OnShowBattleUpLvTip = "Player.OnShowBattleUpLvTip",
|
||||||
|
--玩家获取玉皇大帝奖励
|
||||||
|
OnPlayerGetSuperManReward ="Player.OnPlayerGetSuperManReward",
|
||||||
},
|
},
|
||||||
Treasure={
|
Treasure={
|
||||||
--宝物强化/精炼提升
|
--宝物强化/精炼提升
|
||||||
|
|
|
||||||
|
|
@ -115,6 +115,9 @@ function this:InitComponent()
|
||||||
this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng")
|
this.btnHongMeng=Util.GetGameObject(self.gameObject,"RightDown/btnHongMeng")
|
||||||
this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint")
|
this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng,"redPoint")
|
||||||
|
|
||||||
|
--六星前往
|
||||||
|
this.btnSixStarGo=Util.GetGameObject(self.gameObject,"LeftUp/sixStarHero")
|
||||||
|
|
||||||
-------------------场景中的按钮------------------------
|
-------------------场景中的按钮------------------------
|
||||||
-- 按钮
|
-- 按钮
|
||||||
this.btnMonster = Util.GetGameObject(this.gameObject, "scene/layer2/btnShouchaolaixi")
|
this.btnMonster = Util.GetGameObject(this.gameObject, "scene/layer2/btnShouchaolaixi")
|
||||||
|
|
@ -324,6 +327,12 @@ function this:BindEvent()
|
||||||
Util.AddClick(this.fgBtn,function()
|
Util.AddClick(this.fgBtn,function()
|
||||||
UIManager.OpenPanel(UIName.FifteenDayGiftPanel)
|
UIManager.OpenPanel(UIName.FifteenDayGiftPanel)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
--六星前往
|
||||||
|
Util.AddClick(this.btnSixStarGo,function()
|
||||||
|
JumpManager.GoJump(36011)
|
||||||
|
end)
|
||||||
|
|
||||||
--日常任务
|
--日常任务
|
||||||
Util.AddClick(this.btnDailyMission, function()
|
Util.AddClick(this.btnDailyMission, function()
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel)
|
UIManager.OpenPanel(UIName.MissionDailyPanel)
|
||||||
|
|
@ -599,6 +608,7 @@ function this:AddListener()
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview)
|
Game.GlobalEvent:AddEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
|
Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
||||||
|
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward)
|
||||||
end
|
end
|
||||||
|
|
||||||
--移除事件监听(用于子类重写)
|
--移除事件监听(用于子类重写)
|
||||||
|
|
@ -613,7 +623,11 @@ function this:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
|
Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview)
|
Game.GlobalEvent:RemoveEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
|
Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward)
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.GetSuperManReward()
|
||||||
|
this.CheckSixStarGoShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnSortingOrderChange()
|
function this:OnSortingOrderChange()
|
||||||
|
|
@ -641,6 +655,16 @@ function this:OnOpen()
|
||||||
this.CreatActivity()
|
this.CreatActivity()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
--检测六星前往活动是否显示
|
||||||
|
function this.CheckSixStarGoShow()
|
||||||
|
local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0)
|
||||||
|
if time and time~=0 and time~=666 and GetTimeStamp()-time< 259200 then
|
||||||
|
this.btnSixStarGo:SetActive(true)
|
||||||
|
else
|
||||||
|
this.btnSixStarGo:SetActive(false)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function this.CreatActivity()
|
function this.CreatActivity()
|
||||||
for k,v in ipairs(activitys) do
|
for k,v in ipairs(activitys) do
|
||||||
if not activityTabs[k] then
|
if not activityTabs[k] then
|
||||||
|
|
@ -773,7 +797,8 @@ function this:OnShow()
|
||||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||||
--刷新主城npc
|
--刷新主城npc
|
||||||
this:OnChangeTitleOrRideOrSkin()
|
this:OnChangeTitleOrRideOrSkin()
|
||||||
|
--检测主城六星入口是否显示
|
||||||
|
this.CheckSixStarGoShow()
|
||||||
Log(string.format("---------------------%s", BagManager.GetItemCountById(14)))
|
Log(string.format("---------------------%s", BagManager.GetItemCountById(14)))
|
||||||
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
|
this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main })
|
||||||
this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.MainCity })
|
this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.MainCity })
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,11 @@ function SupremeHeroPopup:BindEvent()
|
||||||
Util.SetGray(this.doneBtn, true)
|
Util.SetGray(this.doneBtn, true)
|
||||||
this.doneBtn:GetComponent("Button").enabled = false
|
this.doneBtn:GetComponent("Button").enabled = false
|
||||||
this.btnText.text = Language[10101]
|
this.btnText.text = Language[10101]
|
||||||
|
local time=PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",0)
|
||||||
|
if time~=666 then
|
||||||
|
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",GetTimeStamp())
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Player.OnPlayerGetSuperManReward)
|
||||||
|
end
|
||||||
CheckRedPointStatus(RedPointType.SupremeHero)
|
CheckRedPointStatus(RedPointType.SupremeHero)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -131,6 +131,9 @@ function GiftPre:BuyAction(costId, costNum, shopType, itemId)
|
||||||
self.parent:RefreshData(nil,false,false)
|
self.parent:RefreshData(nil,false,false)
|
||||||
CheckRedPointStatus(RedPointType.DailyGift)
|
CheckRedPointStatus(RedPointType.DailyGift)
|
||||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||||
|
if shopType==20 and itemId==1107 then
|
||||||
|
PlayerPrefs.SetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."supermeMan",666)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. shopType)
|
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. shopType)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue