parent
18803bfc29
commit
096845f8ad
|
@ -1759,7 +1759,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 0.9997861, y: 0.9997861, z: 0.9997861}
|
m_LocalScale: {x: 0.9997861, y: 0.9997861, z: 0.9997861}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 3458295202399734364}
|
m_Father: {fileID: 3458295202399734364}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 5
|
||||||
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, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
|
@ -1899,6 +1899,7 @@ RectTransform:
|
||||||
- {fileID: 1495637354504284252}
|
- {fileID: 1495637354504284252}
|
||||||
- {fileID: 4730423253664528141}
|
- {fileID: 4730423253664528141}
|
||||||
- {fileID: 4730423252881435849}
|
- {fileID: 4730423252881435849}
|
||||||
|
- {fileID: 8956641993081459436}
|
||||||
- {fileID: 3457989415352141852}
|
- {fileID: 3457989415352141852}
|
||||||
- {fileID: 2297395697377060500}
|
- {fileID: 2297395697377060500}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
|
@ -8913,6 +8914,144 @@ MonoBehaviour:
|
||||||
m_FillClockwise: 1
|
m_FillClockwise: 1
|
||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
|
--- !u!1 &6387261094607856098
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8956641993081459436}
|
||||||
|
- component: {fileID: 6908792808637426587}
|
||||||
|
- component: {fileID: 67559935378057639}
|
||||||
|
- component: {fileID: 8890431601337974260}
|
||||||
|
- component: {fileID: 529203493654931611}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: activityEnterBtn
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &8956641993081459436
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387261094607856098}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.99978596, y: 0.99978596, z: 0.99978596}
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 6370401770125018510}
|
||||||
|
m_Father: {fileID: 3458295202399734364}
|
||||||
|
m_RootOrder: 4
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
m_AnchoredPosition: {x: 77.00006, y: -316.99994}
|
||||||
|
m_SizeDelta: {x: 126, y: 126}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &6908792808637426587
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387261094607856098}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &67559935378057639
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387261094607856098}
|
||||||
|
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: 99f849d3a4e72f3408cb590b2fe4c646, 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 &8890431601337974260
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387261094607856098}
|
||||||
|
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: 3
|
||||||
|
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: 67559935378057639}
|
||||||
|
m_OnClick:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!95 &529203493654931611
|
||||||
|
Animator:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 6387261094607856098}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Avatar: {fileID: 0}
|
||||||
|
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
|
||||||
|
m_CullingMode: 0
|
||||||
|
m_UpdateMode: 0
|
||||||
|
m_ApplyRootMotion: 0
|
||||||
|
m_LinearVelocityBlending: 0
|
||||||
|
m_WarningMessage:
|
||||||
|
m_HasTransformHierarchy: 1
|
||||||
|
m_AllowConstantClipSamplingOptimization: 1
|
||||||
|
m_KeepAnimatorControllerStateOnDisable: 0
|
||||||
--- !u!1 &6512739083059488983
|
--- !u!1 &6512739083059488983
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -9403,6 +9542,85 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||||
Culture=neutral, PublicKeyToken=null
|
Culture=neutral, PublicKeyToken=null
|
||||||
|
--- !u!1 &7010381375874422840
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6370401770125018510}
|
||||||
|
- component: {fileID: 5232027529839106338}
|
||||||
|
- component: {fileID: 7237493243014808631}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: time
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &6370401770125018510
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7010381375874422840}
|
||||||
|
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: 8956641993081459436}
|
||||||
|
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: 0, y: -80.3}
|
||||||
|
m_SizeDelta: {x: 126, y: 30}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!222 &5232027529839106338
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7010381375874422840}
|
||||||
|
m_CullTransparentMesh: 0
|
||||||
|
--- !u!114 &7237493243014808631
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7010381375874422840}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||||
|
m_RaycastTarget: 0
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
|
m_FontData:
|
||||||
|
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_FontSize: 25
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_BestFit: 0
|
||||||
|
m_MinSize: 2
|
||||||
|
m_MaxSize: 40
|
||||||
|
m_Alignment: 3
|
||||||
|
m_AlignByGeometry: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_HorizontalOverflow: 1
|
||||||
|
m_VerticalOverflow: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Text:
|
||||||
--- !u!1 &7438064865311219869
|
--- !u!1 &7438064865311219869
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -9656,7 +9874,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 3458295202399734364}
|
m_Father: {fileID: 3458295202399734364}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 6
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
|
|
|
@ -47,11 +47,16 @@ function FightLevelSingleChapterPanel:InitComponent()
|
||||||
this.pointParent = Util.GetGameObject(self.gameObject, "middle/pointParent")
|
this.pointParent = Util.GetGameObject(self.gameObject, "middle/pointParent")
|
||||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
|
||||||
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
this.mask = Util.GetGameObject(self.gameObject, "mask")
|
||||||
|
|
||||||
|
this.activityEnterBtn = Util.GetGameObject(self.gameObject, "activityEnterBtn")
|
||||||
|
this.activityEnterBtnTime = Util.GetGameObject(this.activityEnterBtn, "time"):GetComponent("Text")
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function FightLevelSingleChapterPanel:BindEvent()
|
function FightLevelSingleChapterPanel:BindEvent()
|
||||||
|
Util.AddClick(self.activityEnterBtn, function()
|
||||||
|
JumpManager.GoJump(26002)
|
||||||
|
end)
|
||||||
Util.AddClick(self.btnBack, function()
|
Util.AddClick(self.btnBack, function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
@ -88,8 +93,42 @@ function FightLevelSingleChapterPanel:OnShow()
|
||||||
this.OnShowPanel()
|
this.OnShowPanel()
|
||||||
this.LeftOrRightBtnClickEvent()
|
this.LeftOrRightBtnClickEvent()
|
||||||
this.rewardMaskBtn:SetActive(false)
|
this.rewardMaskBtn:SetActive(false)
|
||||||
|
this.showActivityBtn()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.showActivityBtn()
|
||||||
|
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.ShanHeShiLian) then
|
||||||
|
this.activityEnterBtn.gameObject:SetActive(true)
|
||||||
|
else
|
||||||
|
this.activityEnterBtn.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
|
this.activityBtnTimeShow()
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.activityBtnTimeShow()
|
||||||
|
if this.activityBtnTime then
|
||||||
|
this.activityBtnTime:Stop()
|
||||||
|
this.activityBtnTime = nil
|
||||||
|
end
|
||||||
|
local remainTime = ActivityGiftManager.GetTaskRemainTime(ActivityTypeDef.ShanHeShiLian)
|
||||||
|
local s = function()
|
||||||
|
this.activityEnterBtnTime.text = TimeToFelaxible(remainTime)
|
||||||
|
remainTime = remainTime - 1
|
||||||
|
if remainTime <= 0 then
|
||||||
|
this.activityEnterBtn.gameObject:SetActive(false)
|
||||||
|
if this.activityBtnTime then
|
||||||
|
this.activityBtnTime:Stop()
|
||||||
|
this.activityBtnTime = nil
|
||||||
|
end
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
s()
|
||||||
|
this.activityBtnTime = Timer.New(s, 1)
|
||||||
|
this.activityBtnTime:Start()
|
||||||
|
end
|
||||||
|
|
||||||
function this.OnShowPanel()
|
function this.OnShowPanel()
|
||||||
|
|
||||||
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
SoundManager.PlayMusic(SoundConfig.BGM_Main)
|
||||||
|
@ -422,6 +461,10 @@ function this.FindBoxRewardInfo(missionConfigData)
|
||||||
end
|
end
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function FightLevelSingleChapterPanel:OnClose()
|
function FightLevelSingleChapterPanel:OnClose()
|
||||||
|
if this.activityBtnTime then
|
||||||
|
this.activityBtnTime:Stop()
|
||||||
|
this.activityBtnTime = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
|
|
|
@ -270,7 +270,6 @@ function this.CheckNextGuideListen(nextId)
|
||||||
if type == GuideType.Force and openDic[type] then
|
if type == GuideType.Force and openDic[type] then
|
||||||
openDic[type] = nextId
|
openDic[type] = nextId
|
||||||
end
|
end
|
||||||
LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) )
|
|
||||||
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
|
this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -626,6 +626,13 @@ function this.NextGuide(nextId)
|
||||||
GuideManager.ShowGuide(next)
|
GuideManager.ShowGuide(next)
|
||||||
elseif next ~= 0 and GuideConfig[next].OpenType == 27 then
|
elseif next ~= 0 and GuideConfig[next].OpenType == 27 then
|
||||||
GuideManager.ShowGuide(next)
|
GuideManager.ShowGuide(next)
|
||||||
|
elseif next ~= 0 and GuideConfig[next].OpenType == 39 then
|
||||||
|
if ActivityGiftManager.IsActivityTypeOpen(GuideConfig[next].OpenArgs[1]) then
|
||||||
|
GuideManager.ShowGuide(next)
|
||||||
|
else
|
||||||
|
this.NextGuide(GuideConfig[next].Next)
|
||||||
|
end
|
||||||
|
|
||||||
elseif next == 0 and GuideConfig[curId].BehaviorType == 14 then -- 分支节点特殊处理
|
elseif next == 0 and GuideConfig[curId].BehaviorType == 14 then -- 分支节点特殊处理
|
||||||
this.ExecuteBehavior(GuideConfig[curId].BehaviorType, GuideConfig[curId].BehaviorArgs)
|
this.ExecuteBehavior(GuideConfig[curId].BehaviorType, GuideConfig[curId].BehaviorArgs)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue