From 22dcb8c48780c0ea8a0ff6659457aa7908d683a1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 24 Feb 2021 10:44:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BA=A2=E5=8C=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Guild/RedPacketView/RedPacketPanel.prefab | 214 ++++++++++++------ 1 file changed, 149 insertions(+), 65 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab index e05a191958..46baca4a73 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &129910163093391144 RectTransform: m_ObjectHideFlags: 0 @@ -169,8 +169,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: "\u4ECA\u65E5\u8FD8\u53EF\u53D1\uFF0830\uFF09" LanguageIndex: 0 @@ -192,7 +192,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4933192424113964483 RectTransform: m_ObjectHideFlags: 0 @@ -400,9 +400,9 @@ RectTransform: m_Father: {fileID: 5999320900213361379} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 192.775, y: -31.85} m_SizeDelta: {x: 157.55, y: 63.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &811009747699120607 @@ -881,7 +881,7 @@ RectTransform: - {fileID: 8426497911705375594} - {fileID: 5999320900213361379} - {fileID: 4351588488149147503} - - {fileID: 4436316685966890284} + - {fileID: 6950021899630084439} m_Father: {fileID: 129910163093391144} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1012,8 +1012,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 52 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 52 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1781,17 +1781,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2747208570209068212} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 4436316685966890284} - m_RootOrder: 0 + m_Father: {fileID: 6950021899630084439} + 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: 113.44, y: 0.0000061989} - m_SizeDelta: {x: 644.08, y: 122.6} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 228, y: -61.3} + m_SizeDelta: {x: 0, y: 122.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3315926624498439426 CanvasRenderer: @@ -2318,10 +2318,10 @@ RectTransform: m_Father: {fileID: 8426497911705375594} 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: 80.5, y: 0} - m_SizeDelta: {x: 0, y: 63.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 80.5, y: -31.85} + m_SizeDelta: {x: 161, y: 63.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6569857270438572971 CanvasRenderer: @@ -2693,9 +2693,9 @@ RectTransform: m_Father: {fileID: 8426497911705375594} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 299.066, y: -31.85} m_SizeDelta: {x: 157.55, y: 63.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6081317573511045000 @@ -2822,7 +2822,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -424.905, y: 0.000015258789} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 783, y: 42} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3466327663348735508 CanvasRenderer: @@ -3019,7 +3019,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6765\u81EA \u5C0F\u9B54\u4ED9" LanguageIndex: 0 @@ -3061,7 +3061,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 278, y: 88} - m_SizeDelta: {x: 0, y: 63.7} + m_SizeDelta: {x: 271.55, y: 63.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5268823493485138596 CanvasRenderer: @@ -3177,14 +3177,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u67E5\u770B\u8BB0\u5F55" LanguageIndex: 0 @@ -3375,10 +3375,10 @@ RectTransform: m_Father: {fileID: 5999320900213361379} 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: 57, y: 0} - m_SizeDelta: {x: 0, y: 63.7} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 57, y: -31.85} + m_SizeDelta: {x: 114, y: 63.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4259227450090026131 CanvasRenderer: @@ -3529,7 +3529,7 @@ GameObject: - component: {fileID: 2293772108465784614} - component: {fileID: 6587229666074931019} m_Layer: 5 - m_Name: Reward + m_Name: tip m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3542,18 +3542,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5455204614114428542} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2402396322299635209} - m_Father: {fileID: 770623558319233362} - m_RootOrder: 4 + m_Children: [] + m_Father: {fileID: 6950021899630084439} + 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: 10.575, y: -128} - m_SizeDelta: {x: 870.95, y: 122.6} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 114, y: -61.3} + m_SizeDelta: {x: 228, y: 122.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2293772108465784614 CanvasRenderer: @@ -3932,10 +3931,10 @@ RectTransform: m_Father: {fileID: 4351588488149147503} 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: 95, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 95, y: -21} + m_SizeDelta: {x: 190, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6469300157641790197 CanvasRenderer: @@ -4974,9 +4973,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 35 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 35 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -5408,9 +5407,9 @@ RectTransform: m_Father: {fileID: 8426497911705375594} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.64551, y: -29.645} m_SizeDelta: {x: 59.291, y: 59.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1345581854343892787 @@ -5489,7 +5488,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -424.9, y: 88} - m_SizeDelta: {x: 0, y: 63.7} + m_SizeDelta: {x: 377.841, y: 63.7} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9110449981396335172 CanvasRenderer: @@ -5754,14 +5753,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u67E5\u770B\u8BE6\u60C5" LanguageIndex: 0 @@ -5922,10 +5921,10 @@ RectTransform: m_Father: {fileID: 4351588488149147503} 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: 486.5, y: 0} - m_SizeDelta: {x: 593, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 486.5, y: -21} + m_SizeDelta: {x: 593, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2985974475698447598 CanvasRenderer: @@ -6339,6 +6338,91 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8815824923492294692 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6950021899630084439} + - component: {fileID: 8543859208964290136} + - component: {fileID: 1354572868179028591} + - component: {fileID: 4597159912763716546} + m_Layer: 5 + m_Name: Reward + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6950021899630084439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815824923492294692} + 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: 4436316685966890284} + - {fileID: 2402396322299635209} + m_Father: {fileID: 770623558319233362} + m_RootOrder: 4 + 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: -440.925, y: -128} + m_SizeDelta: {x: 228, y: 122.6} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &8543859208964290136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815824923492294692} + m_CullTransparentMesh: 0 +--- !u!114 &1354572868179028591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815824923492294692} + 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: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &4597159912763716546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8815824923492294692} + 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 &8936609455493456241 GameObject: m_ObjectHideFlags: 0 From 23fa451553c5ff8a4a62e404506eeba141236e9c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 24 Feb 2021 11:11:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90gm=E3=80=91=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 1bb9136f7f..5f08a2dcbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -85,7 +85,7 @@ function GMPanel:InitComponent() {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11191], inputTip = {""}, callBack = this.GetMoney}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11192], inputTip = {""}, callBack = this.Baowu}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[11193], inputTip = {""}, callBack = this.GetEquipe}, - {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12151], inputTip = {""}, callBack = this.GetManyItems}, + {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = Language[12151], inputTip = {""}, callBack = this.GetAllItems}, {type = GMType.Function, subType = GMSubType.Func, inputNum = 1, args = "", btnTip = Language[11194], inputTip = {Language[11195]}, callBack = this.TestJump}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "23#0#%s", btnTip = Language[11176], inputTip = {Language[11196]}, callBack = nil}, @@ -199,7 +199,7 @@ function this.GetEquipe() end -- 一键好多物品 -function this.GetManyItems() +function this.GetAllItems() local ic = ConfigManager.GetConfig(ConfigName.ItemConfig) local i = 0 coroutine.start(function() From 45a4b740d20a7fb08b52ecc4bd74c611defbd789 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 24 Feb 2021 11:15:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BA=A2=E5=8C=85=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Message/MsgPanel.prefab | 448 ++++++++++-------- .../RedPacketView/RedPacket_SendView.lua | 2 - 2 files changed, 251 insertions(+), 199 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab index 1eab9a637c..dbb3a9f0bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Message/MsgPanel.prefab @@ -228,7 +228,7 @@ RectTransform: - {fileID: 224664962074444318} - {fileID: 224793522550240642} - {fileID: 224337767367280232} - - {fileID: 4316285615985538453} + - {fileID: 2562817607428992190} m_Father: {fileID: 224787418950452670} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -296,7 +296,7 @@ MonoBehaviour: sequeueType: 1 loop: 0 loopType: 0 - targetObj: {fileID: 4316285615985538453} + targetObj: {fileID: 0} isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 @@ -727,8 +727,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -799,7 +799,7 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 ---- !u!1 &2809340099535962168 +--- !u!1 &687155857619402879 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -807,9 +807,104 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1500016824146968742} - - component: {fileID: 7521198269556686606} - - component: {fileID: 4283857156431925339} + - component: {fileID: 6217697287067610824} + - component: {fileID: 2845478241211625418} + - component: {fileID: 8953760642454168051} + - component: {fileID: 5742842144985686338} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6217697287067610824 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687155857619402879} + 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: 2562817607428992190} + 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: 194, y: -33.6} + m_SizeDelta: {x: 288, y: 64.400024} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2845478241211625418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687155857619402879} + m_CullTransparentMesh: 0 +--- !u!114 &8953760642454168051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687155857619402879} + 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.9882353, g: 0.92156863, b: 0.7921569, 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: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u672C\u65E5\u4E0D\u518D\u5F39\u51FA" + LanguageIndex: 11258 +--- !u!114 &5742842144985686338 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 687155857619402879} + 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 &4988210390436840855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427208173374471257} + - component: {fileID: 8315433955612078822} + - component: {fileID: 5585467319875632946} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -817,41 +912,41 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1500016824146968742 +--- !u!224 &427208173374471257 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2809340099535962168} + m_GameObject: {fileID: 4988210390436840855} 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: 5510406962493969715} - m_Father: {fileID: 4316285615985538453} + - {fileID: 1844877682360646154} + m_Father: {fileID: 2562817607428992190} 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: 0.3000002, y: -9.4} + m_AnchoredPosition: {x: 25, y: -33.6} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7521198269556686606 +--- !u!222 &8315433955612078822 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2809340099535962168} + m_GameObject: {fileID: 4988210390436840855} m_CullTransparentMesh: 0 ---- !u!114 &4283857156431925339 +--- !u!114 &5585467319875632946 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2809340099535962168} + m_GameObject: {fileID: 4988210390436840855} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -874,170 +969,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4837985696514646411 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4316285615985538453} - - component: {fileID: 8457729119153730955} - m_Layer: 5 - m_Name: Toggle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4316285615985538453 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4837985696514646411} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} - m_Children: - - {fileID: 1500016824146968742} - - {fileID: 4450687306394988453} - m_Father: {fileID: 224865610280439172} - m_RootOrder: 4 - 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: -98, y: -133.77577} - m_SizeDelta: {x: 20.13, y: 21.76} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8457729119153730955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4837985696514646411} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 2109663825, 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: 1 - 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: 4283857156431925339} - toggleTransition: 1 - graphic: {fileID: 6894182490966567929} - m_Group: {fileID: 0} - onValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null - m_IsOn: 1 ---- !u!1 &5796946915708490286 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4450687306394988453} - - component: {fileID: 8722772696630571511} - - component: {fileID: 2828218050996299714} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4450687306394988453 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796946915708490286} - 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: 4316285615985538453} - 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: 157, y: 1.5} - m_SizeDelta: {x: 263.5, y: 70.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8722772696630571511 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796946915708490286} - m_CullTransparentMesh: 0 ---- !u!114 &2828218050996299714 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796946915708490286} - 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.9882353, g: 0.92156863, b: 0.7921569, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u672C\u65E5\u4E0D\u518D\u5F39\u51FA" - LanguageIndex: 0 --- !u!1 &5945539827434668153 GameObject: m_ObjectHideFlags: 0 @@ -1107,8 +1038,8 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 45 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 + m_BestFit: 1 + m_MinSize: 26 m_MaxSize: 45 m_Alignment: 4 m_AlignByGeometry: 0 @@ -1192,7 +1123,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6981009799313967473 +--- !u!1 &6172300493144042298 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1200,9 +1131,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5510406962493969715} - - component: {fileID: 3746136520708443806} - - component: {fileID: 6894182490966567929} + - component: {fileID: 2562817607428992190} + - component: {fileID: 865176911362411280} + - component: {fileID: 89168266013395093} + - component: {fileID: 7861906522421109624} + m_Layer: 5 + m_Name: Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2562817607428992190 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172300493144042298} + 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: 427208173374471257} + - {fileID: 6217697287067610824} + m_Father: {fileID: 224865610280439172} + 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: 448.89996, y: -492.34} + m_SizeDelta: {x: 338, y: 67.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &865176911362411280 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172300493144042298} + 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: 0 + m_ChildControlHeight: 0 +--- !u!114 &89168266013395093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172300493144042298} + 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!114 &7861906522421109624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6172300493144042298} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, 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: 1 + 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: 5585467319875632946} + toggleTransition: 1 + graphic: {fileID: 5287273579788791490} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null + m_IsOn: 1 +--- !u!1 &7445001602279713687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1844877682360646154} + - component: {fileID: 6319655838325846258} + - component: {fileID: 5287273579788791490} m_Layer: 5 m_Name: Checkmark m_TagString: Untagged @@ -1210,40 +1264,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5510406962493969715 +--- !u!224 &1844877682360646154 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6981009799313967473} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 7445001602279713687} + 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: 1500016824146968742} + m_Father: {fileID: 427208173374471257} 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: 4, y: 3} - m_SizeDelta: {x: 60, y: 60} + m_AnchoredPosition: {x: 5.9, y: -0.000016217} + m_SizeDelta: {x: 87.8, y: 84} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3746136520708443806 +--- !u!222 &6319655838325846258 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6981009799313967473} + m_GameObject: {fileID: 7445001602279713687} m_CullTransparentMesh: 0 ---- !u!114 &6894182490966567929 +--- !u!114 &5287273579788791490 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6981009799313967473} + m_GameObject: {fileID: 7445001602279713687} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua index 8567e561d5..482eebe5c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua @@ -30,8 +30,6 @@ function this:InitComponent(gameObject) this.itemList={} --奖励容器 - - --- 红包选择 --- this.dragView = Util.GetGameObject(gameObject, "Dragview") this.dragViewGrid = Util.GetGameObject(this.dragView, "Grid")