From e491f58adcfb26718b59dc02295f91ea958ef608 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 19 May 2021 16:14:09 +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/GeneralInfoPopup.prefab | 555 +++++++++++++++++- .../Prefabs/UI/Practice/PracticePanel.prefab | 229 ++++++-- .../~Lua/Common/GlobalDefine.lua | 1 + .../Modules/GeneralPanel/GeneralInfoPopup.lua | 2 + .../View2/GeneralInfoPopup_PracticeLevel.lua | 69 +++ .../GeneralInfoPopup_PracticeLevel.lua.meta | 7 + .../~Lua/Modules/Practice/PracticeManager.lua | 30 +- .../~Lua/Modules/Practice/PracticePanel.lua | 8 +- 8 files changed, 810 insertions(+), 91 deletions(-) create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab index 7774c8595b..3c6c2dda0e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -1,5 +1,186 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2489753912354302467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4319954644975728847} + - component: {fileID: 4780749988992621811} + - component: {fileID: 3670852591525494698} + - component: {fileID: 2592753006823760791} + m_Layer: 5 + m_Name: GeneralInfoPopup_PracticeLevel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4319954644975728847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489753912354302467} + 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: 1848461887355536435} + - {fileID: 2349096526889207542} + - {fileID: 1666148628928029192} + m_Father: {fileID: 1828482313430278523} + 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: 300, y: 0} + m_SizeDelta: {x: 600, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4780749988992621811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489753912354302467} + m_CullTransparentMesh: 0 +--- !u!114 &3670852591525494698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489753912354302467} + 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: 95 + m_Bottom: 20 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &2592753006823760791 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2489753912354302467} + 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 &2992713979510593098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2349096526889207542} + - component: {fileID: 4015549160615639380} + - component: {fileID: 6718890111010751954} + - component: {fileID: 5203451872181438947} + m_Layer: 5 + m_Name: State + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2349096526889207542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992713979510593098} + 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: 4319954644975728847} + 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: 522, y: -46} + m_SizeDelta: {x: 169, y: 91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4015549160615639380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992713979510593098} + m_CullTransparentMesh: 0 +--- !u!114 &6718890111010751954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992713979510593098} + 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: e1a3a6e8d9656134585a95966d5d3650, 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 &5203451872181438947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992713979510593098} + 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 &3052509476415502149 GameObject: m_ObjectHideFlags: 0 @@ -18,7 +199,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3052509476415502148 RectTransform: m_ObjectHideFlags: 0 @@ -37,10 +218,10 @@ RectTransform: m_Father: {fileID: 1828482313430278523} 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: 300, y: 0} - m_SizeDelta: {x: 600, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 300, y: -145} + m_SizeDelta: {x: 600, y: 290} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3052509476415502145 CanvasRenderer: @@ -87,6 +268,97 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &3490801065415971355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1666148628928029192} + - component: {fileID: 902351682421173202} + - component: {fileID: 7532533970890363527} + - component: {fileID: 4230509375919744565} + m_Layer: 5 + m_Name: AddList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1666148628928029192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3490801065415971355} + 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: 5787338837616855497} + m_Father: {fileID: 4319954644975728847} + 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: 550, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &902351682421173202 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3490801065415971355} + m_CullTransparentMesh: 0 +--- !u!114 &7532533970890363527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3490801065415971355} + 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: 100 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &4230509375919744565 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3490801065415971355} + 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: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 250, y: 30} + m_Spacing: {x: 30, y: 10} + m_Constraint: 1 + m_ConstraintCount: 2 --- !u!1 &4828691113715586599 GameObject: m_ObjectHideFlags: 0 @@ -182,6 +454,102 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &5990311461964822248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1848461887355536435} + - component: {fileID: 6716157028514333187} + - component: {fileID: 8476789986069861455} + - component: {fileID: 7650655137438352908} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1848461887355536435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990311461964822248} + 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: 3475325774707638732} + m_Father: {fileID: 4319954644975728847} + 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: -43} + m_SizeDelta: {x: 265.96, y: 54.44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6716157028514333187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990311461964822248} + m_CullTransparentMesh: 0 +--- !u!114 &8476789986069861455 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990311461964822248} + 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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &7650655137438352908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5990311461964822248} + 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 &6216249597930494229 GameObject: m_ObjectHideFlags: 0 @@ -217,10 +585,10 @@ RectTransform: m_Father: {fileID: 3052509476415502148} 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: 350, y: 0} - m_SizeDelta: {x: 466.6, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 350, y: -182.5} + m_SizeDelta: {x: 466.6, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6149370324057953709 CanvasRenderer: @@ -414,10 +782,10 @@ RectTransform: m_Father: {fileID: 6151219129957021567} 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: 466.6, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 466.6, y: 0} + m_SizeDelta: {x: 466.6, y: 165} m_Pivot: {x: 1, y: 1} --- !u!222 &6149103620022806269 CanvasRenderer: @@ -756,6 +1124,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3052509476415502148} + - {fileID: 4319954644975728847} m_Father: {fileID: 6150816739817875349} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -838,6 +1207,86 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 1 +--- !u!1 &8039350172597770738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3475325774707638732} + - component: {fileID: 7769932233319512434} + - component: {fileID: 7039880715611908333} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3475325774707638732 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039350172597770738} + 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: 1848461887355536435} + 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.000015259, y: 0.0000017881} + m_SizeDelta: {x: 197.07, y: 47.75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7769932233319512434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039350172597770738} + m_CullTransparentMesh: 0 +--- !u!114 &7039880715611908333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8039350172597770738} + 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.85490197, g: 0.5882353, b: 0.28627452, 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: 41 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 70 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u51A5\u754C\u5904\u5211\u4EBA" + LanguageIndex: 0 --- !u!1 &8107894537552319360 GameObject: m_ObjectHideFlags: 0 @@ -955,3 +1404,83 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8393110287184769600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5787338837616855497} + - component: {fileID: 4336837941257793494} + - component: {fileID: 2237713030864208332} + m_Layer: 0 + m_Name: TextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5787338837616855497 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8393110287184769600} + 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: 1666148628928029192} + 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: 275, y: -50} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4336837941257793494 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8393110287184769600} + m_CullTransparentMesh: 0 +--- !u!114 &2237713030864208332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8393110287184769600} + 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: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5168\u4F53\u795E\u5C06\u751F\u547D+3000" + LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 1de2d5dfec..e33e9c1148 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -1,5 +1,100 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &236404547680661745 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4523639904066178194} + - component: {fileID: 4132982950473923770} + - component: {fileID: 1615172727457636426} + - component: {fileID: 6686247015492595379} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4523639904066178194 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236404547680661745} + 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: 8807105563129826786} + 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: 15, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4132982950473923770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236404547680661745} + m_CullTransparentMesh: 0 +--- !u!114 &1615172727457636426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236404547680661745} + 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: 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: d38e3374b8a87b34e882b369c8495b6b, 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 &6686247015492595379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236404547680661745} + 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 &295726756243471935 GameObject: m_ObjectHideFlags: 0 @@ -223,7 +318,6 @@ GameObject: m_Component: - component: {fileID: 8807105563129826786} - component: {fileID: 4230894382925717242} - - component: {fileID: 661979098794955723} - component: {fileID: 6121294742586918117} - component: {fileID: 8398466598523843351} m_Layer: 0 @@ -244,6 +338,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4523639904066178194} - {fileID: 6221533122666711843} - {fileID: 3622190786580193854} m_Father: {fileID: 6999176096490070205} @@ -262,35 +357,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947630895134714189} m_CullTransparentMesh: 0 ---- !u!114 &661979098794955723 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1947630895134714189} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.8396226, g: 0.20990565, b: 0.20990565, 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: 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 &6121294742586918117 MonoBehaviour: m_ObjectHideFlags: 0 @@ -359,7 +425,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8807105563129826786} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -756,6 +822,8 @@ GameObject: - component: {fileID: 5169296584388764232} - component: {fileID: 2667649465975523313} - component: {fileID: 9070526893923265235} + - component: {fileID: 4997751357446514661} + - component: {fileID: 36248775629252407} m_Layer: 0 m_Name: PointPre m_TagString: Untagged @@ -819,6 +887,67 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4997751357446514661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550922682031489889} + 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: 9070526893923265235} + 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 &36248775629252407 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550922682031489889} + 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 &4208685104409804932 GameObject: m_ObjectHideFlags: 0 @@ -895,7 +1024,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8807105563129826786} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1939,7 +2068,7 @@ RectTransform: 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: 88} + m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 880, y: 362.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5551580922573562726 @@ -2374,7 +2503,6 @@ GameObject: m_Component: - component: {fileID: 9073860018243356351} - component: {fileID: 35816503056969807} - - component: {fileID: 7937028479310424092} m_Layer: 0 m_Name: Items m_TagString: Untagged @@ -2399,7 +2527,7 @@ RectTransform: 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: 88} + m_AnchoredPosition: {x: 0, y: 16} m_SizeDelta: {x: 880, y: 362.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &35816503056969807 @@ -2410,35 +2538,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8579852649922511585} m_CullTransparentMesh: 0 ---- !u!114 &7937028479310424092 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8579852649922511585} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5330188, g: 1, b: 0.53858584, a: 0.38431373} - 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!1 &8693386892191277313 GameObject: m_ObjectHideFlags: 0 @@ -2474,7 +2573,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -0.42500305} - m_SizeDelta: {x: 270, y: 33} + m_SizeDelta: {x: 180, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3957007979703055167 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 5c8f4adf12..8dd01288e0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2008,6 +2008,7 @@ GENERAL_POPUP_TYPE={ --通用信息弹窗类型 GENERALINFO_TYPE = { Imprint = 1,--紫府神印信息 + PracticeLevel = 2,--修行界面小点的信息 } --抽卡类型 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua index 85e7f01a95..f2fe32b40e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua @@ -8,6 +8,8 @@ local sorting = 0 local contentScripts = { --神印信息 [GENERALINFO_TYPE.Imprint] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint"), panelName = "GeneralInfoPopup_Imprint"}, + --修行界面小点的信息 + [GENERALINFO_TYPE.PracticeLevel] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel"), panelName = "GeneralInfoPopup_PracticeLevel"}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua new file mode 100644 index 0000000000..2a712a7f37 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua @@ -0,0 +1,69 @@ +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig) + +--初始化组件(用于子类重写) +function this:InitComponent(gameObject) + this.skillName = Util.GetGameObject(gameObject, "Title/Text"):GetComponent("Text") + -- this.state=Util.GetGameObject(gameObject,"State"):GetComponent("Image") + this.addList = Util.GetGameObject(gameObject, "AddList") + this.TextPre = Util.GetGameObject(this.addList, "TextPre") + this.addTextList = {} +end + +--绑定事件(用于子类重写) +function this:BindEvent() +end + +--添加事件监听(用于子类重写) +function this:AddListener() +end + +--移除事件监听(用于子类重写) +function this:RemoveListener() +end + +--界面打开时调用(用于子类重写) +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + local _args = {...} + local data = _args[1] + this.skillName.text = data.RealmName + + if not this.addTextList then + this.addTextList = {} + end + for k,v in ipairs(this.addTextList) do + v.gameObject:SetActive(false) + end + for i = 1, #data.TotalPros do + local adddata = data.TotalPros[i] + if not this.addTextList[i] then + this.addTextList[i] = newObject(this.TextPre) + this.addTextList[i].transform:SetParent(this.addList.transform) + this.addTextList[i].transform.localScale = Vector3.one + this.addTextList[i].transform.localPosition = Vector3.zero + end + this.addTextList[i]:SetActive(true) + local str = PracticeManager.GetSingleAddition(adddata) + this.addTextList[i]:GetComponent("Text").text = str + if data.State == 1 then + this.addTextList[i]:GetComponent("Text").text = string.format("%s",str) + end + end +end + +--界面关闭时调用(用于子类重写) +function this:OnClose() +end + +--界面销毁时调用(用于子类重写) +function this:OnDestroy() + this.addTextList = {} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua.meta new file mode 100644 index 0000000000..b1d4930a11 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: efd0c0891f5dbd54cb95f1f185e33ab7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index 1b8e612df0..2d38353de5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -185,7 +185,7 @@ function this.UpdataImprintDataFromServer(_imprintList) this.ImprintServerData[value.id].type = value.type this.ImprintServerData[value.id].subId = value.subId this.ImprintServerData[value.id].state = value.state - LogBlue("value.id:"..tostring(value.id).." value.type:"..tostring(value.type).." value.subId:"..tostring(value.subId).." value.state:"..tostring(value.state)) + -- LogBlue("value.id:"..tostring(value.id).." value.type:"..tostring(value.type).." value.subId:"..tostring(value.subId).." value.state:"..tostring(value.state)) if value.state == 1 then this.BigLevelImprintList[XiuXianSkillConfig[value.id].UnlockId] = value.id if value.subId ~= nil and value.subId ~= "" and value.subId ~= "nil" then @@ -258,11 +258,11 @@ function this.GetPointsData(parentObj) for i = 1, #this.PointsData do if i <= mid then local x = (i - mid) * perSpace - perSpace/2 - local y = math.pow(-1,i) * 100 + local y = math.pow(-1,i) * 60 this.PointsData[i].Pos = Vector3.New(x,y,0) elseif i > mid then local x = (i - mid -1) * perSpace + perSpace/2 - local y = math.pow(-1,i) * 100 + local y = math.pow(-1,i) * 60 this.PointsData[i].Pos = Vector3.New(x,y,0) end end @@ -272,14 +272,14 @@ function this.GetPointsData(parentObj) for i = 1, #this.PointsData do if i < mid then local x = (i - mid) * perSpace - local y = math.pow(-1,i) * 100 + local y = math.pow(-1,i) * 60 this.PointsData[i].Pos = Vector3.New(x,y,0) elseif i > mid then local x = (i - mid) * perSpace - local y = math.pow(-1,i) * 100 + local y = math.pow(-1,i) * 60 this.PointsData[i].Pos = Vector3.New(x,y,0) elseif i == mid then - local y = math.pow(-1,i) * 100 + local y = math.pow(-1,i) * 60 this.PointsData[i].Pos = Vector3.New(0,y,0) end end @@ -296,10 +296,13 @@ function this.GetLinesData() local x = (this.PointsData[i].Pos.x + this.PointsData[i + 1].Pos.x)/2 data.Pos = Vector3.New(x,0,0) local r = math.acos((this.PointsData[i + 1].Pos.x - this.PointsData[i].Pos.x)/(this.PointsData[i + 1].Pos.y - this.PointsData[i].Pos.y)) - data.Rota = Vector3.New(0,0,(r/math.pi)* 180) + if (r/math.pi)* 180 > 90 then + data.Rota = Vector3.New(0,0,(r/math.pi)* 180 - 10) + else + data.Rota = Vector3.New(0,0,(r/math.pi)* 180 + 10) + end data.State = this.PointsData[i + 1].State table.insert(this.LinesData,data) - -- LogRed("data.Rota:"..tostring(data.Rota)) end end return this.LinesData @@ -310,12 +313,19 @@ function this.CalculateWorldPos(...) local pos = Vector3.New(0,0,0) for i = 1, #_args do local objPos = _args[i]:GetComponent("RectTransform").localPosition - LogGreen("objPos:"..tostring(objPos)) pos.x = pos.x + objPos.x pos.y = pos.y + objPos.y end - LogYellow("pos:"..tostring(pos)) return pos end +function this.GetSingleAddition(_data) + local data = PropertyConfig[_data[1]] + if data.Style == 2 then + return string.format("全体%s+%s",data.Info,_data[2]/100).."%" + elseif data.Style == 1 then + return string.format("全体%s+%s",data.Info,_data[2]) + end +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 a96f7bdf32..dc3da5f8b8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -113,8 +113,6 @@ end function Practice:OnOpen() self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Main }) self.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice }) - self.pointData = PracticeManager.GetPointsData() - self.lineData = PracticeManager.GetLinesData() end function Practice:OnSortingOrderChange() @@ -132,11 +130,12 @@ function Practice:OnShow() LogYellow("当前修行等级Id:"..tostring(PracticeManager.PracticeLevel)) oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) oldBigLevel = PracticeManager.PracticeBigLevel + self.pointData = PracticeManager.GetPointsData() + self.lineData = PracticeManager.GetLinesData() self:RefreshMid() self:RefreshPoints() self:RefreshLines() self:RefreshBtn() - -- self.items:GetComponent("HorizontalLayoutGroup").enabled = false end function Practice:RefreshMid() @@ -163,6 +162,9 @@ function Practice:RefreshPoints() self.pointList[i]:SetActive(true) self.pointList[i]:GetComponent("Image").sprite = Util.LoadSprite(data.Img) self.pointList[i]:GetComponent("RectTransform").localPosition = data.Pos + Util.AddOnceClick(self.pointList[i],function () + UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.PracticeLevel,data) + end) end end