From a3a7654e0e30b6c69dc3e37cefdcf8ba3f738935 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Fri, 23 Feb 2024 10:52:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=EF=BC=8CGM=E7=9B=B4?= =?UTF-8?q?=E5=86=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GMPanel/GMFreeRecharge.prefab | 196 ++++++++++++++---- .../Prefabs/UI/Main/MainPanel.prefab | 2 +- .../~Lua/Common/functions.lua | 10 +- 3 files changed, 160 insertions(+), 48 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab index b1dbf32c80..d53fa6e078 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMFreeRecharge.prefab @@ -40,7 +40,7 @@ RectTransform: 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: 216, y: 434} + m_SizeDelta: {x: 216, y: 302} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &133466443 GameObject: @@ -76,8 +76,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.000010808, y: -0.00000095367} - m_SizeDelta: {x: 132, y: 44} + m_AnchoredPosition: {x: -0.000040054, y: -0.00000095367} + m_SizeDelta: {x: 183.38, y: 44} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &133466446 CanvasRenderer: @@ -108,19 +108,19 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 32 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\xA56" + m_Text: "\xA56sssssssssss" --- !u!1 &194752078 GameObject: m_ObjectHideFlags: 0 @@ -306,7 +306,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -1021, y: 299.08} - m_SizeDelta: {x: 216, y: 434} + m_SizeDelta: {x: 233, y: 302} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &361516933 CanvasRenderer: @@ -336,7 +336,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 126d583ec5fab5c4eb94b7bfd391758f, type: 3} + m_Sprite: {fileID: 21300000, guid: 0082491d49cfe1245acb53b3c93ce63d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -453,7 +453,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -534,7 +534,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -914,10 +914,10 @@ RectTransform: m_Father: {fileID: 2671955208593615814} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 809.39996} - m_SizeDelta: {x: 1080, y: 1064} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 9, y: 11.5} + m_SizeDelta: {x: 914.5, y: 1041} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1008993585 GameObject: @@ -1078,8 +1078,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.44, y: -98.3} - m_SizeDelta: {x: 204.33, y: 47.7} + m_AnchoredPosition: {x: 5.18, y: -101.68} + m_SizeDelta: {x: 183.38, y: 40.94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1108870465 CanvasRenderer: @@ -1109,8 +1109,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 31346691a184c274c9617cc17336b0a3, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 8d409ec9a3a176644b50dea5a9cbdaa3, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1456,7 +1456,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -1535,7 +1535,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 130 m_FontStyle: 0 m_BestFit: 0 @@ -1751,6 +1751,117 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1979264498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1979264499} + - component: {fileID: 1979264503} + - component: {fileID: 1979264502} + - component: {fileID: 1979264501} + - component: {fileID: 1979264500} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1979264499 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979264498} + 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: 1426490101665776489} + 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: 469.3, y: 202.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1979264503 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979264498} + m_CullTransparentMesh: 0 +--- !u!114 &1979264502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979264498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9960785, g: 0.93725497, b: 0.93725497, 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: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 82 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u76F4\u51B2\u5546\u5E97" +--- !u!114 &1979264501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979264498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &1979264500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1979264498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.8431373, g: 0.3254902, b: 0.37254903, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2097826593 GameObject: m_ObjectHideFlags: 0 @@ -2061,7 +2172,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d9eb47e7e33ca8a4aa13a0de17b927ab, type: 3} + m_Sprite: {fileID: 21300000, guid: a2d37d6d7d0773e4280cd37c97920877, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2647,7 +2758,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7563711394299067461 RectTransform: m_ObjectHideFlags: 0 @@ -2845,7 +2956,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0e0fe191cc2acde49bcb9ec780bdc346, type: 3} + m_Sprite: {fileID: 21300000, guid: a5a6768112bb47b438af00717bd96c4b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2920,7 +3031,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -3074,7 +3185,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 25 m_FontStyle: 0 m_BestFit: 0 @@ -3220,7 +3331,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45098042, g: 0.28627452, b: 0.121568635, a: 1} + m_Color: {r: 0.5176471, g: 0.32156864, b: 0.21176471, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3228,7 +3339,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 @@ -3762,13 +3873,14 @@ RectTransform: 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_Children: + - {fileID: 1979264499} m_Father: {fileID: 844575118310930223} 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: -12, y: 164.7} + m_AnchoredPosition: {x: -12, y: -296} m_SizeDelta: {x: 429, y: 164.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &228029696967699065 @@ -3786,7 +3898,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6546566463257859711} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4056,8 +4168,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: -24.9, y: 1.5} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 2.38, y: 1.5} + m_SizeDelta: {x: 315.89, y: 84.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9157113747827810553 CanvasRenderer: @@ -4080,7 +4192,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9568628, b: 0.77647066, a: 1} + m_Color: {r: 0.13207549, g: 0.1081502, b: 0.008098972, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4088,9 +4200,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 1679af67885ed2241b5bd04483cb02cc, type: 2} - m_FontSize: 0 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 @@ -4169,7 +4281,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4198,7 +4310,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2760089878686763764 RectTransform: m_ObjectHideFlags: 0 @@ -4464,7 +4576,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f929c903ac9246d498fffba7b813ae8c, type: 3} + m_Sprite: {fileID: 21300000, guid: 2bcf36da9c462164896566be9c710f12, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4488,7 +4600,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7260187684479794490 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 6866148f99..50797d6c6f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -71607,7 +71607,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5721548683242772069 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index a4f68291be..bf4f65edbd 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1186,7 +1186,7 @@ end function GetQuantityImageByquality(quality,star) if star then--and star > 5 if star == 1 then --huise,但是没图 - return "UI_hz_beibao_pinjise_huangse" + return "UI_hz_beibao_pinjise_06_2" elseif star == 2 then return "UI_hz_beibao_pinjise_lvse" elseif star == 3 then @@ -1198,9 +1198,9 @@ function GetQuantityImageByquality(quality,star) elseif star >= 6 and star <=10 then return "UI_hz_beibao_pinjise_hongse" elseif star == 11 then - return "UI_hz_beibao_pinjise_06_2" - else return "UI_hz_beibao_pinjise_06_1" + else + return "UI_hz_beibao_pinjise_06_2" end -- if star == 1 then -- return "r_characterbg_gray" @@ -1225,7 +1225,7 @@ function GetQuantityImageByquality(quality,star) -- end else if quality == 0 or quality == 1 then - return "UI_hz_beibao_pinjise_huangse" + return "UI_hz_beibao_pinjise_06_2" elseif quality == 2 then return "UI_hz_beibao_pinjise_lvse" elseif quality == 3 then @@ -1237,7 +1237,7 @@ function GetQuantityImageByquality(quality,star) elseif quality == 6 then return "UI_hz_beibao_pinjise_hongse" elseif quality == 7 then - return "UI_hz_beibao_pinjise_06_2" + return "UI_hz_beibao_pinjise_huangse" elseif quality >= 8 then return "UI_hz_beibao_pinjise_06_1" end