From 7d63d1e1910ea724839da080256d20f15753407c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 12 May 2021 17:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 983 +++++++++++++++++- .../Prefabs/UI/Practice/PracticePanel.prefab | 360 ++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Common/functions.lua | 6 + .../Modules/GeneralPanel/GeneralBigPopup.lua | 66 +- .../GeneralBigPopup_PracticeStatePreview.lua | 116 +++ ...eralBigPopup_PracticeStatePreview.lua.meta | 7 + .../HandBook/HandBookRoleInfoLayout.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- .../~Lua/Modules/Practice/PracticeManager.lua | 37 +- .../~Lua/Modules/Practice/PracticePanel.lua | 62 +- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 +- .../Modules/RoleInfo/RoleProInfoPopup.lua | 11 +- 14 files changed, 1588 insertions(+), 69 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index eb3cf74e4e..2902dc4ebf 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -183,6 +183,162 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &286590057941595347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9061013164573287848} + - component: {fileID: 3596436011982854297} + - component: {fileID: 8803359895495548047} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9061013164573287848 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286590057941595347} + 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: 5099785980946439771} + m_Father: {fileID: 1126952660353491259} + 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: 450, y: -164} + m_SizeDelta: {x: 600, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3596436011982854297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286590057941595347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 600, y: 35} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 +--- !u!114 &8803359895495548047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286590057941595347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &522003989049123233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5535942404172630535} + - component: {fileID: 4776115284618152778} + - component: {fileID: 3570053689278984110} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5535942404172630535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522003989049123233} + 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: 5455853077341739355} + 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: 598} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4776115284618152778 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522003989049123233} + m_CullTransparentMesh: 0 +--- !u!114 &3570053689278984110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522003989049123233} + 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.92549026, g: 0.8588236, b: 0.74509805, 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: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5883\u754C\u9884\u89C8" + LanguageIndex: 0 --- !u!1 &582247181667879863 GameObject: m_ObjectHideFlags: 0 @@ -833,6 +989,123 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5565\u5565\u5565\u5565\u5565\u5565" LanguageIndex: 0 +--- !u!1 &1422192717058822037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1126952660353491259} + - component: {fileID: 4827792396798163766} + - component: {fileID: 2890818643573246769} + - component: {fileID: 5050479793497493233} + - component: {fileID: 4330992986176314469} + m_Layer: 0 + m_Name: Pre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1126952660353491259 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422192717058822037} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4253765783256722946} + - {fileID: 4250835300878011901} + - {fileID: 3491709536532306472} + - {fileID: 9061013164573287848} + m_Father: {fileID: 5455853077341739355} + 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: 1658, y: -1052} + m_SizeDelta: {x: 900, y: 184} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4827792396798163766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422192717058822037} + m_CullTransparentMesh: 0 +--- !u!114 &2890818643573246769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422192717058822037} + 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: 0.56078434} + 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: 0} + 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 &5050479793497493233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422192717058822037} + 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: 20 + m_Bottom: 20 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &4330992986176314469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422192717058822037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &1593504276384976856 GameObject: m_ObjectHideFlags: 0 @@ -1050,6 +1323,7 @@ GameObject: - component: {fileID: 5978868307199444870} - component: {fileID: 1072730558999711384} - component: {fileID: 7835085401096484185} + - component: {fileID: 8853313882425739485} m_Layer: 5 m_Name: Mask m_TagString: Untagged @@ -1113,6 +1387,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8853313882425739485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005787329047355383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7835085401096484185} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2756625957159874447 GameObject: m_ObjectHideFlags: 0 @@ -1316,6 +1632,255 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3567281351540084073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3670882826035453701} + - component: {fileID: 1471286377808154507} + - component: {fileID: 7362319638261651843} + m_Layer: 0 + m_Name: Grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3670882826035453701 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3567281351540084073} + 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: 6607447267803307823} + 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: -1228.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1471286377808154507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3567281351540084073} + 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: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &7362319638261651843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3567281351540084073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &3768572824539514549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2313678692522721823} + - component: {fileID: 7052788287217176819} + - component: {fileID: 706219948060520849} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2313678692522721823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3768572824539514549} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4250835300878011901} + 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 &7052788287217176819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3768572824539514549} + m_CullTransparentMesh: 0 +--- !u!114 &706219948060520849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3768572824539514549} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + 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: 0 + m_LineSpacing: 1 + m_Text: "\u7B51\u57FA\u671F" + LanguageIndex: 0 +--- !u!1 &4183270985937228499 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3491709536532306472} + - component: {fileID: 158801954867338518} + - component: {fileID: 4987422606987275195} + - component: {fileID: 968104992755813186} + m_Layer: 0 + m_Name: SpecialText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3491709536532306472 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4183270985937228499} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1126952660353491259} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 450, y: -130.5} + m_SizeDelta: {x: 600, y: 67} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &158801954867338518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4183270985937228499} + m_CullTransparentMesh: 0 +--- !u!114 &4987422606987275195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4183270985937228499} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 30 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1.1 + m_Text: "\u540D\u79F0\u664B\u5347\u4E3A\u7EFF\u8272\n\\n\u89E3\u9501\u7B51\u57FA\u671F" + LanguageIndex: 0 +--- !u!114 &968104992755813186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4183270985937228499} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &4186176485394922406 GameObject: m_ObjectHideFlags: 0 @@ -1332,7 +1897,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2221885512223848565 RectTransform: m_ObjectHideFlags: 0 @@ -1840,6 +2405,54 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5955664632054071393} m_CullTransparentMesh: 0 +--- !u!1 &6024979662384741555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5455853077341739355} + - component: {fileID: 1599638087192885388} + m_Layer: 5 + m_Name: GeneralBigPopup_PracticeStatePreview + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5455853077341739355 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6024979662384741555} + 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: 5535942404172630535} + - {fileID: 1126952660353491259} + - {fileID: 6607447267803307823} + - {fileID: 1815702843280761573} + m_Father: {fileID: 2423465471356683207} + m_RootOrder: 3 + 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 &1599638087192885388 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6024979662384741555} + m_CullTransparentMesh: 0 --- !u!1 &6129251158678455388 GameObject: m_ObjectHideFlags: 0 @@ -1950,6 +2563,101 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6291468886468362430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4253765783256722946} + - component: {fileID: 7894911519893387854} + - component: {fileID: 4384747173519324085} + - component: {fileID: 4907475792897599996} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4253765783256722946 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6291468886468362430} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1126952660353491259} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -4.5} + m_SizeDelta: {x: 900, y: 9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7894911519893387854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6291468886468362430} + m_CullTransparentMesh: 0 +--- !u!114 &4384747173519324085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6291468886468362430} + 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: ce8ced78fa9fe2b478e391b6802f34b2, 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 &4907475792897599996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6291468886468362430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &6379312383675149712 GameObject: m_ObjectHideFlags: 0 @@ -2062,6 +2770,7 @@ RectTransform: - {fileID: 1048101660349373980} - {fileID: 2221885512223848565} - {fileID: 6361912668556971992} + - {fileID: 5455853077341739355} m_Father: {fileID: 1047325092235970838} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2107,6 +2816,81 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1 &7275972870704052744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4250835300878011901} + - component: {fileID: 344073511819279971} + - component: {fileID: 8227652277031025722} + m_Layer: 0 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4250835300878011901 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275972870704052744} + 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: 2313678692522721823} + m_Father: {fileID: 1126952660353491259} + 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: 450, y: -58.5} + m_SizeDelta: {x: 184, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &344073511819279971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275972870704052744} + m_CullTransparentMesh: 0 +--- !u!114 &8227652277031025722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7275972870704052744} + 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: ada70478cb00b4d41b6449d95256316a, 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 &8052020371798592084 GameObject: m_ObjectHideFlags: 0 @@ -2261,3 +3045,200 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4EC5\u9650\u7B2C\u4E8C\u5C42" LanguageIndex: 0 +--- !u!1 &8275439170458862602 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6607447267803307823} + - component: {fileID: 8449469157746064472} + - component: {fileID: 4727639468079149047} + m_Layer: 0 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6607447267803307823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8275439170458862602} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3670882826035453701} + m_Father: {fileID: 5455853077341739355} + 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: -1.4, y: -62.9} + m_SizeDelta: {x: 905.9, y: 1228.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8449469157746064472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8275439170458862602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 3670882826035453701} + m_Horizontal: 0 + m_Vertical: 1 + 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!114 &4727639468079149047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8275439170458862602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8745031301282372951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5099785980946439771} + - component: {fileID: 7901625351890239395} + - component: {fileID: 7039616287093621084} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5099785980946439771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745031301282372951} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9061013164573287848} + 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: 300, y: -25} + m_SizeDelta: {x: 600, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7901625351890239395 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745031301282372951} + m_CullTransparentMesh: 0 +--- !u!114 &7039616287093621084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745031301282372951} + 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.9529412, g: 0.7176471, b: 0.30980393, 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: 0 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u540D\u79F0\u664B\u5347\u4E3A\u7EFF\u8272\\n\u89E3\u9501\u7B51\u57FA\u671F" + LanguageIndex: 0 +--- !u!1 &9085716155771416144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1815702843280761573} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1815702843280761573 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9085716155771416144} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 93.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5455853077341739355} + 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} + m_AnchoredPosition: {x: -1.4, y: -62.9} + m_SizeDelta: {x: 905.9, y: 1228.1} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 42cedcef8f..52be7bc06f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -305,7 +305,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8807105563129826786 RectTransform: m_ObjectHideFlags: 0 @@ -322,10 +322,10 @@ RectTransform: m_Father: {fileID: 6999176096490070205} 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: 540, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -40} + m_SizeDelta: {x: 154, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4230894382925717242 CanvasRenderer: @@ -526,6 +526,7 @@ RectTransform: m_Children: - {fileID: 9191273193405951724} - {fileID: 6999176096490070205} + - {fileID: 5372197318280130239} - {fileID: 7687275820350529986} m_Father: {fileID: 8503549196898394800} m_RootOrder: 2 @@ -680,6 +681,68 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &2999680739887067492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5372197318280130239} + - component: {fileID: 5974558750208915759} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5372197318280130239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2999680739887067492} + 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: 2915832978086588178} + - {fileID: 4647201884304797506} + - {fileID: 3089880466673845363} + m_Father: {fileID: 3818728531437821566} + 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: -131} + m_SizeDelta: {x: 1080, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5974558750208915759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2999680739887067492} + 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: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 --- !u!1 &3245778189758882973 GameObject: m_ObjectHideFlags: 0 @@ -833,10 +896,10 @@ RectTransform: m_Father: {fileID: 8807105563129826786} 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: 70} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -35} + m_SizeDelta: {x: 84, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7816951529445717412 CanvasRenderer: @@ -881,6 +944,202 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 9999 LanguageIndex: 0 +--- !u!1 &4417042985833577639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3089880466673845363} + - component: {fileID: 33793932751881035} + - component: {fileID: 4346592910141442077} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3089880466673845363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417042985833577639} + 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: 5372197318280130239} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 741, y: -40} + m_SizeDelta: {x: 72, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &33793932751881035 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417042985833577639} + m_CullTransparentMesh: 0 +--- !u!114 &4346592910141442077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4417042985833577639} + 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: 8908080ead3926f4e9e9951397b9e29b, 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 &5196531749690728303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2915832978086588178} + - component: {fileID: 3842461532959549957} + - component: {fileID: 9203813319220798313} + - component: {fileID: 2943931107101536826} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2915832978086588178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5196531749690728303} + 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: 5372197318280130239} + 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: 463, y: -40} + m_SizeDelta: {x: 320, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3842461532959549957 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5196531749690728303} + m_CullTransparentMesh: 0 +--- !u!114 &9203813319220798313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5196531749690728303} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5C71\u6CB3\u793E\u7A37\u56FE\u4E2D\u83B7\u5F97" +--- !u!114 &2943931107101536826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5196531749690728303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9203813319220798313} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5369329383939908763 GameObject: m_ObjectHideFlags: 0 @@ -959,7 +1218,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4EC0\u4E48\u662F\u5FEB\u4E50" + m_Text: --- !u!1 &5449208659254963993 GameObject: m_ObjectHideFlags: 0 @@ -1609,7 +1868,7 @@ RectTransform: m_Children: - {fileID: 8218812462647253869} m_Father: {fileID: 3818728531437821566} - 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} @@ -1823,6 +2082,85 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7756404515175255826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4647201884304797506} + - component: {fileID: 2317278536197132997} + - component: {fileID: 3066389533789880932} + m_Layer: 0 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4647201884304797506 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7756404515175255826} + 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: 5372197318280130239} + 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: 664, y: -40} + m_SizeDelta: {x: 62, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2317278536197132997 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7756404515175255826} + m_CullTransparentMesh: 0 +--- !u!114 &3066389533789880932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7756404515175255826} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 200 --- !u!1 &8439731279743654580 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 4d6956a5ed..cf78d495fd 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1985,6 +1985,7 @@ GENERAL_POPUP_TYPE={ --大号通用弹窗 YiJingBaoKu = 30,--易经宝库 YiJingBaoKuRewardPreview = 32,--易经宝库奖励预览 + PracticeStatePreview = 35,--修行境界预览 } --抽卡类型 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 8f4c4e7cc7..e9dad12862 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1397,6 +1397,12 @@ function GetResourcePath(id) return GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, id).Name) end +--- 根据ItemId获取资源名称 +function GetSpriteNameByItemId(id) + local artId = ConfigManager.GetConfigData(ConfigName.ItemConfig, id).ResourceID + return GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArtResourcesConfig, artId).Name) +end + --- 获取玩家头像资源 function GetPlayerHeadSprite(headId) if headId == 0 then headId = 71000 end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index 23f63c71c2..80d38cbdf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -7,16 +7,16 @@ local sorting = 0 --子模块脚本 local contentScripts = { --易经宝库 - [1] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu"), panelName = "GeneralBigPopup_YiJingBaoKu",type=GENERAL_POPUP_TYPE.YiJingBaoKu}, + [GENERAL_POPUP_TYPE.YiJingBaoKu] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu"), panelName = "GeneralBigPopup_YiJingBaoKu"}, --易经宝库奖励预览 - [2] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview"), panelName = "GeneralBigPopup_YiJingBaoKuRewardPreview",type=GENERAL_POPUP_TYPE.YiJingBaoKuRewardPreview}, + [GENERAL_POPUP_TYPE.YiJingBaoKuRewardPreview] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview"), panelName = "GeneralBigPopup_YiJingBaoKuRewardPreview"}, + --修行境界预览 + [GENERAL_POPUP_TYPE.PracticeStatePreview] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview"), panelName = "GeneralBigPopup_PracticeStatePreview"}, } --子模块预设 local contentPrefabs={} --打开弹窗类型 local popupType ---打开弹窗索引 -local index=0 --初始化组件(用于子类重写) function GeneralBigPopup:InitComponent() @@ -26,75 +26,69 @@ function GeneralBigPopup:InitComponent() this.Mask=Util.GetGameObject(this.gameObject,"Mask") --子模块脚本初始化 - for i = 1, #contentScripts do - contentScripts[i].view:InitComponent(Util.GetGameObject(this.contents, contentScripts[i].panelName)) + for key, value in pairs(contentScripts) do + value.view:InitComponent(Util.GetGameObject(this.contents, value.panelName)) end --预设赋值 - for i=1,#contentScripts do - contentPrefabs[i]=Util.GetGameObject(this.contents,contentScripts[i].panelName) + for key, value in pairs(contentScripts) do + contentPrefabs[key]=Util.GetGameObject(this.contents,value.panelName) end end --绑定事件(用于子类重写) function GeneralBigPopup:BindEvent() - for i = 1, #contentScripts do - contentScripts[i].view:BindEvent() + for key, value in pairs(contentScripts) do + value.view:BindEvent() end --返回按钮 - Util.AddClick(this.backBtn,function() + Util.AddClick(this.backBtn,function() + Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) + self:ClosePanel() + end) + Util.AddClick(this.Mask,function() Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) self:ClosePanel() end) end function GeneralBigPopup:AddListener() - for i = 1, #contentScripts do - contentScripts[i].view:AddListener() + for key, value in pairs(contentScripts) do + value.view:AddListener() end end function GeneralBigPopup:RemoveListener() - for i = 1, #contentScripts do - contentScripts[i].view:RemoveListener() + for key, value in pairs(contentScripts) do + value.view:RemoveListener() end end function GeneralBigPopup:OnSortingOrderChange() this.sortingOrder = self.sortingOrder end -local onOpenArgs--临时接的参数 需要onshow刷新的调用 -function GeneralBigPopup:OnOpen(popupType,...) - onOpenArgs = ... - --根据传入类型打开对应面板 - --LogGreen("显示的类型 = "..popupType) - for i,v in pairs(contentScripts) do - if popupType==v.type then - index=i - break - end +function GeneralBigPopup:OnOpen(popupKey,...) + for key, value in pairs(contentPrefabs) do + value.gameObject:SetActive(false) end - for i=1,#contentPrefabs do - contentPrefabs[i].gameObject:SetActive(false) - end - this.Mask:SetActive(index ~= GENERAL_POPUP_TYPE.Onhook) - this.BG:SetActive(index ~= GENERAL_POPUP_TYPE.Onhook) + this.Mask:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) + this.BG:SetActive(popupKey ~= GENERAL_POPUP_TYPE.Onhook) - contentPrefabs[index].gameObject:SetActive(true) - contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参 + contentPrefabs[popupKey].gameObject:SetActive(true) + contentScripts[popupKey].view:OnShow(this,...)--1、传入自己 2、传入不定参 end function GeneralBigPopup:OnShow() end function GeneralBigPopup:OnClose() - for i = 1, #contentScripts do - contentScripts[i].view:OnClose() + for key, value in pairs(contentScripts) do + value.view:OnClose() end end function GeneralBigPopup:OnDestroy() - for i = 1, #contentScripts do - contentScripts[i].view:OnDestroy() + for key, value in pairs(contentScripts) do + value.view:OnDestroy() end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua new file mode 100644 index 0000000000..9525ce537b --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua @@ -0,0 +1,116 @@ +----- 修行境界预览弹窗 ----- +PracticeStatePreview = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local data + +function PracticeStatePreview:InitComponent(gameObject) + self.titleText = Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + self.Grid = Util.GetGameObject(gameObject,"Scroll/Grid") + self.itemPre = Util.GetGameObject(gameObject,"Pre") + self.GameObject = Util.GetGameObject(gameObject,"GameObject") + + local rootHight = self.GameObject.transform.rect.height + local width = self.GameObject.transform.rect.width + self.ScrollView = SubUIManager.Open(SubUIConfig.ScrollFitterView, self.GameObject.transform, + self.itemPre, Vector2.New(width, rootHight), 1, 0) + self.ScrollView.moveTween.MomentumAmount = 1 + self.ScrollView.moveTween.Strength = 2 + + self.preList = {} + self.textList = {} +end + +function PracticeStatePreview:BindEvent() + +end + +function PracticeStatePreview:AddListener() +end + +function PracticeStatePreview:RemoveListener() +end + +function PracticeStatePreview:OnShow(_parent,_args) + parent=_parent + data = _args + sortingOrder = _parent.sortingOrder + --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 + self.titleText.text = "境界预览" + self.previewData = PracticeManager.GetPreViewData() + self.ScrollView:SetData(self.previewData, function(index, go) + self:SetSingleData(index,go,self.previewData[index]) + end) + -- for i = 1, #self.previewData do + -- if not self.preList[i] then + -- self.preList[i] = newObject(self.itemPre) + -- self.preList[i].transform:SetParent(self.Grid.transform) + -- self.preList[i].transform.localScale = Vector3.one + -- self.preList[i].transform.localPosition = Vector3.zero + -- end + -- self.preList[i]:SetActive(false) + -- self:SetSingleData(i,self.preList[i],self.previewData[i]) + -- end + ForceRebuildLayout(self.Grid.transform) + self.ScrollView:SetIndex(PracticeManager.PracticeBigLevel) +end + +function PracticeStatePreview:SetSingleData(index,_go,_data) + local title = Util.GetGameObject(_go,"title/Text"):GetComponent("Text") + local specialText = Util.GetGameObject(_go,"SpecialText"):GetComponent("Text") + local textPre = Util.GetGameObject(_go,"Content/Text") + local content = Util.GetGameObject(_go,"Content") + if not self.textList[_go] then + self.textList[_go] = {} + end + local singleTextList = self.textList[_go] + for k,v in ipairs(singleTextList) do + v.gameObject:SetActive(false) + end + --进行排序 + local templist = {} + for key, value in pairs(_data.AddList) do + local sData = {} + sData.id = key + sData.value = value + table.insert(templist,sData) + end + table.sort(templist,function (a,b) + return a.id < b.id + end) + --显示文字 + for i = 1, #templist do + if not singleTextList[i] then + singleTextList[i] = newObject(textPre) + singleTextList[i].transform:SetParent(content.transform) + singleTextList[i].transform.localScale = Vector3.one + singleTextList[i].transform.localPosition = Vector3.zero + end + local Text = singleTextList[i]:GetComponent("Text") + local string = PracticeManager.GetPreviewSingleText(templist[i].id,templist[i].value) + singleTextList[i]:SetActive(true) + Text.text = string + if _data.IsActive then + Text.text = string.format("%s",string) + end + end + specialText.text = _data.RealmDesc + if _data.IsActive then + specialText.text = string.format("%s",_data.RealmDesc) + end + title.text = string.format("%s期",_data.RealmName) + ForceRebuildLayout(_go.transform) + _go:SetActive(true) +end + +function PracticeStatePreview:OnClose() + +end + +function PracticeStatePreview:OnDestroy() + self.textList = {} +end + +return PracticeStatePreview \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua.meta new file mode 100644 index 0000000000..af17342c9d --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e5ac41a4c429feb4998ac7349bff37b5 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua index ba3b8950e8..8489923c30 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua @@ -45,7 +45,7 @@ end --绑定事件(用于子类重写) function HandBookRoleInfoLayout:BindEvent() Util.AddClick(self.allProButton, function() - UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,heroConFigData,false,nil,true) + UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,heroConFigData,false,nil) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index cf58a9ae21..2ee4016425 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -225,7 +225,7 @@ function this.PlayerInfoRequest(func) PlayerManager.RefreshWorldLeveData(msg.worldLeve) PlayerManager.InitSkinTitleMountData(msg.userSkinList,msg.userTitleList,msg.userMountList) local test = { - level = 1, + level = 10, } PracticeManager.UpdataFromServer(test) if func then diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 9aa17e5ec9..63bb09c352 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -284,7 +284,7 @@ function this.RoleInfo1() Util.AddOnceClick(this.proBtn,function() local guildSkill = nil if this.isOther then guildSkill = curHeroData.guildSkill end - UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,curHeroData.heroConfig,true,guildSkill,true) + UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,curHeroData.heroConfig,true,guildSkill) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 22a8595cd6..090b8ad4df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -1,15 +1,18 @@ PracticeManager = {} local this = PracticeManager local XinXianConfig = ConfigManager.GetConfig(ConfigName.XiuXianConfig) +local PropertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) function this.Initialize() this.PracticeLevel = 1 + this.PracticeBigLevel = 1 this.StarNum = 0 this.PracticeConfigData = {} end --从服务器更新当前修行等级 function this.UpdataFromServer(msg) this.PracticeLevel = msg.level + this.PracticeBigLevel = XinXianConfig[this.PracticeLevel].RealmId this.StarNum = PlayerManager.level end @@ -40,7 +43,7 @@ function this.GetCurAllGetAdd() if not curAllGetAddList[Pros[i][1]] then curAllGetAddList[Pros[i][1]] = 0 end - curAllGetAddList[Pros[i][1]] = Pros[i][2] + curAllGetAddList[Pros[i][1]] = curAllGetAddList[Pros[i][1]] + Pros[i][2] end end return curAllGetAddList @@ -53,15 +56,37 @@ function this.GetAddsList() if not addsList[v.RealmId] then addsList[v.RealmId] = {} end - local Pros = v.TotalPros - for i = 1, #Pros do - if not addsList[v.RealmId][Pros[i][1]] then - addsList[v.RealmId][Pros[i][1]] = 0 + if v.TotalPros then + local Pros = v.TotalPros + for i = 1, #Pros do + if not addsList[v.RealmId][Pros[i][1]] then + addsList[v.RealmId][Pros[i][1]] = 0 + end + addsList[v.RealmId][Pros[i][1]] = addsList[v.RealmId][Pros[i][1]] + Pros[i][2] end - addsList[v.RealmId][Pros[i][1]] = Pros[i][2] end end return addsList end +--获取预览界面数据 +function this.GetPreViewData() + local AddListData = this.GetAddsList() + local previewList = {} + for i = 2, #AddListData do + local data = {} + local configData = ConfigManager.GetConfigDataByKey(ConfigName.XiuXianConfig,"RealmId",i) + data.RealmName = configData.RealmName + data.RealmDesc = configData.RealmDesc + data.IsActive = this.PracticeBigLevel >= i + data.AddList = AddListData[i] + table.insert(previewList,data) + end + return previewList +end + +function this.GetPreviewSingleText(id,value) + return string.format("全体神将%s+%s",PropertyConfig[id].Info,value) +end + return PracticeManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index ccbff1418d..626cac7aea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -28,6 +28,10 @@ function Practice:InitComponent() self.needPre = Util.GetGameObject(self.needs, "pre") self.button = Util.GetGameObject(self.bottom, "Button") self.buttonText = Util.GetGameObject(self.button, "Text"):GetComponent("Text") + self.content = Util.GetGameObject(self.bottom, "Content") + self.textBtn = Util.GetGameObject(self.content, "Text") + self.needStar = Util.GetGameObject(self.content, "num"):GetComponent("Text") + self.itemList = {} end function Practice:BindEvent() @@ -41,14 +45,20 @@ function Practice:BindEvent() self:ClosePanel() end) Util.AddClick(self.previewBtn, function() - LogGreen("self.previewBtn") + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.PracticeStatePreview) end) Util.AddClick(self.additionBtn, function() - UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAdd(),nil,false,nil,false) + UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAdd(),nil,false,nil) end) Util.AddClick(self.imprintBtn, function() LogGreen("self.imprintBtn") end) + Util.AddClick(self.textBtn, function() + LogGreen("打开山河社稷图") + end) + Util.AddClick(self.starBtn, function() + LogGreen("打开山河社稷图") + end) end function Practice:AddListener() @@ -74,13 +84,60 @@ end function Practice:OnShow() FormationManager.RefreshMainFormationPower() + self.curLevelConfig = PracticeManager.GetCurConfigData() self:RefreshMid() + self:RefreshPoints() + self:RefreshBtn() end function Practice:RefreshMid() + self.levelName.text = string.format("%s期",self.curLevelConfig.RealmName) +end + +function Practice:RefreshPoints() -- body end +function Practice:RefreshBtn() + if self.curLevelConfig.LevelUpCost then--如果下级消耗不为空则为突破阶段 + if not self.itemList then + self.itemList = {} + end + for k,v in ipairs(self.itemList) do + v.gameObject:SetActive(false) + end + for i = 1, #self.curLevelConfig.LevelUpCost do + local data = self.curLevelConfig.LevelUpCost[i] + if not self.itemList[i] then + self.itemList[i] = newObject(self.needPre) + self.itemList[i].transform:SetParent(self.needs.transform) + self.itemList[i].transform.localScale = Vector3.one + self.itemList[i].transform.localPosition = Vector3.zero + end + local icon = Util.GetGameObject(self.itemList[i],"icon"):GetComponent("Image") + local num = Util.GetGameObject(self.itemList[i],"num"):GetComponent("Text") + icon.sprite = Util.LoadSprite(GetSpriteNameByItemId(data[1])) + num.text = data[2] + if BagManager.GetTotalItemNum(data[1]) < data[2] then + num.text = string.format("%s",data[2]) + end + self.itemList[i]:SetActive(true) + end + + self.needs:SetActive(true) + self.content:SetActive(false) + self.buttonText.text = Language[11805] + else + self.needs:SetActive(false) + self.content:SetActive(true) + self.needStar.text = self.curLevelConfig.NeedStarNum + if self.curLevelConfig.NeedStarNum < 300 then + self.needStar.text = string.format("%s",self.curLevelConfig.NeedStarNum) + end + self.buttonText.text = "破 境" + end +end + function Practice:OnClose() end @@ -93,6 +150,7 @@ function Practice:OnDestroy() SubUIManager.Close(self.playerInfoView) self.playerInfoView = nil end + self.itemList = {} end return Practice \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index f5bf86bb2a..8c0d563be9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -112,7 +112,7 @@ function RoleInfoLayout:BindEvent() --显示所有属性 Util.AddClick(this.allProButton, function() - UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,curHeroData.heroConfig,true,nil,true) + UIManager.OpenPanel(UIName.RoleProInfoPopup,allAddProVal,curHeroData.heroConfig,true,nil) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua index 03b2b60f14..4fd1c94ec4 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua @@ -14,7 +14,6 @@ local thirdlyProGoList = {} local allAddProVal local heroSConFig local isShowGuild = true -local isShowExtraSkill = true --初始化组件(用于子类重写) function RoleProInfoPopup:InitComponent() this.btnBack=Util.GetGameObject(self.transform, "btnBack") @@ -22,7 +21,6 @@ function RoleProInfoPopup:InitComponent() this.proPre2=Util.GetGameObject(self.gameObject, "proPre2") this.fristGrid=Util.GetGameObject(self.gameObject, "grid/ver/recordPer (1)/Mask") this.secondGrid=Util.GetGameObject(self.gameObject, "grid/ver/recordPer (2)/Mask") - this.secondGridP=Util.GetGameObject(self.gameObject, "grid/ver/recordPer (2)") this.thirdlyGrid=Util.GetGameObject(self.gameObject, "grid/ver/recordPer (3)/Mask") this.thirdlyGridP=Util.GetGameObject(self.gameObject, "grid/ver/recordPer (3)") end @@ -36,13 +34,12 @@ function RoleProInfoPopup:BindEvent() end local guildSkill = nil --界面打开时调用(用于子类重写) -function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSkill,_isShowExtraSkill) +function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSkill) allAddProVal = _allAddProVal heroSConFig = _configData isShowGuild = _isShowGuild--图鉴不显示公会技能等级特殊操作 guildSkill = _guildSkill and _guildSkill or nil--其他玩家公会技能等级特殊操作 - isShowExtraSkill = _isShowExtraSkill for i = 1, #sDataTable do allPro[i] = {} @@ -66,7 +63,6 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk end if isShowGuild then --加公会技能特殊属性 - LogGreen("加公会技能特殊属性") allPro[3][1] = {} local allLv = isShowGuild and GuildSkillManager.GetAllGuildSkillLv(heroSConFig.Profession) or 0 if guildSkill then allLv = guildSkill end @@ -84,13 +80,10 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk end function this.ShowPanelData() this.GridShowData(1,allPro[1],fristProGoList, this.proPre1,this.fristGrid) - if isShowExtraSkill then - this.GridShowData(2,allPro[2],secondProGoList, this.proPre1,this.secondGrid) - end + this.GridShowData(2,allPro[2],secondProGoList, this.proPre1,this.secondGrid) if isShowGuild then this.GridShowData(3,allPro[3],thirdlyProGoList, this.proPre2,this.thirdlyGrid) end - this.secondGridP:SetActive(isShowExtraSkill) this.thirdlyGridP:SetActive(isShowGuild) end function this.GridShowData(type,curAllPro,curProGoList,curPre,curGrid)