【御剑行】点击商店返回后增加请求
parent
abbcc52f01
commit
1215e46af8
|
@ -24061,10 +24061,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 4982919456788885506}
|
m_Father: {fileID: 4982919456788885506}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 900, y: 700}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &6232789332412041360
|
--- !u!222 &6232789332412041360
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -36610,6 +36610,7 @@ GameObject:
|
||||||
- component: {fileID: 6057694991830095399}
|
- component: {fileID: 6057694991830095399}
|
||||||
- component: {fileID: 5371694410511502372}
|
- component: {fileID: 5371694410511502372}
|
||||||
- component: {fileID: 6772549543214168581}
|
- component: {fileID: 6772549543214168581}
|
||||||
|
- component: {fileID: 7356467663172722418}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Mask
|
m_Name: Mask
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
@ -36673,6 +36674,48 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!114 &7356467663172722418
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7211960488100845142}
|
||||||
|
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: 0
|
||||||
|
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: 6772549543214168581}
|
||||||
|
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 &7230858770583146748
|
--- !u!1 &7230858770583146748
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
@ -118,6 +118,10 @@ function GeneralPopup:BindEvent()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
Util.AddClick(this.Mask,function()
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
|
||||||
|
self:ClosePanel()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function GeneralPopup:AddListener()
|
function GeneralPopup:AddListener()
|
||||||
|
|
|
@ -104,21 +104,26 @@ end
|
||||||
|
|
||||||
-- 打开,重新打开时回调
|
-- 打开,重新打开时回调
|
||||||
function YuJianXingPanel:OnShow()
|
function YuJianXingPanel:OnShow()
|
||||||
self:MakeRequest()
|
|
||||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.YuJianXing })
|
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.YuJianXing })
|
||||||
|
self:MakeRequest(function ()
|
||||||
if YuJianXingManager.curState == 2 then
|
if YuJianXingManager.curState == 2 then
|
||||||
YuJianXingManager.InWaiting = true
|
YuJianXingManager.InWaiting = true
|
||||||
end
|
end
|
||||||
--开启地图
|
--开启地图
|
||||||
YuJianXingManager.OpenMap()
|
YuJianXingManager.OpenMap()
|
||||||
self:Refresh()
|
self:Refresh()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function YuJianXingPanel:MakeRequest()
|
function YuJianXingPanel:MakeRequest(func)
|
||||||
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)
|
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)
|
||||||
if id then
|
if id then
|
||||||
NetManager.RidingSwardActivityRequest(id)
|
NetManager.RidingSwardActivityRequest(id,function ()
|
||||||
|
if func then
|
||||||
|
func()
|
||||||
|
end
|
||||||
NetManager.RidingSwardInfoRequest()
|
NetManager.RidingSwardInfoRequest()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -186,6 +191,7 @@ function YuJianXingPanel:SetTime()
|
||||||
self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount)
|
self.canBetTime.text = string.format( "今日可竞猜次数:%s次",configData.JoinCount - YuJianXingManager.joinCount)
|
||||||
self.redPoint:SetActive(YuJianXingManager.CheckRecordList())
|
self.redPoint:SetActive(YuJianXingManager.CheckRecordList())
|
||||||
self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2))
|
self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2))
|
||||||
|
self.waitTime.text = string.format("倒计时:%s",TimeToMS(roundEnd))
|
||||||
self.timer = Timer.New(function ()
|
self.timer = Timer.New(function ()
|
||||||
self.redPoint:SetActive(YuJianXingManager.CheckRecordList())
|
self.redPoint:SetActive(YuJianXingManager.CheckRecordList())
|
||||||
self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2))
|
self.redPointBet:SetActive((configData.JoinCount - YuJianXingManager.joinCount > 0) and (#YuJianXingManager.curBetList < 2))
|
||||||
|
|
Loading…
Reference in New Issue