From d5799c10306eed4d499ce16081157a13604b5339 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 12 May 2021 18:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E7=A5=9E?= =?UTF-8?q?=E5=8D=B0=E7=95=8C=E9=9D=A2=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralBigPopup.prefab | 161 +--------- .../UI/Practice/PracticeImprintPanel.prefab | 299 ++++++++++++++++++ .../Practice/PracticeImprintPanel.prefab.meta | 7 + .../ResConfigs/ResourcePathConfig.asset | 6 + Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + .../GeneralBigPopup_PracticeStatePreview.lua | 13 +- .../~Lua/Modules/Net/NetManager.lua | 8 + .../Modules/Practice/PracticeImprintPanel.lua | 36 +++ .../Practice/PracticeImprintPanel.lua.meta | 7 + .../~Lua/Modules/Practice/PracticePanel.lua | 2 +- 10 files changed, 368 insertions(+), 172 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 2902dc4ebf..74e7803656 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -1632,80 +1632,6 @@ 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 @@ -2435,7 +2361,6 @@ RectTransform: m_Children: - {fileID: 5535942404172630535} - {fileID: 1126952660353491259} - - {fileID: 6607447267803307823} - {fileID: 1815702843280761573} m_Father: {fileID: 2423465471356683207} m_RootOrder: 3 @@ -3045,88 +2970,6 @@ 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 @@ -3217,7 +3060,7 @@ GameObject: m_Component: - component: {fileID: 1815702843280761573} m_Layer: 0 - m_Name: GameObject + m_Name: Scroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3235,7 +3078,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5455853077341739355} - m_RootOrder: 3 + 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} diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab new file mode 100644 index 0000000000..62e13a4480 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -0,0 +1,299 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &329201679138008893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 544039711229597497} + - component: {fileID: 541674568406536899} + - component: {fileID: 542912575994419375} + - component: {fileID: 362308231308830979} + m_Layer: 5 + m_Name: PracticeImprintPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &544039711229597497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329201679138008893} + 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: 3155037457294790606} + - {fileID: 6288891644257010922} + m_Father: {fileID: 0} + 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 &541674568406536899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329201679138008893} + m_CullTransparentMesh: 0 +--- !u!223 &542912575994419375 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329201679138008893} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &362308231308830979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 329201679138008893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &630307970642872779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6288891644257010922} + - component: {fileID: 1512933146085313963} + - component: {fileID: 6304380913082207448} + - component: {fileID: 4157447675225834282} + - component: {fileID: 1482759605766385159} + m_Layer: 5 + m_Name: backBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6288891644257010922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630307970642872779} + 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: 544039711229597497} + 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: 70, y: 90} + m_SizeDelta: {x: 140, y: 121} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1512933146085313963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630307970642872779} + m_CullTransparentMesh: 0 +--- !u!114 &6304380913082207448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630307970642872779} + 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: 2887ec8dbdcb57242a540f77f7cb5a72, 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 &4157447675225834282 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630307970642872779} + 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: 6304380913082207448} + 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 &1482759605766385159 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630307970642872779} + 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 &6666787453601173780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3155037457294790606} + - component: {fileID: 1251302194121126265} + - component: {fileID: 2604184982973731140} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3155037457294790606 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6666787453601173780} + 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: 544039711229597497} + 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 &1251302194121126265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6666787453601173780} + m_CullTransparentMesh: 0 +--- !u!114 &2604184982973731140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6666787453601173780} + 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: 733e18a54e8754440bedaf8bcc4e88f7, 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 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab.meta b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab.meta new file mode 100644 index 0000000000..2e2ed54259 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f416df18c672ebc47b395b43e09f3950 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 687b1ea0f3..3c89252e6e 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -54222,6 +54222,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 528 resAbNameIndex: 3204 + - resName: PracticeImprintPanel + extension: .prefab + resPathIndex: 529 + resAbNameIndex: 3204 - resName: PracticePanel extension: .prefab resPathIndex: 529 @@ -75091,9 +75095,11 @@ MonoBehaviour: - lz4/publicartres/models.unity3d - assetBundleName: lz4/prefabs/ui/generalpanel.unity3d dependences: + - lz4/atlas/activityaltas.unity3d - lz4/atlas/popupatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/atlas/tagatlas.unity3d + - lz4/atlas/vipatlas.unity3d - lz4/bg/r_guanka_richang_tanchuangdi_xiao.unity3d - lz4/dynamicatlas/r_lianzao_gongxihuodebeiban_di.unity3d - lz4/dynamicatlas/r_tanchuang_erji_002.unity3d diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index fb7e48b7ec..c343535890 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -379,6 +379,7 @@ UIName = { StoryMapPanel = 387, -- 剧情 TaSuiLingXiaoPanel = 388,--踏碎凌霄 PracticePanel = 392,--修行 + PracticeImprintPanel = 394,--修行神印界面 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua index 9525ce537b..449624cc7e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua @@ -8,9 +8,8 @@ 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") + self.GameObject = Util.GetGameObject(gameObject,"Scroll") local rootHight = self.GameObject.transform.rect.height local width = self.GameObject.transform.rect.width @@ -43,16 +42,6 @@ function PracticeStatePreview:OnShow(_parent,_args) 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 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2ee4016425..4329de00cd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4995,4 +4995,12 @@ function this.TasuilingxiaoRequest(activityId,func) end end) end + +--修行突破请求 +function this.PracticeUpgradeRequest(func) +end + +--修行神印请求 +function this.PracticeImprintRequest(oldImprintId,newImprintId,heroId,func) +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua new file mode 100644 index 0000000000..77aa7de04a --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -0,0 +1,36 @@ +local PracticeImprint = quick_class("PracticeImprint", BasePanel) +local orginLayer + +function PracticeImprint:InitComponent() + self.backBtn = Util.GetGameObject(self.gameObject, "backBtn") +end + +function PracticeImprint:BindEvent() + Util.AddClick(self.backBtn, function() + self:ClosePanel() + end) +end + +function PracticeImprint:AddListener() +end + +function PracticeImprint:RemoveListener() +end + +--待功能扩展(试图打开某个状态) +function PracticeImprint:OnOpen() +end + +function PracticeImprint:OnSortingOrderChange() +end + +function PracticeImprint:OnShow() +end + +function PracticeImprint:OnClose() +end + +function PracticeImprint:OnDestroy() +end + +return PracticeImprint \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua.meta b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua.meta new file mode 100644 index 0000000000..05d07efebd --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c19177508df021f4eb880fb95f5b5160 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index 626cac7aea..6928cbfd25 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -51,7 +51,7 @@ function Practice:BindEvent() UIManager.OpenPanel(UIName.RoleProInfoPopup,PracticeManager.GetCurAllGetAdd(),nil,false,nil) end) Util.AddClick(self.imprintBtn, function() - LogGreen("self.imprintBtn") + UIManager.OpenPanel(UIName.PracticeImprintPanel) end) Util.AddClick(self.textBtn, function() LogGreen("打开山河社稷图")