diff --git a/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png b/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png new file mode 100644 index 0000000000..83b4069feb Binary files /dev/null and b/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png differ diff --git a/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png.meta b/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png.meta new file mode 100644 index 0000000000..16a9473d35 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/7ridenglu/UI_hz_zhonghe05_99.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cf0af89a5345a1743ab1a3ef2ca869bf +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dd925f2528f097b428152fa181e5b5e2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_03.png.meta b/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_03.png.meta index 9e03d76158..393944af43 100644 --- a/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_03.png.meta +++ b/Assets/ManagedResources/BG/UI/LingMai/UI_hz_lm_03.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 101, y: 18, z: 136, w: 15} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab index 3713c7f4cd..e6b364e8f4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab @@ -1,5 +1,269 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &61516746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 61516747} + - component: {fileID: 61516749} + - component: {fileID: 61516748} + - component: {fileID: 61516751} + - component: {fileID: 61516750} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &61516747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61516746} + 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: 1559786694479887320} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -4, y: -13} + m_SizeDelta: {x: 102.3, y: 419.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &61516749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61516746} + m_CullTransparentMesh: 0 +--- !u!114 &61516748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61516746} + 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: 90 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.92 + m_Text: "\u6211\u8981\u53D8\u5F3A" +--- !u!114 &61516751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61516746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.06666667, g: 0.10196079, b: 0.1764706, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &61516750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 61516746} + 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: 2, y: -2} + m_UseGraphicAlpha: 1 +--- !u!1 &501437916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 501437917} + - component: {fileID: 501437919} + - component: {fileID: 501437918} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &501437917 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501437916} + 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: 301021908180390535} + 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: -1.7, y: 2.1} + m_SizeDelta: {x: 160, y: 52.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &501437919 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501437916} + m_CullTransparentMesh: 0 +--- !u!114 &501437918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501437916} + 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.23137257, g: 0.23137257, b: 0.23137257, 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: 42 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D\u5F80" +--- !u!1 &708955627 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 708955628} + - component: {fileID: 708955630} + - component: {fileID: 708955629} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &708955628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708955627} + 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: 3993378406723060650} + m_RootOrder: 7 + 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: 1081, y: 1922} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &708955630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708955627} + m_CullTransparentMesh: 0 +--- !u!114 &708955629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708955627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.19607843} + 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_Sprite: {fileID: 21300000, guid: a9ee287cdae089b49871afaef780fe4e, 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 --- !u!1 &936853918 GameObject: m_ObjectHideFlags: 0 @@ -11,6 +275,7 @@ GameObject: - component: {fileID: 936853919} - component: {fileID: 936853921} - component: {fileID: 5451516756537776481} + - component: {fileID: 311577833} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -58,7 +323,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.6117647, g: 0.6117647, b: 0.6117647, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -66,7 +331,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: 52 m_FontStyle: 0 m_BestFit: 1 @@ -80,6 +345,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u89D2\u8272" LanguageIndex: 0 +--- !u!114 &311577833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936853918} + 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: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1292131555 GameObject: m_ObjectHideFlags: 0 @@ -111,13 +391,167 @@ RectTransform: - {fileID: 1688802455} - {fileID: 1728307192} m_Father: {fileID: 3993378406723060650} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1583136865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1583136866} + - component: {fileID: 1583136868} + - component: {fileID: 1583136867} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1583136866 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583136865} + 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: 5104482871383005648} + 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: 160, y: 76.95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1583136868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583136865} + m_CullTransparentMesh: 0 +--- !u!114 &1583136867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583136865} + 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.19607843, g: 0.19607843, b: 0.19607843, 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: 44 + m_FontStyle: 2 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 44 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D\u5F80" +--- !u!1 &1658418163 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1658418164} + - component: {fileID: 1658418166} + - component: {fileID: 1658418165} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1658418164 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658418163} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_Children: + - {fileID: 2040575313741930874} + m_Father: {fileID: 3993378406723060650} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.5200002, y: 314.6} + m_SizeDelta: {x: 979, y: 1063} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1658418166 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658418163} + m_CullTransparentMesh: 0 +--- !u!114 &1658418165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1658418163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 21300000, guid: 48efbf790dc89814d8a01060d5ff9fa5, 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 --- !u!1 &1688802454 GameObject: m_ObjectHideFlags: 0 @@ -155,7 +589,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 141, y: 32} - m_SizeDelta: {x: 190, y: 126} + m_SizeDelta: {x: 205, y: 109} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1688802458 CanvasRenderer: @@ -185,7 +619,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: a684b29b0d662524fb411e882afa7120, type: 3} + m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,10 +721,10 @@ MonoBehaviour: m_Padding: m_Left: 2 m_Right: 0 - m_Top: 0 + m_Top: -72 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: -19 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -467,7 +901,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: 107.7, y: -14.799999} + m_AnchoredPosition: {x: 107.70001, y: -14.799999} m_SizeDelta: {x: 215.4, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1372727728810463521 @@ -491,7 +925,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9686275, g: 0.7843138, b: 0.4156863, a: 1} + m_Color: {r: 1, g: 0.7568628, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -499,8 +933,8 @@ 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_FontSize: 38 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -778,7 +1212,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 491, y: -102.5} - m_SizeDelta: {x: 892, y: 205} + m_SizeDelta: {x: 981.05, y: 205} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4004069445377278821 CanvasRenderer: @@ -808,7 +1242,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: e163c677d7dd1854fa54073dbf185f41, type: 3} + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -878,8 +1312,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: 876.5, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 932.57, y: -79.692} + m_SizeDelta: {x: 141.13, y: 140.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8114055192889462610 CanvasRenderer: @@ -1374,7 +1808,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: addacd5860691b74db509358d99a6dfb, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1554,8 +1988,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: 500, y: -37} - m_SizeDelta: {x: 160, y: 44} + m_AnchoredPosition: {x: 500, y: -38} + m_SizeDelta: {x: 160, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6351523292528337273 CanvasRenderer: @@ -1586,7 +2020,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: 40 m_FontStyle: 0 m_BestFit: 0 @@ -1937,8 +2371,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: -249, y: -2} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: -272.13, y: -7.15} + m_SizeDelta: {x: 140.34, y: 139.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8510374398240285551 CanvasRenderer: @@ -2202,7 +2636,7 @@ 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, y: 243} + m_AnchoredPosition: {x: 0, y: 204.6} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &821032497453076336 @@ -2764,8 +3198,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: -301, y: 608} - m_SizeDelta: {x: 405, y: 138} + m_AnchoredPosition: {x: -410, y: 522} + m_SizeDelta: {x: 235, y: 101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4263861930640471948 CanvasRenderer: @@ -2837,7 +3271,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: 0fdb11ebf0af8694cb08b9c264d3fa2a, type: 3} + m_Sprite: {fileID: 21300000, guid: 397f7080ce148094580d95b62878cefd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2997,7 +3431,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.22352941, g: 0.11764706, b: 0.047058824, a: 1} + m_Color: {r: 0.9725491, g: 0.9607844, b: 0.95294124, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3005,7 +3439,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: 30 m_FontStyle: 0 m_BestFit: 1 @@ -3494,14 +3928,15 @@ 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: 501437917} m_Father: {fileID: 6984580348208900334} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 284.4, y: -5.5} - m_SizeDelta: {x: 208.17, y: 77.81} + m_AnchoredPosition: {x: 339.77, y: -9.05} + m_SizeDelta: {x: 210.62, y: 88.91} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2616472743053150597 CanvasRenderer: @@ -3531,7 +3966,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: db27aece603c8b54ba3448106adef37c, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3659,7 +4094,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9294118, g: 0.86274517, b: 0.7294118, a: 1} + m_Color: {r: 0.9686275, g: 0.9568628, b: 0.9490197, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3887,7 +4322,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5176471, g: 0.31764707, b: 0.24313727, a: 1} + m_Color: {r: 0.23529413, g: 0.23529413, b: 0.23137257, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3895,9 +4330,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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 1 m_MinSize: 20 m_MaxSize: 42 @@ -3945,8 +4380,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: 71.69997, y: -2.0000257} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 95.225, y: -7.3225} + m_SizeDelta: {x: 150.95, y: 139.36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3754279224188791574 CanvasRenderer: @@ -4242,7 +4677,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.20392159, g: 0.10588236, b: 0.039215688, a: 1} + m_Color: {r: 1, g: 0.7568628, b: 0.2509804, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -4250,7 +4685,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: 32 m_FontStyle: 0 m_BestFit: 0 @@ -5069,7 +5504,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &227520460331583696 RectTransform: m_ObjectHideFlags: 0 @@ -5163,8 +5598,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: -408.00003, y: -2.0000257} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: -458, y: -2.0000257} + m_SizeDelta: {x: 140.36, y: 137.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8573121244709411806 CanvasRenderer: @@ -5262,7 +5697,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8280426474184449539 RectTransform: m_ObjectHideFlags: 0 @@ -5387,7 +5822,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: addacd5860691b74db509358d99a6dfb, type: 3} + m_Sprite: {fileID: 21300000, guid: b204bd77afb57e14e830d912e88eb357, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5491,7 +5926,7 @@ 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: -115.8, y: -0.8} + m_AnchoredPosition: {x: -169, y: -3} m_SizeDelta: {x: 578.4, y: 68.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2801971798408091057 @@ -5515,7 +5950,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.003921569, g: 0, b: 0.003921569, a: 1} + m_Color: {r: 0.9960785, g: 0.9843138, b: 0.97647065, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -5523,7 +5958,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: 32 m_FontStyle: 0 m_BestFit: 0 @@ -5535,7 +5970,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5347\u7EA7\u5996\u7075\u5E08\u53EF\u4EE5\u5347\u7EA7\u5996\u7075\u5E08\u53EF\u4EE5" + m_Text: "\u57F9\u517B\u795E\u5C06" LanguageIndex: 0 --- !u!1 &2131251006949035747 GameObject: @@ -5554,7 +5989,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6213562568939687437 RectTransform: m_ObjectHideFlags: 0 @@ -5652,8 +6087,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: 500, y: -287.5} - m_SizeDelta: {x: 1000, y: 135} + m_AnchoredPosition: {x: 503.06998, y: -287.5} + m_SizeDelta: {x: 993.86, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &238045259737344848 CanvasRenderer: @@ -5683,7 +6118,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: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6199,7 +6634,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: 498, y: 6} + m_AnchoredPosition: {x: 498, y: -267} m_SizeDelta: {x: 982, y: 205} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7961134810547547210 @@ -6423,8 +6858,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: -274.5, y: 1.3275146} - m_SizeDelta: {x: 238.21, y: 57.78} + m_AnchoredPosition: {x: -302, y: 4} + m_SizeDelta: {x: 285.71, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3970179820322594643 CanvasRenderer: @@ -6447,7 +6882,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98823535, g: 0.7686275, b: 0.37254903, a: 1} + m_Color: {r: 0.9960785, g: 0.75294125, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6455,12 +6890,12 @@ 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_FontSize: 30 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 46 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -6805,7 +7240,7 @@ RectTransform: 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: 105} + m_AnchoredPosition: {x: 505, y: 591} m_SizeDelta: {x: 982, y: 210} m_Pivot: {x: 0.5, y: 1} --- !u!114 &3010144363395460543 @@ -6886,8 +7321,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: 716.2, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 751.25977, y: -79.691} + m_SizeDelta: {x: 144.09, y: 140.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5757991056420505582 CanvasRenderer: @@ -7106,7 +7541,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &547431221857368741 RectTransform: m_ObjectHideFlags: 0 @@ -7124,7 +7559,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 491, y: -135} - m_SizeDelta: {x: 1000, y: 38} + m_SizeDelta: {x: 1000, y: 35} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6850852687243752948 MonoBehaviour: @@ -7191,7 +7626,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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7312,8 +7747,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, y: 88} - m_SizeDelta: {x: 1002, y: 212.09998} + m_AnchoredPosition: {x: -4.82, y: 206.41} + m_SizeDelta: {x: 993.83, y: 191.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2926335415655376684 GameObject: @@ -7416,8 +7851,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, y: -141} - m_SizeDelta: {x: 980, y: 668} + m_AnchoredPosition: {x: 0, y: -106.00001} + m_SizeDelta: {x: 980, y: 562} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3042498601454197881 GameObject: @@ -7454,7 +7889,7 @@ 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: 91.5, y: 1.3275146} + m_AnchoredPosition: {x: 62.5, y: 2.5} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8710119637306700823 @@ -7478,7 +7913,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9852941, g: 1, b: 1, a: 1} + m_Color: {r: 0.9960785, g: 0.9843138, b: 0.97647065, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7486,7 +7921,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: 30 m_FontStyle: 0 m_BestFit: 0 @@ -7498,7 +7933,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10194/29320 + m_Text: 1/4 --- !u!114 &5190500592808343388 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7544,12 +7979,12 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: [] m_Father: {fileID: 3993378406723060650} - m_RootOrder: 0 + m_RootOrder: 2 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: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -408} + m_SizeDelta: {x: 0, y: -742} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &897528657454676403 CanvasRenderer: @@ -7579,7 +8014,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: 9859e8fd4d39ca349946f4c527799eb9, type: 3} + m_Sprite: {fileID: 21300000, guid: be7ae6fdd9a4dce4d96dc48da0958290, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7623,7 +8058,7 @@ 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: 74, y: 1.3275146} + m_AnchoredPosition: {x: 55.7, y: 6} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7240896424657803521 @@ -7647,7 +8082,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9852941, g: 1, b: 1, a: 1} + m_Color: {r: 0.9843138, g: 0.9725491, b: 0.96470594, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7655,8 +8090,8 @@ 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_FontSize: 30 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -7667,7 +8102,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 10194/29320 + m_Text: 1/4 --- !u!114 &8378353857889706982 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8261,7 +8696,7 @@ 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: -2.6, y: -0} + m_AnchoredPosition: {x: -2.6, y: 0} m_SizeDelta: {x: 175.7, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8841664011052020854 @@ -8285,7 +8720,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.54509807, g: 0.40784317, b: 0.043137256, a: 1} + m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8293,9 +8728,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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 1 m_MinSize: 20 m_MaxSize: 42 @@ -8343,8 +8778,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: 500, y: -107} - m_SizeDelta: {x: 798, y: 42} + m_AnchoredPosition: {x: 500, y: -109.5} + m_SizeDelta: {x: 798, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1670544718381925562 CanvasRenderer: @@ -8367,7 +8802,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9686275, g: 0.7843138, b: 0.4156863, a: 1} + m_Color: {r: 0.98823535, g: 0.7490196, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8375,7 +8810,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: 38 m_FontStyle: 0 m_BestFit: 0 @@ -8422,8 +8857,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -4} + m_AnchoredPosition: {x: 24.024994, y: 5.57} + m_SizeDelta: {x: 10.2, y: 3.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3473904372329130134 GameObject: @@ -8464,8 +8899,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, y: 0} - m_SizeDelta: {x: 980, y: 950} + m_AnchoredPosition: {x: 0.000016212, y: 7.4999} + m_SizeDelta: {x: 1000, y: 965} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3477634399272298872 GameObject: @@ -8574,8 +9009,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -14, y: -4} + m_AnchoredPosition: {x: -6.919998, y: 9.071495} + m_SizeDelta: {x: 81.8, y: 4.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3504317797671164804 GameObject: @@ -9061,7 +9496,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 491, y: -210} - m_SizeDelta: {x: 1000, y: 308} + m_SizeDelta: {x: 1000, y: 319} m_Pivot: {x: 0.5, y: 1} --- !u!114 &584019406969180317 MonoBehaviour: @@ -9128,7 +9563,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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9195,7 +9630,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.5176471, g: 0.31764707, b: 0.24313727, a: 1} + m_Color: {r: 0.23529413, g: 0.23529413, b: 0.23137257, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9203,9 +9638,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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 42 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 1 m_MinSize: 20 m_MaxSize: 42 @@ -9251,7 +9686,7 @@ 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: -363, y: 5} + m_AnchoredPosition: {x: -373.8, y: 5} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1155306698190916582 @@ -9275,7 +9710,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.91372555, g: 0.74509805, b: 0.4431373, a: 1} + m_Color: {r: 0.9921569, g: 0.7490196, b: 0.25490198, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9283,12 +9718,12 @@ 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_FontSize: 36 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 - m_MaxSize: 40 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -9332,8 +9767,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: 399, y: -85.5} - m_SizeDelta: {x: 798, y: 77} + m_AnchoredPosition: {x: 399, y: -88.5} + m_SizeDelta: {x: 798, y: 81} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7823415141119418230 CanvasRenderer: @@ -9370,7 +9805,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.909804, g: 0.86274517, b: 0.7490196, a: 1} + m_Color: {r: 0.96470594, g: 0.95294124, b: 0.9450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9378,7 +9813,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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 @@ -9500,8 +9935,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: 0} + m_AnchoredPosition: {x: 24.979996, y: 5.57} + m_SizeDelta: {x: 8.29, y: 3.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7642190566921414220 CanvasRenderer: @@ -9531,8 +9966,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: 705ea7f31f63eec4e9987a23108e5d1a, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a5a6768112bb47b438af00717bd96c4b, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9807,8 +10242,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: 498, y: -206.5} - m_SizeDelta: {x: 798, y: 124} + m_AnchoredPosition: {x: 498, y: -912} + m_SizeDelta: {x: 798, y: 129} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4917058354811781885 MonoBehaviour: @@ -10173,11 +10608,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3256065984343746256} + - {fileID: 1658418164} - {fileID: 8804204650686052798} - {fileID: 1559786694479887320} - - {fileID: 1292131556} - {fileID: 7917170529465593200} + - {fileID: 1292131556} - {fileID: 1974994246116536591} + - {fileID: 708955628} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11534,7 +11972,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.22352943, g: 0.11764707, b: 0.04705883, a: 1} + m_Color: {r: 0.9921569, g: 0.9803922, b: 0.9725491, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11542,7 +11980,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: 50 m_FontStyle: 0 m_BestFit: 1 @@ -12275,7 +12713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7913435484058643755 RectTransform: m_ObjectHideFlags: 0 @@ -12440,8 +12878,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: -138.3, y: 61} - m_SizeDelta: {x: 521.7, y: 42.6} + m_AnchoredPosition: {x: -202, y: 46} + m_SizeDelta: {x: 521.7, y: 49.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5022367247991989084 CanvasRenderer: @@ -12464,7 +12902,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92549026, b: 0.7803922, a: 1} + m_Color: {r: 1, g: 0.7568628, b: 0.2509804, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -12472,20 +12910,94 @@ 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_FontSize: 36 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 42 m_FontStyle: 0 m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 36 + m_MinSize: 4 + m_MaxSize: 42 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5996\u7075\u5E08\u5347\u7EA7" + m_Text: "\u57F9\u517B\u795E\u5C06" LanguageIndex: 0 +--- !u!1 &5246986567134508395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3256065984343746256} + - component: {fileID: 3082972572345119783} + - component: {fileID: 3561555070865519532} + m_Layer: 5 + m_Name: bg (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3256065984343746256 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246986567134508395} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_Children: [] + m_Father: {fileID: 3993378406723060650} + m_RootOrder: 0 + 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: -47.949707} + m_SizeDelta: {x: 0, y: -87.364} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3082972572345119783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246986567134508395} + m_CullTransparentMesh: 0 +--- !u!114 &3561555070865519532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5246986567134508395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 21300000, guid: be7ae6fdd9a4dce4d96dc48da0958290, 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 --- !u!1 &5257715887656434382 GameObject: m_ObjectHideFlags: 0 @@ -12538,7 +13050,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5257715887656434382} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -12551,7 +13063,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: 7491ecf89cbc4344c9165af75629b7e4, type: 3} + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12873,7 +13385,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6784694539140615530 RectTransform: m_ObjectHideFlags: 0 @@ -12971,8 +13483,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: 555.9, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 572.22, y: -81.315} + m_SizeDelta: {x: 138.28, y: 137.37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5263943838629006528 CanvasRenderer: @@ -13464,8 +13976,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: 51c82b1d5f925394096bceed5ffaf143, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 08e990c88f7741b48aefcb87e37822ad, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -13571,7 +14083,8 @@ 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: 1583136866} m_Father: {fileID: 4722485187783559761} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13608,7 +14121,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: db27aece603c8b54ba3448106adef37c, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -13745,8 +14258,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: e163c677d7dd1854fa54073dbf185f41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14004,14 +14517,15 @@ 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: 61516747} m_Father: {fileID: 3993378406723060650} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -287, y: -365} - m_SizeDelta: {x: 262, y: 558} + m_AnchoredPosition: {x: -202, y: -355} + m_SizeDelta: {x: 144, y: 574} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3685460120745777551 CanvasRenderer: @@ -14041,7 +14555,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: 1d0db7f7446d17649b7418f73abb2ce8, type: 3} + m_Sprite: {fileID: 21300000, guid: e70dd6b8466df8b4882e22fd021d69af, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14300,8 +14814,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 0, y: 164} + m_AnchoredPosition: {x: 0, y: 34.649975} + m_SizeDelta: {x: 0, y: 133.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6258796115426376549 CanvasRenderer: @@ -14324,14 +14838,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.21568629, g: 0.2509804, b: 0.27058825, 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_Sprite: {fileID: 21300000, guid: 2609ccd74e672d84c8e128abd8dc9428, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14859,8 +15373,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: 232.99997, y: -2.0000257} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 267.91, y: -5.6935} + m_SizeDelta: {x: 144.06, y: 142.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7530592446128316541 CanvasRenderer: @@ -15722,8 +16236,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: 235.3, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 211.22, y: -81.141} + m_SizeDelta: {x: 140.36, y: 137.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4311435217625910924 CanvasRenderer: @@ -15809,8 +16323,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: -280, y: 0.099998474} - m_SizeDelta: {x: 190, y: 190} + m_AnchoredPosition: {x: -457.91, y: -0.35} + m_SizeDelta: {x: 168.14, y: 170.87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6601946427392776572 CanvasRenderer: @@ -16402,8 +16916,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: 399, y: -21} - m_SizeDelta: {x: 798, y: 42} + m_AnchoredPosition: {x: 399, y: -21.5} + m_SizeDelta: {x: 798, y: 43} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7609060853259269086 CanvasRenderer: @@ -16426,7 +16940,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9686275, g: 0.7843138, b: 0.4156863, a: 1} + m_Color: {r: 0.9960785, g: 0.75294125, b: 0.2509804, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -16434,7 +16948,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: 38 m_FontStyle: 0 m_BestFit: 0 @@ -16516,7 +17030,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: addacd5860691b74db509358d99a6dfb, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16729,8 +17243,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: e163c677d7dd1854fa54073dbf185f41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17002,8 +17516,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: 498, y: 5.5} - m_SizeDelta: {x: 982, y: 130} + m_AnchoredPosition: {x: 498, y: -853} + m_SizeDelta: {x: 982, y: 170} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7349033484907233544 MonoBehaviour: @@ -17076,7 +17590,7 @@ 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: -289, y: 1.3275146} + m_AnchoredPosition: {x: -336.6, y: 10.1} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1902942365644990823 @@ -17100,7 +17614,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.29411766, g: 0.20000002, b: 0.11764707, a: 1} + m_Color: {r: 0.9960785, g: 0.9843138, b: 0.97647065, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -17108,8 +17622,8 @@ 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_FontSize: 30 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -17233,8 +17747,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: 500, y: -221.5} - m_SizeDelta: {x: 798, y: 133} + m_AnchoredPosition: {x: 500, y: -228.5} + m_SizeDelta: {x: 798, y: 141} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2232483086685601850 CanvasRenderer: @@ -17271,7 +17785,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.909804, g: 0.86274517, b: 0.7490196, a: 1} + m_Color: {r: 0.9921569, g: 0.9803922, b: 0.9725491, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -17279,11 +17793,11 @@ 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 0 m_MaxSize: 300 m_Alignment: 3 m_AlignByGeometry: 0 @@ -18149,7 +18663,7 @@ 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: -143, y: 4.6} + m_AnchoredPosition: {x: -154, y: 7.1} m_SizeDelta: {x: 238.21, y: 57.78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5948393373316236050 @@ -18173,7 +18687,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9921569, g: 0.9176471, b: 0.7686275, a: 1} + m_Color: {r: 0.9960785, g: 0.9843138, b: 0.97647065, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -18181,8 +18695,8 @@ 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_FontSize: 36 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -18193,7 +18707,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5170\u537F" + m_Text: "\u4E01\u5C3C" LanguageIndex: 0 --- !u!1 &7995364511170184334 GameObject: @@ -18227,12 +18741,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3993378406723060650} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 70, y: 90} - m_SizeDelta: {x: 140, y: 121} + m_AnchoredPosition: {x: 35.599854, y: 78.1001} + m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5649781079238513794 CanvasRenderer: @@ -18304,7 +18818,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: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} + m_Sprite: {fileID: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -18368,8 +18882,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: 392.99997, y: -2.0000257} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 449.21, y: -5.7} + m_SizeDelta: {x: 141.11, y: 142.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6370651456244402925 CanvasRenderer: @@ -18820,6 +19334,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8200184537381791166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040575313741930874} + - component: {fileID: 3395021192967945857} + - component: {fileID: 262601286731811909} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2040575313741930874 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8200184537381791166} + 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: 1658418164} + 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: -174, y: 170} + m_SizeDelta: {x: 697, y: 720} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3395021192967945857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8200184537381791166} + m_CullTransparentMesh: 0 +--- !u!114 &262601286731811909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8200184537381791166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, 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_Sprite: {fileID: 21300000, guid: cf0af89a5345a1743ab1a3ef2ca869bf, 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 --- !u!1 &8200407148287919770 GameObject: m_ObjectHideFlags: 0 @@ -18935,8 +19523,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: 395.6, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 390.9, y: -81.5} + m_SizeDelta: {x: 140.36, y: 137.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1246786462097129588 CanvasRenderer: @@ -19101,8 +19689,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, y: 0} - m_SizeDelta: {x: 892, y: 205} + m_AnchoredPosition: {x: -0.0037818, y: -0.00030136} + m_SizeDelta: {x: 993.82, y: 191.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7644358859108144471 CanvasRenderer: @@ -19132,8 +19720,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: e163c677d7dd1854fa54073dbf185f41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e58e8fbe3f597304c8d2f35ebdaf1cd8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -19352,7 +19940,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 0.7725491, b: 0.44705886, a: 1} + m_Color: {r: 0.9921569, g: 0.9803922, b: 0.9725491, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -19360,7 +19948,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: 40 m_FontStyle: 0 m_BestFit: 0 @@ -19432,7 +20020,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.92549026, b: 0.7803922, a: 1} + m_Color: {r: 1, g: 0.7568628, b: 0.2509804, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -19440,7 +20028,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: 36 m_FontStyle: 0 m_BestFit: 1 @@ -20091,12 +20679,12 @@ RectTransform: - {fileID: 8782387119347022771} - {fileID: 9024181464137508464} m_Father: {fileID: 3993378406723060650} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -279} - m_SizeDelta: {x: 1012, y: 1098} + m_AnchoredPosition: {x: 4.76, y: -331.07} + m_SizeDelta: {x: 1055.91, y: 1029.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3610307774628648649 CanvasRenderer: @@ -20119,14 +20707,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 0.29803923} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 1410c5d21cdab554c82c0fc2eec0f542, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20862,8 +21450,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: -88.00003, y: -2.0000257} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: -91.88, y: -7.143} + m_SizeDelta: {x: 142.24, y: 139.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5482759906324705110 CanvasRenderer: @@ -20985,8 +21573,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: 75, y: -75} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 25, y: -77} + m_SizeDelta: {x: 140.36, y: 137.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &737767867487573457 CanvasRenderer: @@ -21049,7 +21637,6 @@ GameObject: - component: {fileID: 8657951461215339216} - component: {fileID: 560413786403715626} - component: {fileID: 6409230349812917959} - - component: {fileID: 2043598613755341271} m_Layer: 5 m_Name: value m_TagString: Untagged @@ -21073,8 +21660,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: 462.1, y: -13} - m_SizeDelta: {x: 1008.9, y: 444.5} + m_AnchoredPosition: {x: 468, y: 8} + m_SizeDelta: {x: 931.85, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &560413786403715626 CanvasRenderer: @@ -21105,9 +21692,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: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 - m_FontStyle: 0 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 @@ -21117,20 +21704,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 000 ---- !u!114 &2043598613755341271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9106612788086525120} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -30.48 + m_Text: 2985 --- !u!1 &9107325943613038466 GameObject: m_ObjectHideFlags: 0 @@ -21314,8 +21888,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: 0} + m_AnchoredPosition: {x: -6.919998, y: 9.07} + m_SizeDelta: {x: 81.8, y: 4.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1936476389460047634 CanvasRenderer: @@ -21345,8 +21919,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: 705ea7f31f63eec4e9987a23108e5d1a, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: a5a6768112bb47b438af00717bd96c4b, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua index ffdf3b9010..fe87cd86bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua @@ -20,7 +20,7 @@ function BattleFailPopup:InitComponent() this.btnBattleBack = Util.GetGameObject(this.btnClose, "btnBattleBack") -- this.btnBattleBack:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh") this.btnGrowUp = Util.GetGameObject(this.btnClose, "btnGrowUp") - this.btnGrowUp:SetActive(false) + this.btnGrowUp:SetActive(true) end --绑定事件(用于子类重写) @@ -125,7 +125,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType) else this.btnBattleBack:SetActive(true) --屏蔽我要变强界面 - this.btnGrowUp:SetActive(false) + this.btnGrowUp:SetActive(true) end if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟 --车迟抢夺cd计时 diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index 668a416d26..8b7e542693 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -65,8 +65,8 @@ end -- 按钮开闭状态改变 local _BtnStatus = { - open = {img = "Btn_hz_cheng_01", text = Language[11631], textColor = Color.New(132/255,81/255,62/255,1)}, - close = {img = "Btn_hz_lan_01", text = Language[11632], textColor = Color.New(139/255,104/255,11/255,1)} + open = {img = "Btn_hz_cheng_01", text = Language[11631], textColor = Color.New(255/255,255/255,255/255,1)}, + close = {img = "Btn_hz_lan_01", text = Language[11632], textColor = Color.New(139/255,255/255,255/255,1)} } local function _SetBtnStatus(btn, status) local status = _BtnStatus[status] @@ -74,14 +74,14 @@ local function _SetBtnStatus(btn, status) btn:GetComponent("Image").sprite = this.spLoader:LoadSprite(status.img) local txt = Util.GetGameObject(btn, "Text"):GetComponent("Text") txt.text = status.text - txt.color = status.textColor + -- txt.color = status.textColor end -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabSprite = { default = "r_qrkh_anniu_2", select = "r_qrkh_anniu_1" } -local _TabFontColor = { default = Color.New(181 / 255, 164 / 255, 129 / 255, 1), - select = Color.New(253 / 255, 244 / 255, 214 / 255, 1) } +local _TabSprite = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82" } +local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), + select = Color.New(255 / 255, 244 / 255, 255 / 255, 1) } local _TabData = { [1] = { name = Language[11633] }, [2] = { name = Language[11634] },