From c1f0e0f78b9bc8474d302e9ef7d308c41a028c95 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 16 Dec 2021 18:38:32 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ZhiZhunJiangShiAtlas/xuanzhongkuang.png | Bin 0 -> 8022 bytes .../xuanzhongkuang.png.meta | 110 ++++++++++++++++++ .../UI/Popup/SupremeHeroPopupNew.prefab | 81 ++++++++++++- .../Modules/Popup/SupremeHeroPopupNew.lua | 27 ++++- 4 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/ZhiZhunJiangShiAtlas/xuanzhongkuang.png create mode 100644 Assets/ManagedResources/Atlas/ZhiZhunJiangShiAtlas/xuanzhongkuang.png.meta diff --git a/Assets/ManagedResources/Atlas/ZhiZhunJiangShiAtlas/xuanzhongkuang.png b/Assets/ManagedResources/Atlas/ZhiZhunJiangShiAtlas/xuanzhongkuang.png new file mode 100644 index 0000000000000000000000000000000000000000..b1414ad384a021bc873da5db296ac4379357cc65 GIT binary patch literal 8022 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 Date: Thu, 16 Dec 2021 18:41:30 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B6=85=E5=80=BC=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContinuePackage/PremiumRebatePanel.prefab | 1592 ++++++----------- .../~Lua/Common/GlobalDefine.lua | 2 + .../ContinuePackage/PremiumRebatePanel.lua | 280 +-- .../DynamicActivityManager.lua | 2 +- 4 files changed, 624 insertions(+), 1252 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index 45aff9e4be..cd1c7fb849 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -74,7 +74,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &608089786736187837 +--- !u!1 &668515550640612316 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -82,136 +82,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7465221042871974731} - - component: {fileID: 30253706966678147} + - component: {fileID: 327719872794192258} + - component: {fileID: 6888631392110526536} + - component: {fileID: 4855938979208445017} m_Layer: 0 - m_Name: btns + m_Name: box m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7465221042871974731 +--- !u!224 &327719872794192258 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 608089786736187837} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 668515550640612316} + 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: - - {fileID: 5324930657412983010} - - {fileID: 8713914388343685038} - - {fileID: 2021593734682218} - - {fileID: 3909224449922192452} - m_Father: {fileID: 2750471745573935426} - m_RootOrder: 3 + m_Children: [] + m_Father: {fileID: 5560347858770598648} + 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: -420, y: 33} - m_SizeDelta: {x: 100, y: 657.3} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &30253706966678147 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -34.4} + m_SizeDelta: {x: 82, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &6888631392110526536 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 608089786736187837} + m_GameObject: {fileID: 668515550640612316} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &4855938979208445017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 668515550640612316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 80 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 1 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 82, y: 186} - m_Spacing: {x: 0, y: 0} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!1 &897851489569006964 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2297690547128844912} - - component: {fileID: 2543937715046013831} - - component: {fileID: 1956498916347039920} - m_Layer: 0 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2297690547128844912 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 897851489569006964} - 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: 2021593734682218} - 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: 0, y: 0} - m_SizeDelta: {x: 36, y: 126} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2543937715046013831 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 897851489569006964} - m_CullTransparentMesh: 0 ---- !u!114 &1956498916347039920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 897851489569006964} - 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: ace0de574bfca6d4a9b75e0bf19215bc, 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 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &1391152455146847042 GameObject: m_ObjectHideFlags: 0 @@ -271,7 +207,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -317,12 +253,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4957794194947264391} - m_RootOrder: 3 + 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: -97.6, y: 0} - m_SizeDelta: {x: 515.2, y: 150} + m_AnchoredPosition: {x: -89.1, y: -22.8} + m_SizeDelta: {x: 498.3, y: 104.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7213273430475869332 MonoBehaviour: @@ -385,80 +321,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1512199806695051365 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1205788881077325512} - - component: {fileID: 4430609581539682818} - - component: {fileID: 7565004225020429339} - m_Layer: 0 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1205788881077325512 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1512199806695051365} - 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: 3909224449922192452} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 41, y: 1.4500122} - m_SizeDelta: {x: 4, y: 22} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4430609581539682818 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1512199806695051365} - m_CullTransparentMesh: 0 ---- !u!114 &7565004225020429339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1512199806695051365} - 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: 86256680c3fd67748a7741b91703cb6b, 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 &1558093585672720735 GameObject: m_ObjectHideFlags: 0 @@ -489,7 +351,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4957794194947264391} - m_RootOrder: 2 + 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} @@ -537,9 +399,9 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5269\u4F59\uFF1A3\u6B21" + m_Text: LanguageIndex: 0 ---- !u!1 &2230658934678160912 +--- !u!1 &1782166199271356142 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -547,50 +409,143 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1736114184632764560} - - component: {fileID: 3018363680338757996} - - component: {fileID: 6804330082045791357} + - component: {fileID: 5560347858770598648} + - component: {fileID: 2407937911512814976} + - component: {fileID: 5748968575010002094} + - component: {fileID: 6805646842612816677} m_Layer: 0 - m_Name: Image + m_Name: tabbox m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1736114184632764560 +--- !u!224 &5560347858770598648 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2230658934678160912} + m_GameObject: {fileID: 1782166199271356142} 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: 8713914388343685038} - m_RootOrder: 0 + m_Children: + - {fileID: 7121277092858204037} + - {fileID: 3096561829796132154} + - {fileID: 327719872794192258} + m_Father: {fileID: 2750471745573935426} + m_RootOrder: 4 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: 0} - m_SizeDelta: {x: 36, y: 126} + m_AnchoredPosition: {x: -428.83, y: 33} + m_SizeDelta: {x: 81.84, y: 657.3} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3018363680338757996 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2230658934678160912} - m_CullTransparentMesh: 0 ---- !u!114 &6804330082045791357 +--- !u!114 &2407937911512814976 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2230658934678160912} + m_GameObject: {fileID: 1782166199271356142} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 327719872794192258} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &5748968575010002094 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782166199271356142} + m_CullTransparentMesh: 0 +--- !u!114 &6805646842612816677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1782166199271356142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2848594445156506062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7369716692160020052} + - component: {fileID: 2122542296497948848} + - component: {fileID: 5107364236416893536} + m_Layer: 0 + m_Name: bgline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7369716692160020052 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848594445156506062} + 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: 3096561829796132154} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 41, y: 2.1500244} + m_SizeDelta: {x: 4, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2122542296497948848 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848594445156506062} + m_CullTransparentMesh: 0 +--- !u!114 &5107364236416893536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2848594445156506062} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -598,13 +553,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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_Sprite: {fileID: 21300000, guid: 7045c094dce78ae4b849ef4e50148aaa, type: 3} + m_Sprite: {fileID: 21300000, guid: 86256680c3fd67748a7741b91703cb6b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -613,86 +568,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3133122158697389110 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3383171814414968218} - - component: {fileID: 6298772290171829105} - - component: {fileID: 4108224001695914233} - m_Layer: 0 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3383171814414968218 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3133122158697389110} - 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: 1421605945814085954} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6298772290171829105 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3133122158697389110} - m_CullTransparentMesh: 0 ---- !u!114 &4108224001695914233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3133122158697389110} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.7448591, b: 0.58775365, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "3\u65E5\u540E\u53EF\u8D2D" - LanguageIndex: 0 --- !u!1 &3256576954911748796 GameObject: m_ObjectHideFlags: 0 @@ -704,8 +579,9 @@ GameObject: - component: {fileID: 3346197970643441062} - component: {fileID: 7800191807047102262} - component: {fileID: 2341934711441076325} + - component: {fileID: 7637575787411148859} m_Layer: 5 - m_Name: mask (1) + m_Name: closeBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -723,7 +599,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 898193909354494019} - m_RootOrder: 2 + 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} @@ -752,7 +628,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.78431374} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -767,101 +643,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3258892441049320515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4327610290445166402} - - component: {fileID: 783610438237627846} - - component: {fileID: 9160570148581851026} - - component: {fileID: 1973228035805088206} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4327610290445166402 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3258892441049320515} - 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: 4153848244485354422} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &783610438237627846 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3258892441049320515} - m_CullTransparentMesh: 0 ---- !u!114 &9160570148581851026 +--- !u!114 &7637575787411148859 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3258892441049320515} + m_GameObject: {fileID: 3256576954911748796} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 1392445389, 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_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: 2341934711441076325} + m_OnClick: 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: 292ef1dfcd26c54468ba4398663bd63d, 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 &1973228035805088206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3258892441049320515} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 60 - m_PreferredHeight: 60 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 - m_LayoutPriority: 1 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &3344270230499337201 GameObject: m_ObjectHideFlags: 0 @@ -893,8 +716,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7842824894853748038} - - {fileID: 2750471745573935426} - {fileID: 3346197970643441062} + - {fileID: 2750471745573935426} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -949,7 +772,7 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &3626792288842087820 +--- !u!1 &3540358020388305728 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -957,72 +780,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8082067823804858849} - - component: {fileID: 7918230442802992655} - - component: {fileID: 2470628334547512576} + - component: {fileID: 7555205745544236577} + - component: {fileID: 1350724166900821077} + - component: {fileID: 4933204781977023458} m_Layer: 0 - m_Name: Image (1) + m_Name: title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8082067823804858849 +--- !u!224 &7555205745544236577 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626792288842087820} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 3540358020388305728} + 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: 2021593734682218} - m_RootOrder: 0 + m_Father: {fileID: 3096561829796132154} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 41, y: 2.1500244} - m_SizeDelta: {x: 4, y: 22} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 36, y: 126} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7918230442802992655 +--- !u!222 &1350724166900821077 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626792288842087820} + m_GameObject: {fileID: 3540358020388305728} m_CullTransparentMesh: 0 ---- !u!114 &2470628334547512576 +--- !u!114 &4933204781977023458 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3626792288842087820} + m_GameObject: {fileID: 3540358020388305728} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.8113208, g: 0.6792783, b: 0.28315097, 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: 86256680c3fd67748a7741b91703cb6b, 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 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "6\u5143" --- !u!1 &3809056722976676371 GameObject: m_ObjectHideFlags: 0 @@ -1103,7 +931,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5929\u6570" LanguageIndex: 0 ---- !u!1 &3827661607881630473 +--- !u!1 &4294569554244289207 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1111,51 +939,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1421605945814085954} - - component: {fileID: 2568250143643158960} - - component: {fileID: 4987627675543419895} - m_Layer: 5 - m_Name: bugDay + - component: {fileID: 6828526214546953615} + - component: {fileID: 5613861276029052902} + - component: {fileID: 605815557394438501} + m_Layer: 0 + m_Name: bgdi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1421605945814085954 +--- !u!224 &6828526214546953615 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827661607881630473} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 4294569554244289207} + 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: - - {fileID: 3383171814414968218} - m_Father: {fileID: 4957794194947264391} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 3096561829796132154} + m_RootOrder: 1 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: 260, y: -41.34} - m_SizeDelta: {x: 200, y: 42.68} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 82, y: 186} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2568250143643158960 +--- !u!222 &5613861276029052902 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827661607881630473} + m_GameObject: {fileID: 4294569554244289207} m_CullTransparentMesh: 0 ---- !u!114 &4987627675543419895 +--- !u!114 &605815557394438501 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3827661607881630473} + m_GameObject: {fileID: 4294569554244289207} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1163,13 +990,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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_Sprite: {fileID: 21300000, guid: ced8e30fcd084ab4bb18323d9b3183de, type: 3} + m_Sprite: {fileID: 21300000, guid: 2aaa6456430fe044b9979521c30bb14f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1207,16 +1034,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1421605945814085954} + - {fileID: 1786085484146776892} + - {fileID: 7053404110353968548} - {fileID: 311860523735992108} - {fileID: 5731456838267947944} - - {fileID: 7053404110353968548} - m_Father: {fileID: 8892065666247826579} - m_RootOrder: 0 + m_Father: {fileID: 2750471745573935426} + 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: 2.35, y: 2297} + m_AnchoredPosition: {x: 7.050012, y: 1790.1} m_SizeDelta: {x: 750, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &277297546801486428 @@ -1331,7 +1158,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4815340943803729415 +--- !u!1 &5050852192469454056 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1339,73 +1166,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2236015055772779925} - - component: {fileID: 8788463930399519910} - - component: {fileID: 302465533002043506} + - component: {fileID: 1786085484146776892} + - component: {fileID: 7118307101639335013} + - component: {fileID: 6978954848419760233} m_Layer: 0 - m_Name: Image + m_Name: title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2236015055772779925 +--- !u!224 &1786085484146776892 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815340943803729415} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 5050852192469454056} + 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: 3909224449922192452} - m_RootOrder: 1 + m_Father: {fileID: 4957794194947264391} + 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: 0} - m_SizeDelta: {x: 36, y: 126} + m_AnchoredPosition: {x: 9.675, y: 52.2} + m_SizeDelta: {x: 695.85, y: 45.6} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8788463930399519910 +--- !u!222 &7118307101639335013 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815340943803729415} + m_GameObject: {fileID: 5050852192469454056} m_CullTransparentMesh: 0 ---- !u!114 &302465533002043506 +--- !u!114 &6978954848419760233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4815340943803729415} + m_GameObject: {fileID: 5050852192469454056} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: 3b9475bf7273a1a438d69e688ed95f08, 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 &4901700481088866384 + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 +--- !u!1 &6121961578120532490 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1413,10 +1246,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5324930657412983010} - - component: {fileID: 1654000619546181898} - - component: {fileID: 4391548727524270600} - - component: {fileID: 5942823928766335757} + - component: {fileID: 7121277092858204037} + - component: {fileID: 5972195482843868914} + - component: {fileID: 3524199934524539924} + - component: {fileID: 4644362798616874969} m_Layer: 0 m_Name: Image m_TagString: Untagged @@ -1424,40 +1257,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5324930657412983010 +--- !u!224 &7121277092858204037 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4901700481088866384} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 6121961578120532490} + 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: 7465221042871974731} + m_Father: {fileID: 5560347858770598648} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -50} + m_AnchoredPosition: {x: 40.9, y: -50} m_SizeDelta: {x: 8, y: 102} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1654000619546181898 +--- !u!222 &5972195482843868914 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4901700481088866384} + m_GameObject: {fileID: 6121961578120532490} m_CullTransparentMesh: 0 ---- !u!114 &4391548727524270600 +--- !u!114 &3524199934524539924 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4901700481088866384} + m_GameObject: {fileID: 6121961578120532490} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1480,13 +1313,13 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &5942823928766335757 +--- !u!114 &4644362798616874969 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4901700481088866384} + m_GameObject: {fileID: 6121961578120532490} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1500,283 +1333,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5494966038510548243 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3909224449922192452} - - component: {fileID: 49447602396166270} - - component: {fileID: 2590369484715652892} - - component: {fileID: 1174370648806570781} - - component: {fileID: 4161244213812486572} - m_Layer: 0 - m_Name: btn3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3909224449922192452 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5494966038510548243} - 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: - - {fileID: 1205788881077325512} - - {fileID: 2236015055772779925} - m_Father: {fileID: 7465221042871974731} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &49447602396166270 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5494966038510548243} - m_CullTransparentMesh: 0 ---- !u!114 &2590369484715652892 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5494966038510548243} - 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: 2aaa6456430fe044b9979521c30bb14f, 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 &1174370648806570781 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5494966038510548243} - 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: 2590369484715652892} - 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 &4161244213812486572 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5494966038510548243} - 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 &6071693783530045743 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8713914388343685038} - - component: {fileID: 794933251972832035} - - component: {fileID: 4597478790204264513} - - component: {fileID: 2493395842722750653} - - component: {fileID: 2469742085524997062} - m_Layer: 0 - m_Name: btn1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8713914388343685038 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6071693783530045743} - 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: - - {fileID: 1736114184632764560} - m_Father: {fileID: 7465221042871974731} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &794933251972832035 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6071693783530045743} - m_CullTransparentMesh: 0 ---- !u!114 &4597478790204264513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6071693783530045743} - 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: 2aaa6456430fe044b9979521c30bb14f, 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 &2493395842722750653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6071693783530045743} - 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: 4597478790204264513} - 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 &2469742085524997062 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6071693783530045743} - 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 &6605752224547364992 GameObject: m_ObjectHideFlags: 0 @@ -1808,11 +1364,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1053341947613772312} + - {fileID: 4957794194947264391} - {fileID: 8892065666247826579} - {fileID: 6793231540162019059} - - {fileID: 7465221042871974731} + - {fileID: 5560347858770598648} m_Father: {fileID: 898193909354494019} - m_RootOrder: 1 + 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} @@ -1943,9 +1500,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8788889948934153483} - - {fileID: 4153848244485354422} m_Father: {fileID: 4957794194947264391} - m_RootOrder: 1 + 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} @@ -2050,100 +1606,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &6902285224835173267 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2148886271344399776} - - component: {fileID: 2545760152514230900} - - component: {fileID: 7759061620681244399} - - component: {fileID: 5376544205717677701} - m_Layer: 5 - m_Name: cost - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2148886271344399776 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6902285224835173267} - 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: 4153848244485354422} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 91, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2545760152514230900 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6902285224835173267} - m_CullTransparentMesh: 0 ---- !u!114 &7759061620681244399 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6902285224835173267} - 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.9882353, g: 0.91764706, b: 0.67058825, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 300 ---- !u!114 &5376544205717677701 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6902285224835173267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &7338693464047317080 GameObject: m_ObjectHideFlags: 0 @@ -2171,10 +1633,9 @@ RectTransform: 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: - - {fileID: 4957794194947264391} + m_Children: [] m_Father: {fileID: 2750471745573935426} - m_RootOrder: 1 + 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} @@ -2220,7 +1681,7 @@ RectTransform: m_Children: - {fileID: 5387329556305204595} m_Father: {fileID: 2750471745573935426} - m_RootOrder: 2 + 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} @@ -2264,6 +1725,212 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8093528655009612423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4069429427725204656} + - component: {fileID: 671552640290369798} + - component: {fileID: 599655557190839115} + m_Layer: 0 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4069429427725204656 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8093528655009612423} + 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: 3096561829796132154} + 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: 0, y: 0} + m_SizeDelta: {x: 82, y: 186} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &671552640290369798 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8093528655009612423} + m_CullTransparentMesh: 0 +--- !u!114 &599655557190839115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8093528655009612423} + 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: 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_Sprite: {fileID: 21300000, guid: 9c58f94f924c5594fbff6700d623c4fb, 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 &8169508902378720173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3096561829796132154} + - component: {fileID: 8949058207455984782} + - component: {fileID: 7690998629941228297} + - component: {fileID: 3343712145607383157} + - component: {fileID: 4308912213800360287} + m_Layer: 0 + m_Name: tab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3096561829796132154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8169508902378720173} + 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: + - {fileID: 7369716692160020052} + - {fileID: 6828526214546953615} + - {fileID: 4069429427725204656} + - {fileID: 7555205745544236577} + m_Father: {fileID: 5560347858770598648} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -929, y: -227} + m_SizeDelta: {x: 82, y: 186} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8949058207455984782 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8169508902378720173} + m_CullTransparentMesh: 0 +--- !u!114 &7690998629941228297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8169508902378720173} + 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: 4308912213800360287} + 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 &3343712145607383157 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8169508902378720173} + 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!114 &4308912213800360287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8169508902378720173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &8209275484319792147 GameObject: m_ObjectHideFlags: 0 @@ -2363,218 +2030,3 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &8272386313426737569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2021593734682218} - - component: {fileID: 7018679292889174461} - - component: {fileID: 7225962461266956470} - - component: {fileID: 4322933681380838140} - - component: {fileID: 6372592857591258795} - m_Layer: 0 - m_Name: btn2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2021593734682218 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8272386313426737569} - 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: - - {fileID: 8082067823804858849} - - {fileID: 2297690547128844912} - m_Father: {fileID: 7465221042871974731} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7018679292889174461 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8272386313426737569} - m_CullTransparentMesh: 0 ---- !u!114 &7225962461266956470 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8272386313426737569} - 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: 2aaa6456430fe044b9979521c30bb14f, 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 &4322933681380838140 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8272386313426737569} - 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: 7225962461266956470} - 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 &6372592857591258795 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8272386313426737569} - 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 &8526624003440991057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4153848244485354422} - - component: {fileID: 3805795079689441902} - - component: {fileID: 1590314523509219221} - m_Layer: 5 - m_Name: Obj - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4153848244485354422 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526624003440991057} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4327610290445166402} - - {fileID: 2148886271344399776} - m_Father: {fileID: 311860523735992108} - 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3805795079689441902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526624003440991057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 ---- !u!114 &1590314523509219221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8526624003440991057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 044a44ceba..ca2ed1812c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1379,6 +1379,8 @@ ActivityTypeDef = { ContinuePackage = 87, -- 连购礼包 Incarnation = 86,--抽卡变身卡 jingjishilian = 88, + + chaozhifanli = 90, } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 2ae5f68c5b..6519ba3e20 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -1,31 +1,24 @@ require("Base/BasePanel") -local ContinuePackagePanel = Inherit(BasePanel) +local PremiumRebatePanel = Inherit(BasePanel) +local this = PremiumRebatePanel local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) +local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) +local TabBox = require("Modules/Common/TabBox") +local tabs = {} local BTNS = { - [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"}, - [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"}, - [3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"}, + [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "6\n元",showType = 48,}, + [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "30\n元",showType = 49,}, } -local btnType = { - LianGou = 1, - Meiri = 2, - ChaoZhi = 3, -} - -function ContinuePackagePanel:InitComponent() +local curPage = 1 +function PremiumRebatePanel:InitComponent() self.spLoader = SpriteLoader.New() + self.backBtn = Util.GetGameObject(self.gameObject, "closeBtn") + self.itemPre = Util.GetGameObject(self.gameObject, "Bg/ItemPre") self.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll") - self.itemPre = Util.GetGameObject(self.gameObject, "Bg/scroll/ItemPre") - self.backArena = Util.GetGameObject(self.gameObject, "backArena") - self.itemPre:SetActive(false) - self.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text") - self.title = Util.GetGameObject(self.gameObject, "Bg/NameBg/Image"):GetComponent("Image") - self.btnList = {} - for i = 1, 3 do - self.btnList[i] = Util.GetGameObject(self.gameObject, "Bg/btns/btn"..i) - end + self.leftTime = Util.GetGameObject(self.gameObject, "Bg/time"):GetComponent("Text") + self.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox") local rootHight = self.scrollItem.transform.rect.height local width = self.scrollItem.transform.rect.width @@ -34,225 +27,150 @@ function ContinuePackagePanel:InitComponent() self.scrollView.moveTween.MomentumAmount = 1 self.scrollView.moveTween.Strength = 2 self.scrollView.elastic = false + self.itemViewList = {} self.sortingOrder = 0 - self.curPage = btnType.LianGou end --绑定事件（用于子类重写） -function ContinuePackagePanel:BindEvent() - for i = 1, self.backArena.transform.childCount do - Util.AddOnceClick(self.backArena.transform:GetChild(i-1).gameObject, function() - self:ClosePanel() - end) - end - for j = 1, 3 do - Util.AddOnceClick(self.btnList[j], function() - if self.curPage ~= j then - self.curPage = j - ContinuePackagePanel:Refresh(true,true) - end - end) +function PremiumRebatePanel:BindEvent() + Util.AddOnceClick(self.backBtn, function() + self:ClosePanel() + end) + -- 初始化Tab管理器 + self.PageTabCtrl = TabBox.New() + self.PageTabCtrl:SetTabAdapter(self.PageTabAdapter) + self.PageTabCtrl:SetTabIsLockCheck(self.PageTabIsLockCheck) + self.PageTabCtrl:SetChangeTabCallBack(self.OnPageTabChange) +end + +function PremiumRebatePanel.PageTabAdapter(tab, index, status) + local select = Util.GetGameObject(tab, "select") + local title = Util.GetGameObject(tab, "title"):GetComponent("Text") + title.text = self.spLoader:LoadSprite(BTNS[index].text1) + if status == "select" then + select.gameObject:SetActive(true) + else + select.gameObject:SetActive(false) end end + +function PremiumRebatePanel.PageTabIsLockCheck() + return true +end + +function PremiumRebatePanel.OnPageTabChange(index) + if curPage == index then + return + end + curPage = index + this:Refresh(false,false) +end + --添加事件监听（用于子类重写） -function ContinuePackagePanel:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) +function PremiumRebatePanel:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self) end --移除事件监听（用于子类重写） -function ContinuePackagePanel:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self) +function PremiumRebatePanel:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self) end -function ContinuePackagePanel:OnSortingOrderChange() +function PremiumRebatePanel:OnSortingOrderChange() + end -local fun + --界面打开时调用（用于子类重写） -function ContinuePackagePanel:OnOpen(_linkActId, _fun) - self.linkActId = _linkActId - self.fun = _fun +function PremiumRebatePanel:OnOpen() + end --界面打开或者重新打开后，界面刷新时调用（用于子类重写） -function ContinuePackagePanel:OnShow() - ContinuePackagePanel:Refresh(true,true) +function PremiumRebatePanel:OnShow() + self.actData = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.chaozhifanli) + self.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActivityTypeDef.chaozhifanli) + self:Refresh(true,true) end -function ContinuePackagePanel:Refresh(isTop,isAni) - self.actData = CommonActPageManager.GetData(ActivityTypeDef.ContinuePackage,self.linkActId) - self:SetBtns() +function PremiumRebatePanel:Refresh(isTop,isAni) + self.giftData = DynamicActivityManager.GetGiftDataByType({DataType.Direct,5,BTNS[curPage].showType}) self:SetRewardShow(isTop,isAni) self:SetTime() end -function ContinuePackagePanel:SetBtns() - self.title.sprite = self.spLoader:LoadSprite(BTNS[self.curPage].title) - for i = 1, 3 do - if not self.actData.rewards[i] or #self.actData.rewards[i] <= 0 then - self.btnList[i]:SetActive(false) - else - self.btnList[i]:SetActive(true) - if self.curPage == i then - Util.GetGameObject(self.btnList[i],"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].text2) - self.btnList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].bg2) - else - Util.GetGameObject(self.btnList[i],"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].text1) - self.btnList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].bg1) - end - end - end -end - -function ContinuePackagePanel:SetRewardShow(isTop,isAni) +function PremiumRebatePanel:SetRewardShow(isTop,isAni) -- 显示 - self.scrollView:SetData(self.actData.rewards[self.curPage], function (index, item) - if self.actData.rewards[self.curPage][index].otherData.Type == self.curPage then - self:ShowSingleHero(item, self.actData.rewards[self.curPage][index],index) - end + self.scrollView:SetData(self.giftData, function (index, item) + self:ShowSingleHero(item, self.giftData[index],index) end,not isTop,not isAni) end -function ContinuePackagePanel:ShowSingleHero(go,data,index) +function PremiumRebatePanel:ShowSingleHero(go,_data,index) + local title = Util.GetGameObject(go, "title"):GetComponent("Text") local grid = Util.GetGameObject(go, "Grid") local btnGet = Util.GetGameObject(go, "btnGet") local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text") local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image") - local buyDayImg = Util.GetGameObject(go, "bugDay") - local buyDayText = Util.GetGameObject(buyDayImg, "Text"):GetComponent("Text") local obj = Util.GetGameObject(btnGet, "Obj") local icon = Util.GetGameObject(obj, "icon"):GetComponent("Image") local cost = Util.GetGameObject(obj, "cost"):GetComponent("Text") - local canBuyTime = Util.GetGameObject(go, "times"):GetComponent("Text") - + local missionConfigData = self.actConfigData[(curPage - 1)*15 + index] + title.text = missionConfigData.ContentsShow if not self.itemViewList[go] then self.itemViewList[go] = {} end for k,v in ipairs(self.itemViewList[go]) do v.gameObject:SetActive(false) end - for i = 1, #data.otherData.Reward do - local rewardData = data.otherData.Reward[i] + for i = 1, #_data.data.shows do if not self.itemViewList[go][i] then - self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform) + self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform) + self.itemViewList[go][i].gameObject:SetActive(false) end - self.itemViewList[go][i]:OnOpen(false, rewardData, 0.9,false,false,false,self.sortingOrder) + self.itemViewList[go][i]:OnOpen(false, {_data.data.shows[i][1],_data.data.shows[i][2],_data.data.shows[i][3]}, 0.9,false,false,false,self.sortingOrder) self.itemViewList[go][i].gameObject:SetActive(true) end - - -- LogBlue("Id:"..tostring(data.missionId).." state:"..tostring(data.state).." progress:"..tostring(data.progress)) - Util.SetGray(btnGet,false) - buyDayImg:SetActive(false) - btnText.gameObject:SetActive(false) - obj:SetActive(false) - canBuyTime.text = string.format( "剩余：%s次",data.progress) - canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数 - btnImg.sprite = self.spLoader:LoadSprite("s_slbz_anniu") - if data.otherData.GoodType == 1 then--直购 - btnText.gameObject:SetActive(true) - btnText.text = string.format("%s 元",data.otherData.Price) - if data.state == 8 then - btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise") - btnText.text = Language[10514] - canBuyTime.text = "" - elseif data.state == 3 then - Util.SetGray(btnGet,true) - elseif data.state == 2 then - Util.SetGray(btnGet,true) - buyDayImg:SetActive(true) - buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay) - end - elseif data.otherData.GoodType == 2 then--商品 - obj:SetActive(true) - icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.otherData.Price[1])) - cost.text = data.otherData.Price[2] - if data.state == 8 then - obj:SetActive(false) - btnText.gameObject:SetActive(true) - btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise") - btnText.text = Language[10514] - canBuyTime.text = "" - elseif data.state == 3 then - Util.SetGray(btnGet,true) - elseif data.state == 2 then - Util.SetGray(btnGet,true) - buyDayImg:SetActive(true) - buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay) - end - end - - Util.AddOnceClick(btnGet,function () - if data.state == 1 then - if data.otherData.GoodType == 1 then--直购 - PayManager.Pay(data.otherData.GoodId, function(id) - FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.GoodId) - OperatingManager.SetHadBuyGoodsId({data.otherData.GoodId}) - -- OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId) + btnText.gameObject:SetActive(true) + btnText.text = string.format("%s 元",_data.data.price) + local missionData = self.actData.mission[(curPage - 1)*15 + index] + if missionData then + if missionData.state == 0 then + Util.SetGray(btnGet,false) + Util.AddOnceClick(btnGet,function () + PayManager.Pay(_data.data.shopData.goodsId, function(id) + FirstRechargeManager.RefreshAccumRechargeValue(_data.data.shopData.goodsId) + OperatingManager.SetHadBuyGoodsId({_data.data.shopData.goodsId}) + missionData.state = 0 + self:ShowSingleHero(go,_data,index) self:Refresh(false,false) end) - elseif data.otherData.GoodType == 2 then--商品 - NetManager.ContinueBuyItemRequest(data.otherData.GoodId,function (drop) - UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() - self:Refresh(false,false) - end) - end) - end - elseif data.state == 3 then - PopupTipPanel.ShowTip("请先购买上一礼包，即可解锁此礼包") - elseif data.state == 2 then - PopupTipPanel.ShowTip("礼包尚未开启，请耐心等待") + end) + else + Util.SetGray(btnGet,true) + btnText.text = "已购买" end - end) + else + Util.SetGray(btnGet,true) + PopupTipPanel.ShowTip("累计购买X天后才可购买！") + end end -function ContinuePackagePanel:SetTime() +function PremiumRebatePanel:SetTime() + +end + +function PremiumRebatePanel:OnClose() if self.timer then self.timer:Stop() self.timer = nil end - local time = self.actData.endTime - GetTimeStamp() - local leftTime = time - 86280 - if self.curPage == btnType.Meiri and leftTime > 0 then--如果是每日特惠显示每日倒计时 - time = CalculateSecondsNowTo_N_OClock(24) - end - --每日特惠处理 - self.leftTime.text = Language[10512]..TimeToFelaxible(time) - if self.curPage == btnType.Meiri then - self.leftTime.text = Language[10023]..TimeToFelaxible(time) - end - self.timer = Timer.New(function () - if time <= 0 then - if self.curPage == btnType.Meiri and leftTime > 0 then - self:Refresh(false,false) - return - end - self:ClosePanel() - end - self.leftTime.text = Language[10512]..TimeToFelaxible(time) - if self.curPage == btnType.Meiri then - self.leftTime.text = Language[10023]..TimeToFelaxible(time) - end - time = time -1 - end, 1, -1, true) - self.timer:Start() -end - -function ContinuePackagePanel:OnClose() - if self.timer then - self.timer:Stop() - self.timer = nil - end - self.sortingOrder = 0 - if self.fun then - self.fun() - self.fun = nil - end end --界面销毁时调用（用于子类重写） -function ContinuePackagePanel:OnDestroy() +function PremiumRebatePanel:OnDestroy() self.spLoader:Destroy() self.itemViewList = {} end -return ContinuePackagePanel \ No newline at end of file +return PremiumRebatePanel \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 912cfa6522..1f2c25ff99 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -728,7 +728,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType) if data.shopItemData.DailyUpdate == 7 then data.tipImageText = Language[11699] elseif data.shopItemData.DailyUpdate == 15 then - data.tipImageText = Language[11700] + data.tipImageText = Language[11700] elseif data.shopItemData.DailyUpdate == 30 then data.tipImageText = Language[11357] elseif shopData.goodsId == 9107 then From eaea265bc71ef57e443594aa9ccbb03a3d2368f7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sun, 26 Dec 2021 17:35:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E7=89=A9=E5=93=81=E3=80=91?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E5=93=81=E4=BD=BF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E9=99=90=E5=88=B6=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Popup/RewardItemSingleShowPopup.prefab | 81 +++++++++++++++++++ .../Popup/RewardItemSingleShowPopup.lua | 13 ++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index bf07f21b38..a7b6044fe0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -1797,6 +1797,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u67E5\u770B\u795E\u5C06" LanguageIndex: 0 +--- !u!1 &4807791001723234914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6018432383040005467} + - component: {fileID: 59271303520494573} + - component: {fileID: 4822299028475260433} + m_Layer: 5 + m_Name: armorLock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6018432383040005467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807791001723234914} + 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: 5657074182624981674} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 29.1375} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &59271303520494573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807791001723234914} + m_CullTransparentMesh: 0 +--- !u!114 &4822299028475260433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807791001723234914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8000001, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 --- !u!1 &4987017433144427803 GameObject: m_ObjectHideFlags: 0 @@ -2306,6 +2386,7 @@ RectTransform: - {fileID: 6708840274652747615} - {fileID: 2212749366653133608} - {fileID: 59611912520081040} + - {fileID: 6018432383040005467} m_Father: {fileID: 9015164529682029271} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 891bdc35ab..8728888b78 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -36,6 +36,7 @@ function RewardItemSingleShowPopup:InitComponent() this.itemName = Util.GetGameObject(this.info, "name"):GetComponent("Text") this.armorTitle = Util.GetGameObject(this.info, "armorTitle"):GetComponent("Text") this.armorDesc = Util.GetGameObject(this.info, "armorDesc"):GetComponent("Text") + this.armorLock = Util.GetGameObject(this.info, "armorLock"):GetComponent("Text") this.equipQuaText = Util.GetGameObject(self.transform, "bg/topBar/armor/equipQuaText"):GetComponent("Text") this.armorInfo = Util.GetGameObject(self.transform, "bg/topBar/armorInfo") this.armorInfoText = Util.GetGameObject(self.transform, "bg/topBar/armorInfo"):GetComponent("Text") @@ -85,6 +86,10 @@ function RewardItemSingleShowPopup:BindEvent() end) Util.AddClick(this.btnSure, function() + if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then + PopupTipPanel.ShowTip(string.format("等级达%s后可以使用", itemConfigData.UseLevel)) + return + end if itemConfigData.ItemType == ItemType.HeroDebris then local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas()) @@ -528,7 +533,13 @@ function RewardItemSingleShowPopup:OnShow() else this.checkHero:SetActive(false) end - + + -- 判断是否要显示等级限制 + this.armorLock.gameObject:SetActive(false) + if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then + this.armorLock.gameObject:SetActive(true) + this.armorLock.text = string.format("等级达%s后可以使用", UIColorStr.RED, itemConfigData.UseLevel) + end end --获取道具种类 From 7476af5fd93f6d0ea13a965539dbe0b88e084f2f Mon Sep 17 00:00:00 2001 From: skuld Date: Sat, 18 Dec 2021 00:15:31 +0800 Subject: [PATCH 4/6] bat Resource Commit:2021/12/18, 0:15:30 --- .../Icons/r_LvUpItem_zuhe.png | Bin 0 -> 30274 bytes .../Icons/r_LvUpItem_zuhe.png.meta | 88 ++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 Assets/ManagedResources/Icons/r_LvUpItem_zuhe.png create mode 100644 Assets/ManagedResources/Icons/r_LvUpItem_zuhe.png.meta diff --git a/Assets/ManagedResources/Icons/r_LvUpItem_zuhe.png b/Assets/ManagedResources/Icons/r_LvUpItem_zuhe.png new file mode 100644 index 0000000000000000000000000000000000000000..b5ac3d4c1ce4d656046d8cfec51d35d1e5fb6928 GIT binary patch literal 30274 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 Date: Sun, 26 Dec 2021 18:13:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E6=96=B0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E3=80=91=E6=9D=A1=E4=BB=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E6=8C=89=E9=92=AE=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Fight/FightPointPassManager.lua | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 764941c52b..0e1ab20330 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -295,13 +295,14 @@ function this.CheckFightOpenRule(fightId) if PlayerManager.level < mainLevelConfig[this.curOpenFight].LevelLimit then local tip = tostring(mainLevelConfig[this.curOpenFight].LevelLimit .. Language[10056]) LogRed(tip .. " 当前："..PlayerManager.level) - return false, tip + return false, tip, tip end local openRule = mainLevelConfig[fightId].OpenRule if openRule then local states = {} local tips = {} + local btnTxts = {} for index, rule in ipairs(openRule) do if not rule[1] or rule[1] == 0 then LogRed("当前：没有限制条件1") @@ -310,21 +311,24 @@ function this.CheckFightOpenRule(fightId) local star = FightLevelManager.GetAllChapterStars() if star < rule[2] then states[index] = false - tips[index] = string.format("山河社稷图星数达%s", rule[2]) + tips[index] = string.format("山河社稷图星数达%s", rule[2])-- 山河社稷图%s星 + btnTxts[index] = string.format("山河社稷图%s星", rule[2]) LogRed(tips[index]..", 当前："..star) end elseif rule[1] == 2 then local wave = MonsterCampManager.GetMonsterCampCurWave() if wave <= rule[2] then states[index] = false - tips[index] = string.format("心魔试炼通关%s层", rule[2]) + tips[index] = string.format("心魔试炼通关%s层", rule[2])-- 心魔试炼通关999层 + btnTxts[index] = string.format("心魔试炼通关999层", rule[2]) LogRed(tips[index]..", 当前："..wave) end elseif rule[1] == 3 then local lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) if lv < rule[2] then states[index] = false - tips[index] = string.format("鸿蒙阵共鸣等级达%s", rule[2]) + tips[index] = string.format("鸿蒙阵共鸣等级达%s", rule[2])-- 鸿蒙阵共鸣%s级 + btnTxts[index] = string.format("鸿蒙阵共鸣%s级", rule[2]) LogRed(tips[index]..", 当前："..lv) end elseif rule[1] == 4 then @@ -334,13 +338,15 @@ function this.CheckFightOpenRule(fightId) local equipStarConfig = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, rule[2]) states[index] = false tips[index] = string.format("拥有%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars) + btnTxts[index] = string.format("%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars) LogRed(tips[index]..", 当前："..num) end elseif rule[1] == 5 then local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1) if tlv < rule[2] then states[index] = false - tips[index] = string.format("神将总好感度等级达%s", rule[2]) + tips[index] = string.format("神将总好感度等级达%s", rule[2]) -- 总好感度%s级 + btnTxts[index] = string.format("总好感度%s级", rule[2]) LogRed(tips[index]..", 当前："..tlv) end elseif rule[1] == 6 then @@ -348,7 +354,8 @@ function this.CheckFightOpenRule(fightId) local xyPassTimes = XiaoYaoManager.GetCurPassTimes() if xyPassTimes < rule[2] then states[index] = false - tips[index] = string.format("通关逍遥游%s次", rule[2]) + tips[index] = string.format("逍遥游通关%s次", rule[2]) + btnTxts[index] = string.format("逍遥游通关%s次", rule[2]) LogRed(tips[index]..", 当前："..xyPassTimes) end elseif rule[1] == 7 then @@ -357,24 +364,33 @@ function this.CheckFightOpenRule(fightId) local num = #HeroManager.GetAllHeroDatas(c_lv) if num < c_num then states[index] = false - tips[index] = string.format("拥有%s个等级%s以上的神将", c_num, c_lv) + tips[index] = string.format("拥有%s个等级%s以上的神将", c_num, c_lv)-- %s个%s级神将 + btnTxts[index] = string.format("%s个%s级神将", c_num, c_lv) LogRed(tips[index]..", 当前："..num) end end end local tip = "" + local btnTxt = "" local isOk = true for index, state in pairs(states) do if not state then isOk = false + -- 提示文字 if tip ~= "" then tip = tip..string.format("，且%s", tips[index]) else tip = tips[index] end + -- 按钮显示文字 + if btnTxt ~= "" then + btnTxt = tip..string.format("，且%s", btnTxts[index]) + else + btnTxt = btnTxts[index] + end end end - return isOk, tip.."解锁" + return isOk, tip.."解锁", btnTxt end LogRed("当前：没有限制条件2") return true @@ -396,8 +412,9 @@ function this.GetBtnText() return limitLevel .. Language[10056] end -- - if not this.CheckFightOpenRule(this.curOpenFight) then - return "条件未达成" + local isOk, tip, btnTxt= this.CheckFightOpenRule(this.curOpenFight) + if not isOk then + return btnTxt end local offset = 1 From ab3d7e939b311bf18438c1abd8823fbf9e3197a7 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sun, 26 Dec 2021 19:12:25 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E8=A7=A3=E9=94=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=91=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E8=A7=A3?= =?UTF-8?q?=E9=94=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 256 +++++++++++++++--- .../ManagedResources/~Lua/Data/ConfigData.lua | 1 + .../Modules/Fight/FightPointPassMainPanel.lua | 18 ++ .../Modules/Fight/FightPointPassManager.lua | 39 +++ .../~Lua/Modules/Player/PrivilegeManager.lua | 4 +- 5 files changed, 284 insertions(+), 34 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 2f5c0cabe6..203be84610 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -4865,7 +4865,7 @@ ParticleSystem: --- !u!199 &325797788 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4924,6 +4924,42 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &366932770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 366932771} + m_Layer: 5 + m_Name: OpenTips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &366932771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366932770} + 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: + - {fileID: 1322237861} + m_Father: {fileID: 1388929535} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -509.89996, y: 491} + m_SizeDelta: {x: 977.6, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &384354872 GameObject: m_ObjectHideFlags: 0 @@ -9621,7 +9657,7 @@ ParticleSystem: --- !u!199 &689865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9983,6 +10019,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &796774146 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 796774147} + - component: {fileID: 796774150} + - component: {fileID: 796774148} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &796774147 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796774146} + 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: 1322237861} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1.3999939, y: 0.69999695} + m_SizeDelta: {x: -42.8, y: -18.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &796774150 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796774146} + m_CullTransparentMesh: 0 +--- !u!114 &796774148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 796774146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.86274517, g: 0.6901961, b: 0.48235297, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: '************************************************************************************' + LanguageIndex: 10530 --- !u!1 &921277673 GameObject: m_ObjectHideFlags: 0 @@ -10666,6 +10782,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8D60\u9001" LanguageIndex: 10514 +--- !u!1 &1322237860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1322237861} + - component: {fileID: 1322237863} + - component: {fileID: 1322237862} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1322237861 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322237860} + 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: + - {fileID: 796774147} + m_Father: {fileID: 366932771} + 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: 302, y: 17} + m_SizeDelta: {x: 400, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1322237863 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322237860} + m_CullTransparentMesh: 0 +--- !u!114 &1322237862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322237860} + 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: cea2de122c1a9514ca0fccab6368d837, 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 &1388929534 GameObject: m_ObjectHideFlags: 0 @@ -10695,6 +10886,7 @@ RectTransform: m_Children: - {fileID: 1398615584} - {fileID: 3144727546776224643} + - {fileID: 366932771} m_Father: {fileID: 6976277603980592380} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15460,7 +15652,7 @@ ParticleSystem: --- !u!199 &1640369986 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20399,7 +20591,7 @@ ParticleSystem: --- !u!199 &2023267969 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25520,7 +25712,7 @@ ParticleSystem: --- !u!199 &53865032735354669 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30371,7 +30563,7 @@ ParticleSystem: --- !u!199 &53865032903479894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35106,7 +35298,7 @@ ParticleSystem: --- !u!199 &53865033217178009 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -39719,7 +39911,7 @@ ParticleSystem: --- !u!199 &53865033315684810 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -40488,7 +40680,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 61.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7481411220995830971 @@ -41320,7 +41512,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -42585,7 +42777,7 @@ MonoBehaviour: --- !u!199 &2029503781167846324 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52351,7 +52543,7 @@ ParticleSystem: --- !u!199 &6880421793403083728 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -58115,7 +58307,7 @@ ParticleSystem: --- !u!199 &4461638917069206421 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63553,7 +63745,7 @@ ParticleSystem: --- !u!199 &3013323903669708406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68317,7 +68509,7 @@ ParticleSystem: --- !u!199 &3013323904051820469 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72889,7 +73081,7 @@ ParticleSystem: --- !u!199 &3013323905367474027 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -80323,7 +80515,7 @@ ParticleSystem: --- !u!199 &4464147961387653562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85026,7 +85218,7 @@ ParticleSystem: --- !u!199 &4464147961555461313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -89909,7 +90101,7 @@ ParticleSystem: --- !u!199 &4464147961868422926 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94596,7 +94788,7 @@ ParticleSystem: --- !u!199 &4464147962235348829 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100405,7 +100597,7 @@ ParticleSystem: --- !u!199 &6988990775388982249 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -106510,7 +106702,7 @@ ParticleSystem: --- !u!199 &1454073279585546898 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -111487,7 +111679,7 @@ ParticleSystem: --- !u!199 &6133679773105218358 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -116381,7 +116573,7 @@ ParticleSystem: --- !u!199 &6133679773792227019 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -121047,7 +121239,7 @@ ParticleSystem: --- !u!199 &6133679774607836274 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -125927,7 +126119,7 @@ ParticleSystem: --- !u!199 &7281689276397397565 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -126096,9 +126288,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -111.479996} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -131313,7 +131505,7 @@ ParticleSystem: --- !u!199 &6542693245334262270 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -136182,7 +136374,7 @@ ParticleSystem: --- !u!199 &6542693245491611079 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -143689,7 +143881,7 @@ ParticleSystem: --- !u!199 &4325216380872068964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 5312c050e2..f5b22d7f38 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -244,6 +244,7 @@ ConfigName = { GoodsConfig = "GoodsConfig", ThemeActivityShop = "ThemeActivityShop", SummonTreasure = "SummonTreasure", + LevelTips = "LevelTips", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 14ba0e640d..07bd0c1f32 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -129,6 +129,9 @@ function FightPointPassMainPanel:InitComponent() this.getRewardButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton") this.mainTaskGRewardImage = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton/getRewardImage") this.mainTaskJumpImage = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton/jumpImage") + -- 解锁提示 + this.OpenTips = Util.GetGameObject(self.gameObject, "Bg/RightDown/OpenTips") + this.OpenTipsTxt = Util.GetGameObject(self.gameObject, "Bg/RightDown/OpenTips/Image/Text"):GetComponent("Text") this.GuideEffectGo = poolManager:LoadAsset("GuideEffect", PoolManager.AssetType.GameObject) this.GuideEffectGo.transform:SetParent(this.mainTaskGRewardImage.transform) @@ -355,6 +358,7 @@ function FightPointPassMainPanel:AddListener() Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText) + Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips) Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask) Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv) end @@ -370,6 +374,7 @@ function FightPointPassMainPanel:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText) + Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips) Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask) Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv) end @@ -490,6 +495,8 @@ function FightPointPassMainPanel:OnShow() -- 刷新任务显示 this.refreshVipTask() + -- 刷新解锁信息显示 + this.RefreshOpenTips() end @@ -517,6 +524,17 @@ function this.refreshVipTask() end end +-- 刷新提示文字显示 +function this.RefreshOpenTips() + local tips = FightPointPassManager.GetCurLevelTips() + if tips then + this.OpenTips:SetActive(true) + this.OpenTipsTxt.text = tips + else + this.OpenTips:SetActive(false) + end +end + --寻宝显示 function this.UpdateFindTreasureMaterialNum() local mazeTreasureMax = ConfigManager.GetConfigData(ConfigName.PlayerLevelConfig,PlayerManager.level).MazeTreasureMax diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 0e1ab20330..6883feaad0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -4,6 +4,7 @@ local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) -- 火洞吊裸 local Huo_Dong_Diao_Luo = ConfigManager.GetConfig(ConfigName.ActivityDropReward) local rewardGroupConfig = ConfigManager.GetConfig(ConfigName.RewardGroup) +local LevelTipsConfig = ConfigManager.GetConfig(ConfigName.LevelTips) this.talkingTime = 0 --对话时间 -- 挂机物品栏位对应vip数值加成特权 @@ -640,4 +641,42 @@ function this.GetStopBtnState() return isShow end +-- 用于比较副本id的大小 +-- > 0 cId1 比 cId2 大 +-- = 0 相同关卡 +-- < 0 cId1 比 cId2 小 +function this.CarbonIdCompare(cId1, cId2) + local len1 = string.len(cId1) + local diff1 = tonumber(string.sub(cId1, len1, len1)) + local id1 = tonumber(string.sub(cId1, 1, len1-1)) + + local len2 = string.len(cId2) + local diff2 = tonumber(string.sub(cId2, len2, len2)) + local id2 = tonumber(string.sub(cId2, 1, len2-1)) + + if diff1 == diff2 then + return id1 - id2 + end + return diff1 - diff2 +end + +-- 获取当前需要显示的描述文字 +function this.GetCurLevelTips() + LogError("GetCurLevelTips") + + for id, config in ConfigPairs(LevelTipsConfig) do + LogError(id) + if config.Type == 1 then + if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then + return config.Desc + end + elseif config.Type == 2 then + if PlayerManager.level < config.Parameter then + return config.Desc + end + end + end +end + + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index a6921b59b3..15d4e64076 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -56,8 +56,8 @@ local function _CarbonIdCompare(cId1, cId2) local id1 = tonumber(string.sub(cId1, 1, len1-1)) local len2 = string.len(cId2) - local diff2 = tonumber(string.sub(cId1, len2, len2)) - local id2 = tonumber(string.sub(cId1, 1, len2-1)) + local diff2 = tonumber(string.sub(cId2, len2, len2)) + local id2 = tonumber(string.sub(cId2, 1, len2-1)) if diff1 == diff2 then return id1 - id2