From 97ae8966d7fb38a87108112b23e943196af44e6d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 18 Mar 2021 14:10:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=85=85=E5=80=BC=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainRechargePanel.prefab | 1295 ++++++++++++----- .../~Lua/Modules/Recharge/View/GiftView.lua | 4 +- 2 files changed, 914 insertions(+), 385 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index fa2e18c6f0..c844d05a3a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -1058,7 +1058,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: 554, y: -25} + m_AnchoredPosition: {x: 565, y: -23} m_SizeDelta: {x: 284, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1776344020 @@ -2730,6 +2730,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &621481425069524946 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1970010546514954319} + - component: {fileID: 8421491357497885480} + - component: {fileID: 7615541826058957064} + - component: {fileID: 1866296970395368547} + m_Layer: 0 + m_Name: num (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1970010546514954319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621481425069524946} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + 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: 3, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8421491357497885480 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621481425069524946} + m_CullTransparentMesh: 0 +--- !u!114 &7615541826058957064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621481425069524946} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 72 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 +--- !u!114 &1866296970395368547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 621481425069524946} + 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 &646217690541330681 GameObject: m_ObjectHideFlags: 0 @@ -3801,6 +3896,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1578240105106208574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7085413159230613150} + - component: {fileID: 5204002447403177706} + - component: {fileID: 3011187930029478261} + m_Layer: 0 + m_Name: num (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7085413159230613150 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578240105106208574} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + 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: 66, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5204002447403177706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578240105106208574} + m_CullTransparentMesh: 0 +--- !u!114 &3011187930029478261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1578240105106208574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &1690597114554093568 GameObject: m_ObjectHideFlags: 0 @@ -5072,6 +5247,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2298497052067907526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2277495879445545939} + - component: {fileID: 4093145858754270755} + - component: {fileID: 1589338090410160488} + m_Layer: 0 + m_Name: num (10) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2277495879445545939 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2298497052067907526} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 192, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4093145858754270755 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2298497052067907526} + m_CullTransparentMesh: 0 +--- !u!114 &1589338090410160488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2298497052067907526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &2303489526165264053 GameObject: m_ObjectHideFlags: 0 @@ -5190,6 +5445,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2326119078267092331 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3295082549241502627} + - component: {fileID: 4189569575337411757} + - component: {fileID: 3029453835202881508} + m_Layer: 0 + m_Name: num (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3295082549241502627 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326119078267092331} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + 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: 24, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4189569575337411757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326119078267092331} + m_CullTransparentMesh: 0 +--- !u!114 &3029453835202881508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2326119078267092331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &2361522433204573273 GameObject: m_ObjectHideFlags: 0 @@ -6700,7 +7035,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 30, y: 71.9} - m_SizeDelta: {x: 696, y: 50} + m_SizeDelta: {x: 707, y: 46} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2518333084048825677 CanvasRenderer: @@ -6930,7 +7265,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: 76, y: -25} + m_AnchoredPosition: {x: 76, y: -23} m_SizeDelta: {x: 152, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2518333084341339611 @@ -7218,6 +7553,170 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2961725866507951470 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4783028765771595832} + - component: {fileID: 5876178863225758603} + - component: {fileID: 4263833408490681610} + m_Layer: 5 + m_Name: NumTextPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4783028765771595832 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2961725866507951470} + 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: 1970010546514954319} + - {fileID: 3295082549241502627} + - {fileID: 7783456546837636013} + - {fileID: 7085413159230613150} + - {fileID: 1392924977509139574} + - {fileID: 5773993774374846251} + - {fileID: 7113352620851383718} + - {fileID: 1599763053021641153} + - {fileID: 1361543729575082830} + - {fileID: 2277495879445545939} + m_Father: {fileID: 2518333084048825679} + 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: 162, y: -23} + m_SizeDelta: {x: 195, y: 40} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &5876178863225758603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2961725866507951470} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: -20 + m_Right: -20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -25 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &4263833408490681610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2961725866507951470} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!1 &2981105846250654277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1361543729575082830} + - component: {fileID: 3855473169075034639} + - component: {fileID: 4582365980433460240} + m_Layer: 0 + m_Name: num (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1361543729575082830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2981105846250654277} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 171, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3855473169075034639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2981105846250654277} + m_CullTransparentMesh: 0 +--- !u!114 &4582365980433460240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2981105846250654277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &3001960533284883953 GameObject: m_ObjectHideFlags: 0 @@ -8114,7 +8613,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -9190,6 +9689,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5468\u9650\u8D2D\u4E00\u6B21\uFF01" LanguageIndex: 0 +--- !u!1 &3996526961818377873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7113352620851383718} + - component: {fileID: 3733089872527662456} + - component: {fileID: 484499539337653692} + m_Layer: 0 + m_Name: num (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7113352620851383718 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3996526961818377873} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 129, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3733089872527662456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3996526961818377873} + m_CullTransparentMesh: 0 +--- !u!114 &484499539337653692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3996526961818377873} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &4001373181402591021 GameObject: m_ObjectHideFlags: 0 @@ -10846,6 +11425,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5285894317047027129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7783456546837636013} + - component: {fileID: 4248669776610485615} + - component: {fileID: 201984366552266746} + m_Layer: 0 + m_Name: num (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7783456546837636013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285894317047027129} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + 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: 45, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4248669776610485615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285894317047027129} + m_CullTransparentMesh: 0 +--- !u!114 &201984366552266746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5285894317047027129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &5420216932883108143 GameObject: m_ObjectHideFlags: 0 @@ -11403,6 +12062,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5468\u9650\u8D2D\u4E00\u6B21\uFF01" LanguageIndex: 0 +--- !u!1 &5811556157724261706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599763053021641153} + - component: {fileID: 4418316247750681609} + - component: {fileID: 5897151747424105340} + m_Layer: 0 + m_Name: num (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599763053021641153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811556157724261706} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4418316247750681609 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811556157724261706} + m_CullTransparentMesh: 0 +--- !u!114 &5897151747424105340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5811556157724261706} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &5817861942884902187 GameObject: m_ObjectHideFlags: 0 @@ -14130,8 +14869,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 377, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 390, y: -23} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5213216419983842381 CanvasRenderer: @@ -14161,7 +14900,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: 9b622bdc0076f3943adb78ee8d828620, type: 3} + m_Sprite: {fileID: 21300000, guid: 8433faecc652d374ab2a8398d559dfcb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14258,6 +14997,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7828800850151309039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1392924977509139574} + - component: {fileID: 6583657757878140072} + - component: {fileID: 7265674170944024578} + m_Layer: 0 + m_Name: num (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1392924977509139574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828800850151309039} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + 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: 87, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6583657757878140072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828800850151309039} + m_CullTransparentMesh: 0 +--- !u!114 &7265674170944024578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7828800850151309039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &7923944067521467177 GameObject: m_ObjectHideFlags: 0 @@ -15084,6 +15903,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5FC5\u8D2D\u793C\u5305\uFF0C\u8D85\u503C\u4F18\u60E0\uFF0C\u6BCF" LanguageIndex: 0 +--- !u!1 &8508612653071838149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5773993774374846251} + - component: {fileID: 3175125483395333882} + - component: {fileID: 3333979835752877640} + m_Layer: 0 + m_Name: num (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5773993774374846251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8508612653071838149} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4783028765771595832} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 108, y: -20} + m_SizeDelta: {x: 46, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3175125483395333882 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8508612653071838149} + m_CullTransparentMesh: 0 +--- !u!114 &3333979835752877640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8508612653071838149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 9 + LanguageIndex: 0 --- !u!1 &8539327838339179333 GameObject: m_ObjectHideFlags: 0 @@ -15893,376 +16792,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1001 &1257933291982601212 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2518333084048825679} - m_Modifications: - - target: {fileID: 4066533111738427026, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Name - value: NumTextPre - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 162 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.y - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 166 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 187 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 61 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 124 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8341413281024603738, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 9039137695316613201, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} ---- !u!224 &4783028765771595832 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - m_PrefabInstance: {fileID: 1257933291982601212} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3814238493100927908 PrefabInstance: m_ObjectHideFlags: 0 @@ -16441,15 +16970,15 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 584f6c7286705c645ab8323012566269, type: 3} ---- !u!224 &4030831344110493642 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, - type: 3} - m_PrefabInstance: {fileID: 3814238493100927908} - m_PrefabAsset: {fileID: 0} --- !u!1 &3812896437756706176 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1342128629339684, guid: 584f6c7286705c645ab8323012566269, type: 3} m_PrefabInstance: {fileID: 3814238493100927908} m_PrefabAsset: {fileID: 0} +--- !u!224 &4030831344110493642 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269, + type: 3} + m_PrefabInstance: {fileID: 3814238493100927908} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index 056f344109..bf38692151 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -143,8 +143,8 @@ function GiftView:RefreshOneKeyShow() -- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori -- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now - self.oriPrice.text = string.format("现价:%s元",ori) - self.nowPrice.text = string.format("原价:%s元",now) + self.oriPrice.text = string.format("原价:%s元",ori) + self.nowPrice.text = string.format("现价:%s元",now) end -- 刷新礼包的数据 From 8200e72dd2e1b4970eee3583afcf620bc438b4d5 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 18 Mar 2021 14:25:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E7=AE=B1=E5=AD=90=E3=80=91=E9=9C=80=E8=A6=81=E5=90=91?= =?UTF-8?q?=E4=B8=8B=E7=A7=BB=EF=BC=8C=E5=88=B0=E6=A1=86=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RewardBox/RewardBoxPanel.prefab | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab index 3e82d0306b..f914e39fb2 100644 --- a/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RewardBox/RewardBoxPanel.prefab @@ -404,7 +404,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8126913021008556213 RectTransform: m_ObjectHideFlags: 0 @@ -1386,7 +1386,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3210126133790844263} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1552,10 +1552,10 @@ RectTransform: m_Father: {fileID: 1759585470645775885} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 500, y: -40} + m_SizeDelta: {x: 1000, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4460466962581947724 CanvasRenderer: @@ -3322,7 +3322,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &637834703727152052 RectTransform: m_ObjectHideFlags: 0