Merge branch 'master_develop' into 0活动开发聚集地/社稷大典

# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
ZhangBiao 2020-10-14 14:39:04 +08:00
commit 74b9f4ec3a
3 changed files with 27 additions and 168 deletions

View File

@ -3894,9 +3894,7 @@ RectTransform:
m_Children:
- {fileID: 4403385418803474761}
- {fileID: 6731589704943924282}
- {fileID: 1745033544839090825}
- {fileID: 5368326415734529191}
- {fileID: 101555534899689678}
- {fileID: 2583667563870890104}
- {fileID: 1338579734977636462}
- {fileID: 9081327288207073813}
@ -11440,7 +11438,7 @@ MonoBehaviour:
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 0}
m_TargetGraphic: {fileID: 2567406817090281184}
m_OnClick:
m_PersistentCalls:
m_Calls: []
@ -18216,80 +18214,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &3332872264682885271
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 101555534899689678}
- component: {fileID: 2679053936202693894}
- component: {fileID: 2177265147952338397}
m_Layer: 5
m_Name: bg4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &101555534899689678
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3332872264682885271}
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: 8609906984241842863}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -326}
m_SizeDelta: {x: 1080, y: 472}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2679053936202693894
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3332872264682885271}
m_CullTransparentMesh: 0
--- !u!114 &2177265147952338397
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3332872264682885271}
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: 82cc2dfe504171547b5de78f44d58b4f, 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 &3334415941567938722
GameObject:
m_ObjectHideFlags: 0
@ -18474,7 +18398,7 @@ RectTransform:
m_Children:
- {fileID: 5655445736015705706}
m_Father: {fileID: 8609906984241842863}
m_RootOrder: 7
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -22092,7 +22016,7 @@ RectTransform:
- {fileID: 1008042109767524304}
- {fileID: 2991313753996687485}
m_Father: {fileID: 8609906984241842863}
m_RootOrder: 5
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}
@ -24419,7 +24343,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8609906984241842863}
m_RootOrder: 6
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -40744,80 +40668,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7349689413499475589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1745033544839090825}
- component: {fileID: 7969938412878211690}
- component: {fileID: 2962762175934633264}
m_Layer: 5
m_Name: bg2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1745033544839090825
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7349689413499475589}
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: 8609906984241842863}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: -326}
m_SizeDelta: {x: 1080, y: 472}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7969938412878211690
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7349689413499475589}
m_CullTransparentMesh: 0
--- !u!114 &2962762175934633264
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7349689413499475589}
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: 9666adb572f143e48be284b69c0687dc, 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 &7354129825011358380
GameObject:
m_ObjectHideFlags: 0
@ -47065,7 +46915,7 @@ GameObject:
- component: {fileID: 7502821551383412411}
- component: {fileID: 5481634388362036911}
m_Layer: 5
m_Name: bg3
m_Name: bg2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -47084,7 +46934,7 @@ RectTransform:
m_Children:
- {fileID: 8037277592639676956}
m_Father: {fileID: 8609906984241842863}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@ -50092,6 +49942,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 4364234898477055512}
m_Modifications:
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_Name
value: Effect_UI_changjing_qiankuanbaoguo
objectReference: {fileID: 0}
- target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_LocalPosition.x
@ -50147,11 +50002,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19,
type: 3}
propertyPath: m_Name
value: Effect_UI_changjing_qiankuanbaoguo
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3}
--- !u!4 &5379899409067946649 stripped

View File

@ -98,6 +98,9 @@ function this:RemoveListener()
end
function this:OnOpen()
if not this.UpView then
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
end
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
end
@ -243,6 +246,7 @@ function this:OnClose()
self.gameObject:SetActive(false)
PlayerManager.carbonType = 2
SubUIManager.Close(this.UpView)
this.UpView = nil
end
--界面销毁时调用(用于子类重写)
@ -252,6 +256,7 @@ function this:OnDestroy()
self.timer = nil
end
SubUIManager.Close(this.UpView)
this.UpView = nil
end
--刷新时间

View File

@ -6,11 +6,11 @@ local this=DynamicTaskPage
local parent
local endtime = 0
local bannerType = {
[1] = "bg1",
[2] = "bg2",
[3] = "bg3",
[4] = "bg4",
[5] = "bg5",
[1] = {compent = "bg1",titilebg1 = "p_pozhengzhuxian_tu"},
[2] = {compent = "bg1",titilebg1 = "c_ydsj_banner"},
[3] = {compent = "bg2",titilebg1 = "c_ccfy_banner",titilebg2 = "c_ccfy_beijin-slogan"},
[4] = {compent = "bg1",titilebg1 = "d_danxinbixue_banner"},
[5] = {compent = "bg1",titilebg1 = "s_shibukedang_banner"},
}
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
function DynamicTaskPage:ctor(mainPanel, gameObject)
@ -58,9 +58,13 @@ function DynamicTaskPage:OnShow(_sortingOrder,_parent)
local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)
local curindex = GlobalActConfig[id].ShowArt
for k,v in pairs(bannerType) do
Util.GetGameObject(this.gameObject, v):SetActive(false)
Util.GetGameObject(this.gameObject, v.compent):SetActive(false)
end
Util.GetGameObject(this.gameObject, bannerType[curindex].compent):SetActive(true)
Util.GetGameObject(this.gameObject, bannerType[curindex].compent):GetComponent("Image").sprite = Util.LoadSprite(bannerType[curindex].titilebg1)
if bannerType[curindex].titilebg2 and bannerType[curindex].titilebg2 ~= "" then
Util.GetGameObject(this.gameObject, bannerType[curindex].compent.."/Image"):GetComponent("Image").sprite = Util.LoadSprite(bannerType[curindex].titilebg2)
end
Util.GetGameObject(this.gameObject, bannerType[curindex]):SetActive(true)
sortingOrder = _sortingOrder
parent = _parent
this.Refresh()