diff --git a/Assets/Content/Prefabs/UI/UIRuneShop/UIRuneShop.prefab b/Assets/Content/Prefabs/UI/UIRuneShop/UIRuneShop.prefab index eaab64920..fe67e7ab6 100644 --- a/Assets/Content/Prefabs/UI/UIRuneShop/UIRuneShop.prefab +++ b/Assets/Content/Prefabs/UI/UIRuneShop/UIRuneShop.prefab @@ -186,10 +186,10 @@ RectTransform: - {fileID: 261237079884805806} m_Father: {fileID: 5507212350277290180} 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: 1080, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -1080} + m_SizeDelta: {x: 1080, y: 1400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8295664914584476733 CanvasRenderer: @@ -359,9 +359,9 @@ RectTransform: - {fileID: 1536070495602643622} m_Father: {fileID: 4298061676702403249} 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: 798, y: -700} m_SizeDelta: {x: 486, y: 1326} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2036402811117456168 @@ -592,9 +592,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -57} m_SizeDelta: {x: 256, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5398099366249056285 @@ -1905,7 +1905,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} + m_AnchoredPosition: {x: -40, y: -30} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7908524855141969132 @@ -1985,7 +1985,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5995285046620699259 RectTransform: m_ObjectHideFlags: 0 @@ -2005,10 +2005,10 @@ RectTransform: - {fileID: 6205560634415912025} m_Father: {fileID: 6205560633638733897} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 175} - m_SizeDelta: {x: 0, y: -775} + m_SizeDelta: {x: 1080, y: 1145} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2390864183272869801 MonoBehaviour: @@ -2027,7 +2027,7 @@ MonoBehaviour: - UnityEngine.RectTransform - UINode - UnityEngine.UI.VerticalLayoutGroup - values: 000000 + values: 010000 depObjs: [] activeType: 0 --- !u!114 &3078833828867123316 @@ -2070,12 +2070,12 @@ GameObject: - component: {fileID: 8882120811411720376} - component: {fileID: 7566283878613689133} m_Layer: 5 - m_Name: TextTime + m_Name: TextTime2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3533581197396514058 RectTransform: m_ObjectHideFlags: 0 @@ -2087,8 +2087,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7031082665688251066} + m_Children: [] m_Father: {fileID: 5870680027138997395} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2117,7 +2116,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705883, g: 0.47843137, b: 0.5803922, a: 1} + m_Color: {r: 0.8396226, g: 0.7802154, b: 0.7802154, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2597,7 +2596,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} + m_AnchoredPosition: {x: -40, y: -30} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1377670570096244732 @@ -2938,9 +2937,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 772717399242008615} 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: 230.5, y: -57} m_SizeDelta: {x: 256, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4117011328667319771 @@ -3589,6 +3588,165 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1057558086935248821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 746508994226940708} + - component: {fileID: 8779254469843781045} + - component: {fileID: 7562739891768600365} + - component: {fileID: 5731254707769752998} + m_Layer: 5 + m_Name: TextTime + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &746508994226940708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057558086935248821} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7031082665688251066} + m_Father: {fileID: 5870680027138997395} + 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: 34.11, y: 0} + m_SizeDelta: {x: 400, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8779254469843781045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057558086935248821} + m_CullTransparentMesh: 1 +--- !u!114 &7562739891768600365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057558086935248821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "22\u65F620\u5206\u540E\u5237\u65B0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2} + m_sharedMaterial: {fileID: 21889736603187208, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5731254707769752998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1057558086935248821} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8759edc0b8b4b3d4aa8ffef2482e17ee, type: 3} + m_Name: + m_EditorClassIdentifier: + UIName: + keys: + - UnityEngine.RectTransform + - UnityEngine.CanvasRenderer + - TMPro.TextMeshProUGUI + - UINode + values: 00000100 + depObjs: + - {fileID: 3386060703390850089} + activeType: 0 --- !u!1 &1105041549385654052 GameObject: m_ObjectHideFlags: 0 @@ -4277,8 +4435,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 125.00008} - m_SizeDelta: {x: 0, y: 249.99988} + m_AnchoredPosition: {x: 0, y: 100.01} + m_SizeDelta: {x: 0, y: 200.01} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6984973868628457997 CanvasRenderer: @@ -6700,9 +6858,9 @@ RectTransform: - {fileID: 6143139033037855582} m_Father: {fileID: 198048077420600043} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 840, y: -89} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 320, y: 77} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2988978622116489744 @@ -7010,6 +7168,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2289630907106055799 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2764621525711756289} + - component: {fileID: 7359274786217225136} + - component: {fileID: 371153822370401374} + m_Layer: 5 + m_Name: star2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2764621525711756289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2289630907106055799} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5870680027138997395} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 190, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7359274786217225136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2289630907106055799} + m_CullTransparentMesh: 0 +--- !u!114 &371153822370401374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2289630907106055799} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 0.47058824} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2316522483352930045 GameObject: m_ObjectHideFlags: 0 @@ -7390,9 +7623,9 @@ RectTransform: - {fileID: 8920729553965427422} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -94.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1790662348823820691 @@ -8582,7 +8815,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 30, y: 0} + m_AnchoredPosition: {x: 160, y: 0} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2963142469043248493 @@ -8606,7 +8839,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.47058824} + m_Color: {r: 1, g: 0, b: 0, a: 0.47058824} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -9367,9 +9600,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 772717399242008615} 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: 230.5, y: -421} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2447198419482541990 @@ -9519,9 +9752,9 @@ RectTransform: - {fileID: 3247232025846587744} m_Father: {fileID: 198048077420600043} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 510, y: -89} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 320, y: 77} m_Pivot: {x: 0.5, y: 0} --- !u!114 &3616553162069249843 @@ -10028,9 +10261,9 @@ RectTransform: - {fileID: 3105589223427533451} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -319.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1311623446137321013 @@ -10434,9 +10667,9 @@ RectTransform: - {fileID: 8588402781369928316} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -483.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7570390406651451699 @@ -10499,6 +10732,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4050050673123805012 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1304609865238640723} + - component: {fileID: 4138850739707776076} + - component: {fileID: 8305985361671184886} + m_Layer: 5 + m_Name: star3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1304609865238640723 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4050050673123805012} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5870680027138997395} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 220, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4138850739707776076 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4050050673123805012} + m_CullTransparentMesh: 0 +--- !u!114 &8305985361671184886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4050050673123805012} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 0.47058824} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4165204806694162181 GameObject: m_ObjectHideFlags: 0 @@ -11517,9 +11825,9 @@ RectTransform: - {fileID: 3763869873891987888} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -155.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8158811697652150787 @@ -11914,9 +12222,9 @@ RectTransform: - {fileID: 6270799933407107484} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -218} m_SizeDelta: {x: 397, y: 25} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6538317125568016219 @@ -12787,7 +13095,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5507212350277290180 RectTransform: m_ObjectHideFlags: 0 @@ -13127,9 +13435,9 @@ RectTransform: - {fileID: 1153243260435840337} m_Father: {fileID: 4298061676702403249} 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: 282, y: -700} m_SizeDelta: {x: 486, y: 1326} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4115190986719002645 @@ -13598,10 +13906,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5507212350277290180} 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: 100, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -190} + m_SizeDelta: {x: 100, y: 380} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3587123188945345191 CanvasRenderer: @@ -14491,9 +14799,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -421} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1662653631180166085 @@ -14642,9 +14950,9 @@ RectTransform: - {fileID: 8262371000904764751} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -483.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9159127185073919621 @@ -15482,10 +15790,10 @@ RectTransform: - {fileID: 2109182267635707047} m_Father: {fileID: 5995285046620699259} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -657} - m_SizeDelta: {x: 1080, y: 976} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2401535973728568883 MonoBehaviour: @@ -15541,7 +15849,7 @@ MonoBehaviour: m_Right: 0 m_Top: 10 m_Bottom: 10 - mItemPadding: {x: 40, y: 60} + mItemPadding: {x: 40, y: 40} mItemSize: {x: 314, y: 480} mItemRecycleDistance: {x: 50, y: 50} mItemSnapEnable: 0 @@ -17747,9 +18055,9 @@ RectTransform: - {fileID: 7769587014137548679} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -218} m_SizeDelta: {x: 397, y: 25} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6066467887531522870 @@ -17790,11 +18098,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3533581197396514058} + m_Father: {fileID: 746508994226940708} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -30, y: 0} + m_AnchoredPosition: {x: -39.999996, y: 0} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6639645130869248767 @@ -17818,7 +18126,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.25181416, b: 0.1745283, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -18335,14 +18643,19 @@ RectTransform: m_Children: - {fileID: 1108636027094900637} - {fileID: 6686745318429000232} + - {fileID: 2764621525711756289} + - {fileID: 1304609865238640723} - {fileID: 1003826770839616547} + - {fileID: 279161582762409683} + - {fileID: 7767489847285123733} - {fileID: 3533581197396514058} + - {fileID: 746508994226940708} m_Father: {fileID: 5995285046620699259} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -109} - m_SizeDelta: {x: 1000, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1000, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3386060703390850089 MonoBehaviour: @@ -18587,9 +18900,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 772717399242008615} 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: 230.5, y: -257} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4545191335132712989 @@ -19026,9 +19339,9 @@ RectTransform: - {fileID: 3504747778187026252} m_Father: {fileID: 198048077420600043} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 180, y: -89} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 320, y: 77} m_Pivot: {x: 0.5, y: 0} --- !u!114 &5804503034797984566 @@ -19558,9 +19871,9 @@ RectTransform: - {fileID: 3743796420038602418} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -94.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5594436827215028111 @@ -19791,7 +20104,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -30, y: 0} + m_AnchoredPosition: {x: -165, y: 0} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4092560952847146599 @@ -19815,7 +20128,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.47058824} + m_Color: {r: 1, g: 0, b: 0.029372692, a: 0.47058824} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -19907,6 +20220,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8001171286984645444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7767489847285123733} + - component: {fileID: 1602468323191712139} + - component: {fileID: 2955414586998828287} + m_Layer: 5 + m_Name: star22 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7767489847285123733 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001171286984645444} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5870680027138997395} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -225, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1602468323191712139 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001171286984645444} + m_CullTransparentMesh: 0 +--- !u!114 &2955414586998828287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8001171286984645444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0.029372692, a: 0.47058824} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8081643332084940334 GameObject: m_ObjectHideFlags: 0 @@ -20535,7 +20923,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -10, y: -10} + m_AnchoredPosition: {x: -40, y: -30} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1447463750776680201 @@ -20768,9 +21156,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -257} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2034806921710187209 @@ -21060,7 +21448,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 540, y: -0} - m_SizeDelta: {x: 1008, y: 99} + m_SizeDelta: {x: 1008, y: 101} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5576930517839397119 CanvasRenderer: @@ -21116,9 +21504,9 @@ MonoBehaviour: m_Left: 20 m_Right: 20 m_Top: 12 - m_Bottom: 10 + m_Bottom: 12 m_ChildAlignment: 4 - m_Spacing: 10 + m_Spacing: 5 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -21811,9 +22199,9 @@ RectTransform: - {fileID: 5465121515961267735} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -155.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7623680140297720104 @@ -21912,9 +22300,9 @@ RectTransform: - {fileID: 6219892080599842451} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -319.5} m_SizeDelta: {x: 271, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1232367431301878160 @@ -22119,9 +22507,9 @@ RectTransform: - {fileID: 7195392364259501185} m_Father: {fileID: 9007683886644791569} 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: 230.5, y: -382} m_SizeDelta: {x: 397, y: 25} m_Pivot: {x: 0.5, y: 0} --- !u!222 &9069848028473851399 @@ -22604,8 +22992,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3097769968636548194 CanvasRenderer: @@ -22628,14 +23016,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7607843, g: 0.85882354, b: 1, a: 1} + m_Color: {r: 0.7830189, g: 0.21960784, b: 0.12927197, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 797830aa3ef335342b22217ff96ea8cc, type: 3} + m_Sprite: {fileID: 21300000, guid: afdf48664b9d47a46b8718011c464373, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22922,9 +23310,9 @@ RectTransform: - {fileID: 8669384431956635349} m_Father: {fileID: 772717399242008615} 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: 230.5, y: -382} m_SizeDelta: {x: 397, y: 25} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4597534172306926299 @@ -23129,6 +23517,81 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &9174992629772060600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 279161582762409683} + - component: {fileID: 2310324019510145290} + - component: {fileID: 9217063835472802865} + m_Layer: 5 + m_Name: star21 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &279161582762409683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174992629772060600} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5870680027138997395} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -195, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2310324019510145290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174992629772060600} + m_CullTransparentMesh: 0 +--- !u!114 &9217063835472802865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9174992629772060600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0.029372692, a: 0.47058824} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0ae4103766675f046b3bd01368c080bf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &9186875129056863294 GameObject: m_ObjectHideFlags: 0 @@ -23554,22 +24017,22 @@ PrefabInstance: - target: {fileID: 500440829751568861, guid: 71382091041a6ce4bbfb10b6046ead22, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 500440829751568861, guid: 71382091041a6ce4bbfb10b6046ead22, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 500440829751568861, guid: 71382091041a6ce4bbfb10b6046ead22, type: 3} propertyPath: m_AnchoredPosition.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 500440829751568861, guid: 71382091041a6ce4bbfb10b6046ead22, type: 3} propertyPath: m_AnchoredPosition.y - value: -65 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7403682278865615684, guid: 71382091041a6ce4bbfb10b6046ead22, type: 3} diff --git a/Assets/Lua/UI/UIRuneShop/UIRuneShopView.lua b/Assets/Lua/UI/UIRuneShop/UIRuneShopView.lua index 5974acc45..66c50121d 100644 --- a/Assets/Lua/UI/UIRuneShop/UIRuneShopView.lua +++ b/Assets/Lua/UI/UIRuneShop/UIRuneShopView.lua @@ -334,11 +334,13 @@ function UIRuneShopView:OnClickBottomTab(index) title = "礼包" type = Enum.RuneShopType.Gifts subtype = Enum.RuneShopSubType.Daily + self.giftsBox.rectTransform.sizeDelta = Vector2(1080, 1200) self.giftTabBar:SetActive(true) elseif index == 3 then --金币 title = "金币" type = Enum.RuneShopType.Gifts subtype = Enum.RuneShopSubType.Gold + self.giftsBox.rectTransform.sizeDelta = Vector2(1080, 1028) self.giftTabBar:SetActive(false) end self.text_title.text.text = title diff --git a/Assets/Lua/UI/UIRuneShop/UIRuneShopView_Generate.lua b/Assets/Lua/UI/UIRuneShop/UIRuneShopView_Generate.lua index e4131760d..87836880a 100644 --- a/Assets/Lua/UI/UIRuneShop/UIRuneShopView_Generate.lua +++ b/Assets/Lua/UI/UIRuneShop/UIRuneShopView_Generate.lua @@ -75,10 +75,15 @@ ---@class UIRuneShop__Generate_timeBox_textTime ---@field public gameObject UnityEngine.GameObject +---@field public text TMPro.TextMeshProUGUI + +---@class UIRuneShop__Generate_timeBox_textTime2 +---@field public gameObject UnityEngine.GameObject ---@field public text UnityEngine.UI.Text ---@class UIRuneShop__Generate_timeBox ---@field public gameObject UnityEngine.GameObject +---@field public textTime2 UIRuneShop__Generate_timeBox_textTime2 ---@field public textTime UIRuneShop__Generate_timeBox_textTime ---@class UIRuneShop__Generate_giftTabBar_tabGiftMonthly @@ -105,6 +110,7 @@ ---@class UIRuneShop__Generate_giftsBox ---@field public gameObject UnityEngine.GameObject +---@field public rectTransform UnityEngine.RectTransform ---@field public scrollView UIRuneShop__Generate_giftsBox_scrollView ---@class UIRuneShop__Generate_monthCard2_presentPrice_icon @@ -504,6 +510,7 @@ function UIRuneShopView:InitGenerate(Root, data) self:InitGenerate__88(Root,data) self:InitGenerate__89(Root,data) self:InitGenerate__90(Root,data) + self:InitGenerate__91(Root,data) end @@ -1291,6 +1298,8 @@ function UIRuneShopView:InitGenerate__58(Root, data) tolua.setpeer(tmp, {}) end self.giftsBox = tmp + + tmp.rectTransform = tmp:GetComponent(Enum.TypeInfo.RectTransform) end ---@private @@ -1399,6 +1408,20 @@ end ---@private function UIRuneShopView:InitGenerate__67(Root, data) +--[[ + UIAnimator/Window/GiftsBox/TimeBox/TextTime2 +--]] + local tmp = Root:Find("UIAnimator/Window/GiftsBox/TimeBox/TextTime2").gameObject + if tolua.getpeer(tmp) == nil then + tolua.setpeer(tmp, {}) + end + self.timeBox.textTime2 = tmp + + tmp.text = tmp:GetComponent(Enum.TypeInfo.Text) +end + +---@private +function UIRuneShopView:InitGenerate__68(Root, data) --[[ UIAnimator/Window/GiftsBox/TimeBox/TextTime --]] @@ -1408,11 +1431,11 @@ function UIRuneShopView:InitGenerate__67(Root, data) end self.timeBox.textTime = tmp - tmp.text = tmp:GetComponent(Enum.TypeInfo.Text) + tmp.text = tmp:GetComponent(Enum.TypeInfo.TextMeshProUGUI) end ---@private -function UIRuneShopView:InitGenerate__68(Root, data) +function UIRuneShopView:InitGenerate__69(Root, data) --[[ UIAnimator/Window/GiftsBox/ScrollView --]] @@ -1426,7 +1449,7 @@ function UIRuneShopView:InitGenerate__68(Root, data) end ---@private -function UIRuneShopView:InitGenerate__69(Root, data) +function UIRuneShopView:InitGenerate__70(Root, data) --[[ UIAnimator/Window/GiftsBox/ScrollView/Viewport/Content/RuneShopGoodsItem --]] @@ -1441,7 +1464,7 @@ function UIRuneShopView:InitGenerate__69(Root, data) end ---@private -function UIRuneShopView:InitGenerate__70(Root, data) +function UIRuneShopView:InitGenerate__71(Root, data) --[[ UIAnimator/Window/LimitedBox --]] @@ -1453,7 +1476,7 @@ function UIRuneShopView:InitGenerate__70(Root, data) end ---@private -function UIRuneShopView:InitGenerate__71(Root, data) +function UIRuneShopView:InitGenerate__72(Root, data) --[[ UIAnimator/Window/LimitedBox/ScrollView --]] @@ -1467,7 +1490,7 @@ function UIRuneShopView:InitGenerate__71(Root, data) end ---@private -function UIRuneShopView:InitGenerate__72(Root, data) +function UIRuneShopView:InitGenerate__73(Root, data) --[[ UIAnimator/Window/LimitedBox/ScrollView/Viewport/Content/RuneShopLimitedItem --]] @@ -1482,7 +1505,7 @@ function UIRuneShopView:InitGenerate__72(Root, data) end ---@private -function UIRuneShopView:InitGenerate__73(Root, data) +function UIRuneShopView:InitGenerate__74(Root, data) --[[ UIAnimator/Window/RewardsBox --]] @@ -1494,7 +1517,7 @@ function UIRuneShopView:InitGenerate__73(Root, data) end ---@private -function UIRuneShopView:InitGenerate__74(Root, data) +function UIRuneShopView:InitGenerate__75(Root, data) --[[ UIAnimator/Window/RewardsBox/RewardsExpBox --]] @@ -1507,7 +1530,7 @@ function UIRuneShopView:InitGenerate__74(Root, data) end ---@private -function UIRuneShopView:InitGenerate__75(Root, data) +function UIRuneShopView:InitGenerate__76(Root, data) --[[ UIAnimator/Window/RewardsBox/RewardsExpBox/ExpBox/rewardslv --]] @@ -1521,7 +1544,7 @@ function UIRuneShopView:InitGenerate__75(Root, data) end ---@private -function UIRuneShopView:InitGenerate__76(Root, data) +function UIRuneShopView:InitGenerate__77(Root, data) --[[ UIAnimator/Window/RewardsBox/RewardsExpBox/ExpBox/rewardsmax --]] @@ -1536,7 +1559,7 @@ function UIRuneShopView:InitGenerate__76(Root, data) end ---@private -function UIRuneShopView:InitGenerate__77(Root, data) +function UIRuneShopView:InitGenerate__78(Root, data) --[[ UIAnimator/Window/RewardsBox/RewardsExpBox/ExpBox/numexp --]] @@ -1550,7 +1573,7 @@ function UIRuneShopView:InitGenerate__77(Root, data) end ---@private -function UIRuneShopView:InitGenerate__78(Root, data) +function UIRuneShopView:InitGenerate__79(Root, data) --[[ UIAnimator/Window/RewardsBox/RewardsExpBox/ExpBox/ExpSlider --]] @@ -1564,7 +1587,7 @@ function UIRuneShopView:InitGenerate__78(Root, data) end ---@private -function UIRuneShopView:InitGenerate__79(Root, data) +function UIRuneShopView:InitGenerate__80(Root, data) --[[ UIAnimator/Window/RewardsBox/BtnTaskExp --]] @@ -1578,7 +1601,7 @@ function UIRuneShopView:InitGenerate__79(Root, data) end ---@private -function UIRuneShopView:InitGenerate__80(Root, data) +function UIRuneShopView:InitGenerate__81(Root, data) --[[ UIAnimator/Window/RewardsBox/BtnTaskExp/Icon --]] @@ -1590,7 +1613,7 @@ function UIRuneShopView:InitGenerate__80(Root, data) end ---@private -function UIRuneShopView:InitGenerate__81(Root, data) +function UIRuneShopView:InitGenerate__82(Root, data) --[[ UIAnimator/Window/RewardsBox/ExpUpBlue --]] @@ -1602,7 +1625,7 @@ function UIRuneShopView:InitGenerate__81(Root, data) end ---@private -function UIRuneShopView:InitGenerate__82(Root, data) +function UIRuneShopView:InitGenerate__83(Root, data) --[[ UIAnimator/Window/RewardsBox/ExpUpBlue/RedPoint/LvUp/num --]] @@ -1616,7 +1639,7 @@ function UIRuneShopView:InitGenerate__82(Root, data) end ---@private -function UIRuneShopView:InitGenerate__83(Root, data) +function UIRuneShopView:InitGenerate__84(Root, data) --[[ UIAnimator/Window/BottomTabBar --]] @@ -1630,7 +1653,7 @@ function UIRuneShopView:InitGenerate__83(Root, data) end ---@private -function UIRuneShopView:InitGenerate__84(Root, data) +function UIRuneShopView:InitGenerate__85(Root, data) --[[ UIAnimator/Window/BottomTabBar/BtnBack --]] @@ -1644,7 +1667,7 @@ function UIRuneShopView:InitGenerate__84(Root, data) end ---@private -function UIRuneShopView:InitGenerate__85(Root, data) +function UIRuneShopView:InitGenerate__86(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabMonthCard --]] @@ -1658,7 +1681,7 @@ function UIRuneShopView:InitGenerate__85(Root, data) end ---@private -function UIRuneShopView:InitGenerate__86(Root, data) +function UIRuneShopView:InitGenerate__87(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabMonthCard/RedPoint --]] @@ -1670,7 +1693,7 @@ function UIRuneShopView:InitGenerate__86(Root, data) end ---@private -function UIRuneShopView:InitGenerate__87(Root, data) +function UIRuneShopView:InitGenerate__88(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabGift --]] @@ -1684,7 +1707,7 @@ function UIRuneShopView:InitGenerate__87(Root, data) end ---@private -function UIRuneShopView:InitGenerate__88(Root, data) +function UIRuneShopView:InitGenerate__89(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabGift/RedPoint --]] @@ -1696,7 +1719,7 @@ function UIRuneShopView:InitGenerate__88(Root, data) end ---@private -function UIRuneShopView:InitGenerate__89(Root, data) +function UIRuneShopView:InitGenerate__90(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabCoin --]] @@ -1710,7 +1733,7 @@ function UIRuneShopView:InitGenerate__89(Root, data) end ---@private -function UIRuneShopView:InitGenerate__90(Root, data) +function UIRuneShopView:InitGenerate__91(Root, data) --[[ UIAnimator/Window/BottomTabBar/TabCoin/RedPoint --]] @@ -1756,6 +1779,9 @@ function UIRuneShopView:GenerateDestroy() if tolua.getpeer(self.timeBox.textTime) ~= nil then tolua.setpeer(self.timeBox.textTime, nil) end + if tolua.getpeer(self.timeBox.textTime2) ~= nil then + tolua.setpeer(self.timeBox.textTime2, nil) + end if tolua.getpeer(self.giftTabBar.tabGiftMonthly.redPoint1) ~= nil then tolua.setpeer(self.giftTabBar.tabGiftMonthly.redPoint1, nil) end