From 576400a9141e9d4cc102eea470d61f52c8e74caa Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 23 Feb 2021 20:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=95=86=E5=BA=97=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=8C=96=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Guild/Aid/GuildAidMainPopup.prefab | 10 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 126 +++++++++++++++--- .../Prefabs/UI/Shop/MainShopPanel.prefab | 24 ++-- .../Prefabs/UI/View/ShopView.prefab | 70 +++++----- .../Popup/View/GeneralPopup_GuildAid.lua | 4 +- 5 files changed, 162 insertions(+), 72 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 52bcc35975..061cad8e31 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -3012,7 +3012,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3770032720140774718 RectTransform: m_ObjectHideFlags: 0 @@ -5046,7 +5046,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4080728017189381547 RectTransform: m_ObjectHideFlags: 0 @@ -6101,8 +6101,8 @@ 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.79999995, y: 15.299999} - m_SizeDelta: {x: 229.5, y: 64.4} + m_AnchoredPosition: {x: -13, y: 15.3} + m_SizeDelta: {x: 308.3, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2339772965240325473 CanvasRenderer: @@ -6143,7 +6143,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u65E0\u63F4\u52A9\u8BB0\u5F55\uFF01" LanguageIndex: 10691 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index eadd846504..506afaccd0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -497,15 +497,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 487726975} - - {fileID: 1301902051} - m_Father: {fileID: 772776595} - m_RootOrder: 4 + m_Father: {fileID: 6995400214349800738} + 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: -162, y: -120} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -33.6} m_SizeDelta: {x: 52, y: 52} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &284160509 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1092,7 +1091,7 @@ RectTransform: - {fileID: 7975000001443236482} - {fileID: 900830217} - {fileID: 7974999999455169579} - - {fileID: 284160505} + - {fileID: 6995400214349800738} m_Father: {fileID: 2925180131101153177} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1522,6 +1521,7 @@ GameObject: - component: {fileID: 1301902051} - component: {fileID: 1301902053} - component: {fileID: 6575776750908550804} + - component: {fileID: 6231528232191578895} m_Layer: 5 m_Name: desText m_TagString: Untagged @@ -1540,13 +1540,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 284160505} + m_Father: {fileID: 6995400214349800738} 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: 229, y: -2.75} - m_SizeDelta: {x: 381, y: 64.400024} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 196, y: -33.6} + m_SizeDelta: {x: 288, y: 64.400024} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1301902053 CanvasRenderer: @@ -1591,6 +1591,20 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5411\u519B\u56E2\u53D1\u9001\u6C42\u52A9\u4FE1\u606F" LanguageIndex: 11258 +--- !u!114 &6231528232191578895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1301902050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &1498685830 GameObject: m_ObjectHideFlags: 0 @@ -13640,6 +13654,82 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3361596915025565561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6995400214349800738} + - component: {fileID: 2227141160331573166} + - component: {fileID: 1935726305058736477} + m_Layer: 5 + m_Name: toggleGrid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6995400214349800738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361596915025565561} + 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: 284160505} + - {fileID: 1301902051} + m_Father: {fileID: 772776595} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -1091} + m_SizeDelta: {x: 340, y: 67.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2227141160331573166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361596915025565561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &1935726305058736477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3361596915025565561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3378558232872165276 GameObject: m_ObjectHideFlags: 0 @@ -29128,8 +29218,8 @@ 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: 6.1, y: 0.00000095367} - m_SizeDelta: {x: 157.13, y: 65.07} + m_AnchoredPosition: {x: 1.27, y: 0.00000095367} + m_SizeDelta: {x: 207.32, y: 65.07} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7975000000850940474 CanvasRenderer: @@ -29163,9 +29253,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 50 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab index 6dc347a2a5..de64ac9c14 100644 --- a/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Shop/MainShopPanel.prefab @@ -1997,13 +1997,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 68 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 36 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u79D8\u76D2" @@ -2084,8 +2084,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 15 --- !u!114 &4248997613010456639 @@ -2400,8 +2400,8 @@ MonoBehaviour: m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 15/999 --- !u!1 &4857381738344094692 @@ -3398,8 +3398,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 99 --- !u!1 &8101958348746894109 @@ -3705,8 +3705,8 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 15 --- !u!1 &8930824439957761011 diff --git a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab index b410bd3549..778dab13eb 100644 --- a/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/View/ShopView.prefab @@ -112,7 +112,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -202, y: -210.7002} + m_AnchoredPosition: {x: -265, y: -210.7002} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &114166121189536506 @@ -153,7 +153,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224547074834770662 RectTransform: m_ObjectHideFlags: 0 @@ -170,9 +170,9 @@ RectTransform: m_Father: {fileID: 224254759599357364} 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: 80, y: -105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1054637157596550 @@ -190,7 +190,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224462614062270240 RectTransform: m_ObjectHideFlags: 0 @@ -208,9 +208,9 @@ RectTransform: m_Father: {fileID: 224254759599357364} 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: 80, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1080514213629064 @@ -433,14 +433,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 32 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 32 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u53EF\u4EE5\u5BF9\u4E00\u90E8\u5206\u5C5E\u6027\u4E0D\u6EE1\u610F\u7684\u88C5\u5907\u8FDB\u884C\u91CD\u94F8\u3002" LanguageIndex: 11736 @@ -800,7 +800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224102333840981178 RectTransform: m_ObjectHideFlags: 0 @@ -818,9 +818,9 @@ RectTransform: m_Father: {fileID: 224254759599357364} 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: 80, y: -60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1277509184846116 @@ -1823,7 +1823,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -155} + m_AnchoredPosition: {x: 80, y: -195} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1597721185247420 @@ -4412,7 +4412,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2335866646189078014 RectTransform: m_ObjectHideFlags: 0 @@ -4430,9 +4430,9 @@ RectTransform: m_Father: {fileID: 224254759599357364} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3815434678658175326 @@ -4547,10 +4547,10 @@ RectTransform: m_Father: {fileID: 263293912524233859} 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: 285.26, y: -25} - m_SizeDelta: {x: 60, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3795685100183754330 CanvasRenderer: @@ -4942,10 +4942,10 @@ RectTransform: m_Father: {fileID: 263293912524233859} 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: 222.13, y: -25} - m_SizeDelta: {x: 41, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5421243534367741568 CanvasRenderer: @@ -5157,10 +5157,10 @@ RectTransform: m_Father: {fileID: 263293912524233859} 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: 94.5, y: -25} - m_SizeDelta: {x: 189, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2265021156687764855 CanvasRenderer: @@ -5278,7 +5278,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -11.589966, y: 0} - m_SizeDelta: {x: 315.26, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4210773974311950259 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua index 28b03ec935..b039e13d02 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildAid.lua @@ -16,8 +16,8 @@ local upSelectChipId = 0 local isHaveLock = false function this:InitComponent(gameObject) this.aidBtn=Util.GetGameObject(gameObject,"aidBtn") - this.btnSelect=Util.GetGameObject(gameObject,"btnSelect") - this.SelectImage=Util.GetGameObject(gameObject,"btnSelect/SelectImage") + this.btnSelect=Util.GetGameObject(gameObject,"toggleGrid/btnSelect") + this.SelectImage=Util.GetGameObject(this.btnSelect,"SelectImage") this.BodyText=Util.GetGameObject(gameObject,"Body/Text"):GetComponent("Text") for i = 1, 4 do itemList[i] = Util.GetGameObject(gameObject, "Root/frame (".. i ..")")