From bcf845ae38d854369ff6f1817f199e9a8db2bc8c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 18 May 2021 16:13:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E6=80=8E=E5=8A=A0?= =?UTF-8?q?=E6=8A=80=E8=83=BD=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GeneralPanel/GeneralInfoPopup.prefab | 957 ++++++++++++++++++ .../GeneralPanel/GeneralInfoPopup.prefab.meta | 7 + .../ResConfigs/ResourcePathConfig.asset | 30 +- .../~Lua/Common/GlobalDefine.lua | 5 + Assets/ManagedResources/~Lua/Data/UIData.lua | 1 + .../Modules/GeneralPanel/GeneralInfoPopup.lua | 79 ++ .../GeneralPanel/GeneralInfoPopup.lua.meta | 7 + .../~Lua/Modules/GeneralPanel/View2.meta | 8 + .../View2/GeneralInfoPopup_Imprint.lua | 56 + .../View2/GeneralInfoPopup_Imprint.lua.meta | 7 + .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 8 +- 11 files changed, 1136 insertions(+), 29 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab new file mode 100644 index 0000000000..7774c8595b --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab @@ -0,0 +1,957 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3052509476415502149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3052509476415502148} + - component: {fileID: 3052509476415502145} + - component: {fileID: 7203925036748692626} + - component: {fileID: 6004173931353409386} + m_Layer: 5 + m_Name: GeneralInfoPopup_Imprint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3052509476415502148 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3052509476415502149} + 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: 6151444362320873911} + - {fileID: 6151599779797739583} + - {fileID: 721040562680436164} + - {fileID: 6151219129957021567} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3052509476415502145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3052509476415502149} + m_CullTransparentMesh: 0 +--- !u!114 &7203925036748692626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3052509476415502149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 100 + 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 &6004173931353409386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3052509476415502149} + 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 &4828691113715586599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 721040562680436164} + - component: {fileID: 5848923366732343775} + - component: {fileID: 6191846671788884305} + - component: {fileID: 8993128200813912892} + m_Layer: 5 + m_Name: SkillType + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &721040562680436164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4828691113715586599} + 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: 3052509476415502148} + 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: 522, y: -46} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5848923366732343775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4828691113715586599} + m_CullTransparentMesh: 0 +--- !u!114 &6191846671788884305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4828691113715586599} + 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: cc3ce3a52d2a9ce499d414b1b2116ec6, 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 &8993128200813912892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4828691113715586599} + 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6151219129957021567} + - component: {fileID: 6149370324057953709} + - component: {fileID: 1334369470272148773} + - component: {fileID: 3080958384425441937} + - component: {fileID: 355242659883560113} + m_Layer: 5 + m_Name: CurrentLvDesc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6151219129957021567 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216249597930494229} + 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: 6151553551007391153} + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6149370324057953709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216249597930494229} + m_CullTransparentMesh: 0 +--- !u!114 &1334369470272148773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216249597930494229} + 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: 135 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &3080958384425441937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216249597930494229} + 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: 10 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &355242659883560113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216249597930494229} + 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 &6216491808808945533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6151599779797739583} + - component: {fileID: 6149176665044914933} + - component: {fileID: 6329355504530292757} + - component: {fileID: 7895315240183901157} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6151599779797739583 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216491808808945533} + 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: 3052509476415502148} + 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: 59.5, y: -140} + m_SizeDelta: {x: 90.28, y: 90.28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6149176665044914933 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216491808808945533} + m_CullTransparentMesh: 0 +--- !u!114 &6329355504530292757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216491808808945533} + 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: e6e921a5a561d5e498961f9700fafb22, 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 &7895315240183901157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216491808808945533} + 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 &6216637631868097339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6151553551007391153} + - component: {fileID: 6149103620022806269} + - component: {fileID: 933711904290541085} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6151553551007391153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216637631868097339} + 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: 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_Pivot: {x: 1, y: 1} +--- !u!222 &6149103620022806269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216637631868097339} + m_CullTransparentMesh: 0 +--- !u!114 &933711904290541085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216637631868097339} + 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.7254902, g: 0.68235296, b: 0.5921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B113%\u7684\u7269\u7406\u706B\u7130\u4F24\u5BB3\u9020\u6210\u4F24\u5BB3\u65F6\uFF0C\u6709100%\u7684\u6982\u7387\uFF08+\u6548\u679C\u547D\u4E2D\uFF0910\u79D2\u5185\u9644\u52A0\u6D41\u8840\u6548\u679C\u3002\u5BF9\u751F\u547D\u503C\u6700\u4F4E\u7684\u654C\u4EBA\u9020\u6210\u653B\u51FB\u529B" + LanguageIndex: 0 +--- !u!1 &6216717847381140135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6150816739817875349} + - component: {fileID: 6148922240571101437} + - component: {fileID: 6150398696814194559} + - component: {fileID: 6329370645310369793} + m_Layer: 5 + m_Name: GeneralInfoPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6150816739817875349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216717847381140135} + 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: 9159548010215061646} + - {fileID: 1828482313430278523} + 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 &6148922240571101437 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216717847381140135} + m_CullTransparentMesh: 0 +--- !u!223 &6150398696814194559 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216717847381140135} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &6329370645310369793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216717847381140135} + 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 &6216888323491765455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6151444362320873911} + - component: {fileID: 6149317684752732949} + - component: {fileID: 6329657184582941597} + - component: {fileID: 3615928877557052918} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6151444362320873911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216888323491765455} + 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: 6150960802939930499} + m_Father: {fileID: 3052509476415502148} + 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 &6149317684752732949 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216888323491765455} + m_CullTransparentMesh: 0 +--- !u!114 &6329657184582941597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216888323491765455} + 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 &3615928877557052918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216888323491765455} + 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 &6217009727378251241 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6150960802939930499} + - component: {fileID: 6149661234765335663} + - component: {fileID: 4494667977490913175} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6150960802939930499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6217009727378251241} + 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: 6151444362320873911} + 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 &6149661234765335663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6217009727378251241} + m_CullTransparentMesh: 0 +--- !u!114 &4494667977490913175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6217009727378251241} + 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 &7659852694267176604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1828482313430278523} + - component: {fileID: 5745367617611062506} + - component: {fileID: 4449263723679958019} + - component: {fileID: 2305156568314381917} + - component: {fileID: 2764191947182098959} + m_Layer: 0 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1828482313430278523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659852694267176604} + 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: 3052509476415502148} + m_Father: {fileID: 6150816739817875349} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5745367617611062506 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659852694267176604} + m_CullTransparentMesh: 0 +--- !u!114 &4449263723679958019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659852694267176604} + 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: 58c503111f310224a9a04ab39a004308, 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 &2305156568314381917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659852694267176604} + 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!114 &2764191947182098959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7659852694267176604} + 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: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!1 &8107894537552319360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9159548010215061646} + - component: {fileID: 1208765871042465929} + - component: {fileID: 6463582943458413924} + - component: {fileID: 3344592287840844302} + m_Layer: 5 + m_Name: backBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9159548010215061646 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107894537552319360} + 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: 6150816739817875349} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1208765871042465929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107894537552319360} + m_CullTransparentMesh: 0 +--- !u!114 &6463582943458413924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107894537552319360} + 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} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + 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 &3344592287840844302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8107894537552319360} + 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: 6463582943458413924} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab.meta b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab.meta new file mode 100644 index 0000000000..0bd4408807 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b2db092d8f1f8745b99120b5902ac82 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 75c90f4a1c..fe894db7fe 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -928,6 +928,7 @@ MonoBehaviour: - Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao - Assets/ManagedResources/~Lua/Modules/GeneralPanel - Assets/ManagedResources/~Lua/Modules/GeneralPanel/View + - Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2 - Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl - Assets/ManagedResources/~Lua/Modules/GoodFriend - Assets/ManagedResources/~Lua/Modules/Guide @@ -53736,10 +53737,6 @@ MonoBehaviour: extension: .prefab resPathIndex: 490 resAbNameIndex: 3170 - - resName: "\u9650\u65F6\u5151\u6362\u6D3B\u52A8" - extension: .jpg - resPathIndex: 490 - resAbNameIndex: 3170 - resName: FifteenDayGiftPanel extension: .prefab resPathIndex: 491 @@ -53796,22 +53793,6 @@ MonoBehaviour: extension: .prefab resPathIndex: 493 resAbNameIndex: 3172 - - resName: "\u5C71\u6CB31" - extension: .jpg - resPathIndex: 493 - resAbNameIndex: 3172 - - resName: "\u5C71\u6CB32" - extension: .jpg - resPathIndex: 493 - resAbNameIndex: 3172 - - resName: "\u6700\u4F73\u661F" - extension: .jpg - resPathIndex: 493 - resAbNameIndex: 3172 - - resName: "\u89E3\u9501\u5173\u5361\u6548\u679C" - extension: .jpg - resPathIndex: 493 - resAbNameIndex: 3172 - resName: FindFairyPanel extension: .prefab resPathIndex: 494 @@ -53868,6 +53849,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 499 resAbNameIndex: 3178 + - resName: GeneralInfoPopup + extension: .prefab + resPathIndex: 499 + resAbNameIndex: 3178 - resName: GeneralRankRewardPanel extension: .prefab resPathIndex: 499 @@ -66832,10 +66817,6 @@ MonoBehaviour: extension: .jpg resPathIndex: 828 resAbNameIndex: 3500 - - resName: loding2_jpg - extension: .jpg - resPathIndex: 828 - resAbNameIndex: 3500 - resName: loding3 extension: .jpg resPathIndex: 828 @@ -75363,6 +75344,7 @@ MonoBehaviour: - lz4/atlas/activityaltas.unity3d - lz4/atlas/popupatlas.unity3d - lz4/atlas/publicatlas.unity3d + - lz4/atlas/roleinfoatlas.unity3d - lz4/atlas/tagatlas.unity3d - lz4/atlas/vipatlas.unity3d - lz4/bg/r_guanka_richang_tanchuangdi_xiao.unity3d diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index a6d64588df..5c8f4adf12 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2005,6 +2005,11 @@ GENERAL_POPUP_TYPE={ RecrutDetail = 36, --限时招募奖励详情 } +--通用信息弹窗类型 +GENERALINFO_TYPE = { + Imprint = 1,--紫府神印信息 +} + --抽卡类型 RecruitType = { WaterTen = 1, --水属性十抽 diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 59dd012754..a5a357a91c 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -384,6 +384,7 @@ UIName = { FightLevelOpenChapterPopup = 393,--山河社稷图开启章节弹窗 PracticePanel = 392,--修行 PracticeImprintPanel = 394,--修行神印界面 + GeneralInfoPopup = 395,--通用信息弹窗(类似技能信息界面) } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua new file mode 100644 index 0000000000..85e7f01a95 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua @@ -0,0 +1,79 @@ +----- 信息通用弹窗 ----- +require("Base/BasePanel") +GeneralInfoPopup = Inherit(BasePanel) +local this = GeneralInfoPopup +local sorting = 0 + +--子模块脚本 +local contentScripts = { + --神印信息 + [GENERALINFO_TYPE.Imprint] = {view = require("Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint"), panelName = "GeneralInfoPopup_Imprint"}, +} +--子模块预设 +local contentPrefabs={} + +--初始化组件(用于子类重写) +function GeneralInfoPopup:InitComponent() + this.contents = Util.GetGameObject(this.gameObject,"Content") + this.backBtn = Util.GetGameObject(this.gameObject,"backBtn") + + --子模块脚本初始化 + for key, value in pairs(contentScripts) do + value.view:InitComponent(Util.GetGameObject(this.contents, value.panelName)) + end + --预设赋值 + for key, value in pairs(contentScripts) do + contentPrefabs[key]=Util.GetGameObject(this.contents,value.panelName) + end +end + +--绑定事件(用于子类重写) +function GeneralInfoPopup:BindEvent() + for key, value in pairs(contentScripts) do + value.view:BindEvent() + end + --返回按钮 + Util.AddClick(this.backBtn,function() + self:ClosePanel() + end) +end + +function GeneralInfoPopup:AddListener() + for key, value in pairs(contentScripts) do + value.view:AddListener() + end +end + +function GeneralInfoPopup:RemoveListener() + for key, value in pairs(contentScripts) do + value.view:RemoveListener() + end +end + +function GeneralInfoPopup:OnSortingOrderChange() + this.sortingOrder = self.sortingOrder +end +function GeneralInfoPopup:OnOpen(popupKey,...) + for key, value in pairs(contentPrefabs) do + value.gameObject:SetActive(false) + end + contentPrefabs[popupKey].gameObject:SetActive(true) + contentScripts[popupKey].view:OnShow(this,...)--1、传入自己 2、传入不定参 +end + +function GeneralInfoPopup:OnShow() +end + +function GeneralInfoPopup:OnClose() + for key, value in pairs(contentScripts) do + value.view:OnClose() + end +end + +function GeneralInfoPopup:OnDestroy() + for key, value in pairs(contentScripts) do + value.view:OnDestroy() + end +end + +return GeneralInfoPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua.meta new file mode 100644 index 0000000000..c3ff93f84e --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: edef994ba6a9e054c9441ef9883a5915 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2.meta new file mode 100644 index 0000000000..2cb0daf49c --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb45dc6c74b122c41a9ef6de3ef33939 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua new file mode 100644 index 0000000000..f941518574 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua @@ -0,0 +1,56 @@ +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.withHero=Util.GetGameObject(gameObject,"SkillType"):GetComponent("Image") + this.icon = Util.GetGameObject(gameObject, "Icon"):GetComponent("Image") + this.Text = Util.GetGameObject(gameObject, "CurrentLvDesc/Text"):GetComponent("Text") +end + +--绑定事件(用于子类重写) +function this:BindEvent() +end + +--添加事件监听(用于子类重写) +function this:AddListener() +end + +--移除事件监听(用于子类重写) +function this:RemoveListener() +end + +--界面打开时调用(用于子类重写) +function this:OnShow(_parent,...) + parent=_parent + sortingOrder = _parent.sortingOrder + local _args = {...} + this.skillId = _args[1] + this.heroId = _args[2] + this.skillName.text = XiuXianSkillConfig[this.skillId].Name + this.icon.sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[this.skillId].Icon)) + this.Text.text = XiuXianSkillConfig[this.skillId].Desc + if this.heroId and this.heroId > 0 then + this.withHero.gameObject:SetActive(true) + this.withHero.sprite = Util.LoadSprite(GetSpriteNameByItemId(this.heroId)) + else + this.withHero.gameObject:SetActive(false) + end +end + +--界面关闭时调用(用于子类重写) +function this:OnClose() + this.skillId = nil + this.heroId = nil +end + +--界面销毁时调用(用于子类重写) +function this:OnDestroy() +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua.meta new file mode 100644 index 0000000000..8f796ffb00 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Imprint.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f111f0f7abfc2c469bb43b5520c7f67 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 304e105fe4..e198e71ddb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -327,7 +327,6 @@ function this.FormationAdapter(teamInfo) end --神印信息 - LogBlue("神印数量:"..tostring(#teamInfo.sealShow)) if teamInfo.sealShow and #teamInfo.sealShow > 0 then this.imprintObj:SetActive(true) if not this.imprintItemList then @@ -350,16 +349,15 @@ function this.FormationAdapter(teamInfo) item.gameObject:SetActive(true) local icon = Util.GetGameObject(item,"icon"):GetComponent("Image") local hero = Util.GetGameObject(item,"hero"):GetComponent("Image") - LogBlue("value.id:"..tostring(value.id)) icon.sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[value.id].Icon)) if value.type == 1 then - hero.gameObject:SetActive(false) - hero.sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[value.id].Icon)) + hero.gameObject:SetActive(true) + hero.sprite = Util.LoadSprite(GetSpriteNameByItemId(value.heroTId)) else hero.gameObject:SetActive(false) end Util.AddOnceClick(item.gameObject,function () - LogBlue("显示神印信息") + UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.Imprint,value.id,value.heroTId) end) end else