diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png new file mode 100644 index 0000000000..78373f58f2 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png.meta new file mode 100644 index 0000000000..3d8439ab6b --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_shouzha_xiangqinganniu_zhankai.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 88a73e3f8c499c74f8a88aadc76d60cf +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: a8dc7b83d5fdf3f41946019a34b1b8d9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/bg/ui/1all/x1_shouzha_xiangqinganniu_zhankai + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab b/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab index dfa19bb9f1..3d5b4a89e7 100644 --- a/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CumulativeSignInPage/CumulativeSignInPage.prefab @@ -10232,10 +10232,10 @@ RectTransform: m_Father: {fileID: 1172801434376863061} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -47.25} - m_SizeDelta: {x: 1080, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6989312482715304746 CanvasRenderer: @@ -40925,8 +40925,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: 75} - m_SizeDelta: {x: 0, y: 150} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2244480119927216183 CanvasRenderer: @@ -70674,8 +70674,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 252, y: 0} - m_SizeDelta: {x: 500, y: 150} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7536152498137274809 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTurnTablePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTurnTablePanel.prefab index b1d4acee5f..183851c465 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTurnTablePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/GMTurnTablePanel.prefab @@ -333,14 +333,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: 9114738857557330517} m_Father: {fileID: 6087331341424848974} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 140} - m_SizeDelta: {x: 1080, y: 282.09998} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 75} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8299743474478871818 CanvasRenderer: @@ -370,8 +371,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: 3028b068b309b47409a50dd817c9eea2, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4796,14 +4797,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: 4822055708053728906} m_Father: {fileID: 6087331341424848974} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -49} - m_SizeDelta: {x: 1080, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -75} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7946456884607008369 CanvasRenderer: @@ -4833,7 +4835,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: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6796,7 +6798,7 @@ RectTransform: m_GameObject: {fileID: 8305499831076538825} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1.1, y: 1.1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 99464975818010241} - {fileID: 6416275302131721669} @@ -6805,8 +6807,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.00012207031, y: 6.324585} - m_SizeDelta: {x: -86.7, y: -186.07} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3463989971481115468 CanvasRenderer: @@ -6896,6 +6898,80 @@ MonoBehaviour: m_EditorClassIdentifier: bgList: - {fileID: 8305499831076538825} +--- !u!1 &8413199434277232084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9114738857557330517} + - component: {fileID: 584658668401934620} + - component: {fileID: 1942976335681847943} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9114738857557330517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413199434277232084} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6416275302131721669} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &584658668401934620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413199434277232084} + m_CullTransparentMesh: 0 +--- !u!114 &1942976335681847943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413199434277232084} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &8752537543696614450 GameObject: m_ObjectHideFlags: 0 @@ -7253,6 +7329,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8993088594594483150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4822055708053728906} + - component: {fileID: 3387658977054751345} + - component: {fileID: 207324521353045477} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4822055708053728906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8993088594594483150} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 99464975818010241} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3387658977054751345 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8993088594594483150} + m_CullTransparentMesh: 0 +--- !u!114 &207324521353045477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8993088594594483150} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &9195832511453355605 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab index d4d63dda12..a1dd1caef9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab @@ -91,7 +91,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &255811598 RectTransform: m_ObjectHideFlags: 0 @@ -102,14 +102,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: 9057185713550936668} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 15 + m_RootOrder: 6 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: 1080, y: 1920} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &255811600 CanvasRenderer: @@ -132,15 +133,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3372549} + 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: 3796162cfd548834b9ad1690928eada9, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -319,7 +320,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1392812423551578608 RectTransform: m_ObjectHideFlags: 0 @@ -332,7 +333,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6644219483140430604} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -705,7 +706,7 @@ RectTransform: - {fileID: 1914701816704577387} - {fileID: 3684034593863546720} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -827,7 +828,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: -25.000006, y: 69.000015} + m_AnchoredPosition: {x: -30, y: 70} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1754108968931128750 @@ -955,9 +956,9 @@ RectTransform: m_Father: {fileID: 6644219483140430604} m_RootOrder: 1 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: 879, y: 413} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 461, y: -547} m_SizeDelta: {x: 1080, y: 607} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6381206931660736406 @@ -1014,7 +1015,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1076101488830439853 RectTransform: m_ObjectHideFlags: 0 @@ -1025,14 +1026,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: 2146173304308067163} m_Father: {fileID: 6644219483140430604} m_RootOrder: 5 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: -189.1} - m_SizeDelta: {x: 1080, y: 212.2} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1064362005287212374 CanvasRenderer: @@ -1062,8 +1064,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: fc80bed94071e644ab04898a5a594bb8, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1179,7 +1181,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: 108.5, y: 23.9} + m_AnchoredPosition: {x: 125.8, y: 27.1} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1259426153701197540 @@ -1255,8 +1257,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: -363.77, y: -7.225} - m_SizeDelta: {x: 352.45, y: 82.25} + m_AnchoredPosition: {x: -353.78, y: -7.225} + m_SizeDelta: {x: 372.42, y: 82.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6641632166812537097 CanvasRenderer: @@ -1279,14 +1281,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + 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: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Sprite: {fileID: 21300000, guid: 3adbc0e9123c8104993737f9d12c7856, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1713,7 +1715,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: -25.5, y: 70.6} + m_AnchoredPosition: {x: -30, y: 70} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4188976732141891790 @@ -1986,14 +1988,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.3301887, g: 0.3301887, b: 0.3301887, 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: 934f215d095d3ee45913a1a02fabe1e1, type: 3} + m_Sprite: {fileID: 21300000, guid: 9cb13075ee4603d4f90ae1d726dfbace, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2236,6 +2238,80 @@ RectTransform: m_AnchoredPosition: {x: 15.2, y: -61.5} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4067911052836447895 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9057185713550936668} + - component: {fileID: 8710720005869319972} + - component: {fileID: 6217623315911765833} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9057185713550936668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4067911052836447895} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 255811598} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8710720005869319972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4067911052836447895} + m_CullTransparentMesh: 0 +--- !u!114 &6217623315911765833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4067911052836447895} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &4199049055252965978 GameObject: m_ObjectHideFlags: 0 @@ -2344,7 +2420,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: 108.5, y: 23.899994} + m_AnchoredPosition: {x: 125.8, y: 29.8} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3884711067977012906 @@ -2384,6 +2460,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4469214072135490035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2146173304308067163} + - component: {fileID: 4977672303451158598} + - component: {fileID: 1691336736152067019} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2146173304308067163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4469214072135490035} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1076101488830439853} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4977672303451158598 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4469214072135490035} + m_CullTransparentMesh: 0 +--- !u!114 &1691336736152067019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4469214072135490035} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &4629705831960009256 GameObject: m_ObjectHideFlags: 0 @@ -2420,7 +2570,7 @@ RectTransform: - {fileID: 5704303402115166813} - {fileID: 711231147870342049} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -3283,7 +3433,7 @@ RectTransform: - {fileID: 6575261367868995470} - {fileID: 6674498300103096360} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3533,7 +3683,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5704303402115166813 RectTransform: m_ObjectHideFlags: 0 @@ -3802,7 +3952,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3559728542211955428 RectTransform: m_ObjectHideFlags: 0 @@ -3837,7 +3987,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6635880018591886319} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4044,8 +4194,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: -1.02, y: -7.225} - m_SizeDelta: {x: 365, y: 82.25} + m_AnchoredPosition: {x: -1.47, y: -7.225} + m_SizeDelta: {x: 416.66, y: 82.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2467968163884791889 CanvasRenderer: @@ -4068,14 +4218,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + 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: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Sprite: {fileID: 21300000, guid: 15c50ece49e64744f8a1b1f2ba91ed8a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4120,6 +4270,7 @@ RectTransform: - {fileID: 6644082289809142330} - {fileID: 7092402891103020475} - {fileID: 1076101488830439853} + - {fileID: 255811598} - {fileID: 8673813077271240747} - {fileID: 3700405974883273176} - {fileID: 7092402890559882759} @@ -4129,7 +4280,6 @@ RectTransform: - {fileID: 7058538016867905670} - {fileID: 7092402891614543931} - {fileID: 7092402890339107051} - - {fileID: 255811598} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4486,8 +4636,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: 6.4, y: 3.24} - m_SizeDelta: {x: 205, y: 109} + m_AnchoredPosition: {x: 6.4, y: 0} + m_SizeDelta: {x: 205, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7083837331954130465 CanvasRenderer: @@ -4517,7 +4667,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: a0197572fad951f42aea1fe738f49ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4640,7 +4790,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: -61} + m_AnchoredPosition: {x: 1.5, y: -65.6} m_SizeDelta: {x: 291, y: 33.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7083837332785674323 @@ -4678,7 +4828,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -4814,7 +4964,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6644219483140430604} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5013,7 +5163,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.000012159, y: 0.61001} - m_SizeDelta: {x: 109.24, y: 55.8} + m_SizeDelta: {x: 56, y: 73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402890554352683 CanvasRenderer: @@ -5036,14 +5186,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.22806162, b: 0.22806162, a: 1} 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: 7481f1ebd61b03a49ba7fa41d24d8db1, type: 3} + m_Sprite: {fileID: 21300000, guid: 8d7ab5e312aea384ebec212a172c76df, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5087,11 +5237,11 @@ RectTransform: - {fileID: 2030770693468687629} - {fileID: 1136621146226883004} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 6, y: 0} m_SizeDelta: {x: -800, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402890559883257 @@ -5122,7 +5272,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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} + m_Sprite: {fileID: 21300000, guid: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5211,8 +5361,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -171, y: 62} - m_SizeDelta: {x: 245.45, y: 95.84} + m_AnchoredPosition: {x: -171, y: 60} + m_SizeDelta: {x: 245.45, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402891049115533 CanvasRenderer: @@ -5299,7 +5449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -63.399902} + m_AnchoredPosition: {x: 0, y: -147} m_SizeDelta: {x: 1080, y: 120.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402891103020477 @@ -5411,11 +5561,11 @@ RectTransform: - {fileID: 5289277818595638466} - {fileID: 3122458684525046258} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 2} + m_AnchoredPosition: {x: 6, y: 2} m_SizeDelta: {x: -800, y: 82.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402891292911296 @@ -5446,7 +5596,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: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} + m_Sprite: {fileID: 21300000, guid: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5527,12 +5677,12 @@ RectTransform: - {fileID: 7092402891049115531} - {fileID: 7092402890458696120} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 13 + m_RootOrder: 14 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: 115.37012} - m_SizeDelta: {x: 0, y: 228.86} + m_AnchoredPosition: {x: 0, y: 94} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7092402891668152926 GameObject: @@ -5641,11 +5791,11 @@ RectTransform: m_Children: - {fileID: 6765698815121289964} m_Father: {fileID: 6644219483140430604} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -74.79999, y: -48} + m_AnchoredPosition: {x: -74.79999, y: -100} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402891833268214 @@ -6192,8 +6342,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: 362.32, y: -7.2249975} - m_SizeDelta: {x: 355.37, y: 82.25} + m_AnchoredPosition: {x: 340.58, y: -7.2249975} + m_SizeDelta: {x: 447.75, y: 82.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4278344715972646195 CanvasRenderer: @@ -6216,14 +6366,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + 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: 3871582dadbfc39489517bdfd808d2de, type: 3} + m_Sprite: {fileID: 21300000, guid: 43bad874208991d46ae84bb373dbff66, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6597,7 +6747,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &105720266029349049 RectTransform: m_ObjectHideFlags: 0 @@ -6632,7 +6782,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8848405874144490682} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab index bd3380e743..e4140d1ae5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildCreatePopup.prefab @@ -34,8 +34,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: -82, y: 256} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -96.82, y: 266.5} + m_SizeDelta: {x: 779.64, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &811298399 CanvasRenderer: @@ -66,7 +66,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -108,8 +108,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: -98.08, y: -243.07} - m_SizeDelta: {x: 881.09, y: 140.36} + m_AnchoredPosition: {x: -97.2, y: -244.37} + m_SizeDelta: {x: 881.08, y: 142.98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &853846408 CanvasRenderer: @@ -132,14 +132,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.29803923, g: 0.29803923, b: 0.29803923, 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: ab98a801fc52d784abc0d137dc9daeb2, type: 3} + m_Sprite: {fileID: 21300000, guid: e96778c92b829d440aff02f28517c684, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -848,7 +848,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: 397.9, y: 275} + m_AnchoredPosition: {x: 397.9, y: 281.8} m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2727275124067233855 @@ -983,7 +983,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: 22.8, y: -93.823} + m_AnchoredPosition: {x: 15, y: -93.823} m_SizeDelta: {x: 380.4, y: 98.747} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6911432954377995085 @@ -1065,7 +1065,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: -166.2} + m_AnchoredPosition: {x: 0, y: -89} m_SizeDelta: {x: 350, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1216682546454095854 @@ -1083,7 +1083,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3001583836054145182} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} m_Name: @@ -1289,8 +1289,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.000026464462, y: 289} - m_SizeDelta: {x: 393.1, y: 78} + m_AnchoredPosition: {x: -0.000026464462, y: 283.46024} + m_SizeDelta: {x: 393.1, y: 66.92} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &658272160063599769 CanvasRenderer: @@ -1400,8 +1400,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: -1.199997, y: 1.7000008} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -1.199997, y: -1.61} + m_SizeDelta: {x: 0, y: -6.63} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8595280640828294275 CanvasRenderer: @@ -1494,8 +1494,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: 4.35, y: 23.83} - m_SizeDelta: {x: 881.02, y: 610.56} + m_AnchoredPosition: {x: 4.75, y: 16.6} + m_SizeDelta: {x: 895.7, y: 625} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4027570039683125968 CanvasRenderer: @@ -1525,8 +1525,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: d93ad50a8a319c44c887d7e7743089a7, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: b58713968e107324dbcdba541e584a97, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1953,7 +1953,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 270, y: -2} + m_AnchoredPosition: {x: 282, y: -2} m_SizeDelta: {x: 168, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7860518441368377984 @@ -2028,10 +2028,10 @@ RectTransform: m_Father: {fileID: 4005018912734477405} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 477.4, y: -556.4} - m_SizeDelta: {x: 260, y: 86.7} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 130.04999} + m_SizeDelta: {x: 260, y: 67.29999} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6137564643651636582 CanvasRenderer: @@ -2061,7 +2061,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: ca89b0ae6a91d1b4894f2aec2b6870bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab index b378c273e7..2f090ce695 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab @@ -5213,14 +5213,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.34117648, g: 0.57254905, b: 0.7843138, a: 1} + 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: 59a110ee2814bcc4aa8b193db20671eb, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5977,7 +5977,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: -74.100006, y: -23.985} + m_AnchoredPosition: {x: -83.30002, y: -23.985} m_SizeDelta: {x: 148.2, y: 47.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4442676989553633270 @@ -6154,7 +6154,6 @@ GameObject: - component: {fileID: 6364594990673868264} - component: {fileID: 4012418606331479052} - component: {fileID: 8985348131877442319} - - component: {fileID: 1197796143256262657} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -6202,7 +6201,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6224,21 +6223,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u796D\u7940" LanguageIndex: 10765 ---- !u!114 &1197796143256262657 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1053828115552263179} - 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 &1102647642841199968 GameObject: m_ObjectHideFlags: 0 @@ -6776,7 +6760,6 @@ GameObject: - component: {fileID: 131288191783484264} - component: {fileID: 899855773451988404} - component: {fileID: 9160093860161583653} - - component: {fileID: 7338685813614195988} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -6824,7 +6807,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6846,21 +6829,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u796D\u7940" LanguageIndex: 10765 ---- !u!114 &7338685813614195988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1627211569070059466} - 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 &1742615669428956495 GameObject: m_ObjectHideFlags: 0 @@ -7000,14 +6968,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.7686275, b: 0.2509804, a: 1} + 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: 59a110ee2814bcc4aa8b193db20671eb, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22403,7 +22371,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: 48.199997, y: -24.24} + m_AnchoredPosition: {x: 39, y: -24.24} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6074991162195745859 @@ -28597,7 +28565,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: 48.199997, y: -24.24} + m_AnchoredPosition: {x: 38.999985, y: -24.24} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7265594538996291318 @@ -54549,7 +54517,6 @@ GameObject: - component: {fileID: 7912420254590955545} - component: {fileID: 3336424220850891208} - component: {fileID: 6294692902584674477} - - component: {fileID: 6019540954085123866} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -54597,7 +54564,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -54619,21 +54586,6 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u796D\u7940" LanguageIndex: 10765 ---- !u!114 &6019540954085123866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6645557316925916960} - 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 &6718240182180054249 GameObject: m_ObjectHideFlags: 0 @@ -59793,7 +59745,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: -75.06001, y: -23.985} + m_AnchoredPosition: {x: -84.260025, y: -23.985} m_SizeDelta: {x: 150.12, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1886121198255968713 @@ -69626,8 +69578,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: -3, y: 535} - m_SizeDelta: {x: 759.1, y: 90.7} + m_AnchoredPosition: {x: 0, y: 532.25} + m_SizeDelta: {x: 759.1, y: 57.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3390160005561743777 CanvasRenderer: @@ -79813,7 +79765,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: 48.199997, y: -24.24} + m_AnchoredPosition: {x: 38.999985, y: -24.24} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1101886362587750928 @@ -80413,14 +80365,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.95496154, b: 0, a: 0.78431374} + 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: 59a110ee2814bcc4aa8b193db20671eb, type: 3} + m_Sprite: {fileID: 21300000, guid: 9657165ee43a7cb44ba1f1d5b522d220, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -80805,7 +80757,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: -74.09998, y: -23.985} + m_AnchoredPosition: {x: -83.299995, y: -23.985} m_SizeDelta: {x: 148.2, y: 47.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2805111865229199273 diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab index b397ebe5e1..e2c222a43b 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab @@ -361,18 +361,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101509314520818176} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 8692004331891666274} m_Father: {fileID: 164915241442772717} m_RootOrder: 20 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + 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: -20.5, y: -221} - m_SizeDelta: {x: 41, y: 54} + m_AnchoredPosition: {x: -40, y: -220} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &178270766791968774 CanvasRenderer: @@ -402,7 +402,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: 2831df743ec3cb5438b0b5d1720f95a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -621,18 +621,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 102186211317692344} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 172021020964701869} m_Father: {fileID: 164915241442772717} m_RootOrder: 19 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 20.099854, y: -221} - m_SizeDelta: {x: 41, y: 54} + m_AnchoredPosition: {x: 40, y: -220} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &177908693869766306 CanvasRenderer: @@ -662,7 +662,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: 2831df743ec3cb5438b0b5d1720f95a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1005,7 +1005,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: 0.00012207031, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8613212963809518708 diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab index d4b06c8745..c215194300 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab @@ -191,8 +191,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: 75} - m_SizeDelta: {x: 0, y: 150} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7542022274762481564 CanvasRenderer: @@ -420,7 +420,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: 0.000030517578, y: -0.089157104} + m_AnchoredPosition: {x: -0.0000076293945, y: -0.089157104} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &744132200954143323 @@ -2017,10 +2017,10 @@ RectTransform: m_Father: {fileID: 6663010155952068177} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -49} - m_SizeDelta: {x: 1080, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: -108, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3184107062536152105 CanvasRenderer: @@ -2329,7 +2329,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: 0, y: -0.089157104} + m_AnchoredPosition: {x: 0.000015258789, y: -0.089157104} m_SizeDelta: {x: 0, y: 73.4} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8361129838433844735 @@ -4439,8 +4439,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 176.29999, y: 0} - m_SizeDelta: {x: 350, y: 150} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7180021202547119348 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab index d7e02f11b7..c1c550b474 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab @@ -322,14 +322,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: 7726153632794284083} m_Father: {fileID: 7410245405657339441} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 145.20001} - m_SizeDelta: {x: 1082, y: 293} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &867137510 CanvasRenderer: @@ -359,8 +360,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: 3028b068b309b47409a50dd817c9eea2, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -396,14 +397,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: 3478233771300292648} m_Father: {fileID: 7410245405657339441} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -16} - m_SizeDelta: {x: 1080, y: 160.90002} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &970448285 CanvasRenderer: @@ -433,7 +435,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: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17695,6 +17697,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2983618003836274750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3478233771300292648} + - component: {fileID: 6226263043308686644} + - component: {fileID: 8614224563987666696} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3478233771300292648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983618003836274750} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 970448283} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6226263043308686644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983618003836274750} + m_CullTransparentMesh: 0 +--- !u!114 &8614224563987666696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2983618003836274750} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &3197730382221156750 GameObject: m_ObjectHideFlags: 0 @@ -39545,6 +39621,80 @@ RectTransform: m_AnchoredPosition: {x: 13.00006, y: -6} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6384826721826678553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7726153632794284083} + - component: {fileID: 5324623201602200797} + - component: {fileID: 1379986359103616407} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7726153632794284083 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6384826721826678553} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 867137508} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5324623201602200797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6384826721826678553} + m_CullTransparentMesh: 0 +--- !u!114 &1379986359103616407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6384826721826678553} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &6709669294040875246 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 34d4ca5252..005f40cb9f 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -16616,18 +16616,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1312317756811486} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 219696096722737611} m_Father: {fileID: 224287801546099592} m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 39.19995, y: -210} - m_SizeDelta: {x: 41, y: 54} + m_AnchoredPosition: {x: 40, y: -210} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222839504031791556 CanvasRenderer: @@ -16657,7 +16657,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: 2831df743ec3cb5438b0b5d1720f95a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -55459,18 +55459,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1973028961041766} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalScale: {x: 2, y: 2, z: 1} m_Children: - {fileID: 8777396624495063556} m_Father: {fileID: 224287801546099592} m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + 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: -41, y: -209.99995} - m_SizeDelta: {x: 41, y: 54} + m_AnchoredPosition: {x: -40, y: -209.99995} + m_SizeDelta: {x: 35, y: 51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222637961811482464 CanvasRenderer: @@ -55500,7 +55500,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: 2831df743ec3cb5438b0b5d1720f95a1, type: 3} + m_Sprite: {fileID: 21300000, guid: 88a73e3f8c499c74f8a88aadc76d60cf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/UIComponent/RewardPreviewPopupPanel.prefab b/Assets/ManagedResources/Prefabs/UI/UIComponent/RewardPreviewPopupPanel.prefab index ff7342a2a4..ef593581f1 100644 --- a/Assets/ManagedResources/Prefabs/UI/UIComponent/RewardPreviewPopupPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UIComponent/RewardPreviewPopupPanel.prefab @@ -611,6 +611,7 @@ GameObject: - component: {fileID: 2734725976211655058} - component: {fileID: 542289860568797826} - component: {fileID: 315647519666738108} + - component: {fileID: 6754967896010678050} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -658,7 +659,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9843137, g: 0.92156863, b: 0.7921569, a: 1} + m_Color: {r: 0.990566, g: 0.990566, b: 0.990566, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -680,6 +681,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9884\u89C8" LanguageIndex: 10314 +--- !u!114 &6754967896010678050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 335147056515067537} + 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 &3869658501654062427 GameObject: m_ObjectHideFlags: 0 @@ -715,7 +731,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: 5.67, y: 84.99} + m_AnchoredPosition: {x: 5.67, y: 90} m_SizeDelta: {x: 271.43, y: 53.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4991455067993822074 @@ -739,14 +755,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.50980395} 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: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Sprite: {fileID: 21300000, guid: 9de21071f2793424faf0a4e5fe3aa72b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -790,7 +806,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: 7.282501, y: -42.309998} + m_AnchoredPosition: {x: 6.5, y: -52} m_SizeDelta: {x: 540.86, y: 117.26999} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5345020139289378439 @@ -1064,7 +1080,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: -137.6, y: 31.92} + m_AnchoredPosition: {x: -137.6, y: 35.3} m_SizeDelta: {x: 243.14, y: 38.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6165221085415576618 @@ -1088,7 +1104,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.95686275, g: 0.9137255, b: 0.79607844, a: 1} + m_Color: {r: 0.5754717, g: 0.26341486, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1147,8 +1163,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: 555.43, y: 267.54} + m_AnchoredPosition: {x: 0, y: -3.96} + m_SizeDelta: {x: 555.43, y: 275.47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1766614166512103337 CanvasRenderer: @@ -1178,7 +1194,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: a9d99aaadd0a9e143b499c7f81be48b2, type: 3} + m_Sprite: {fileID: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua index cc7145d26e..935502b90a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua @@ -10,8 +10,8 @@ local curMonsterId = 1 local curProgress = -1 local curMonsterIdConFig = {} local TabBox = require("Modules/Common/TabBox") -local _TabData={ [1] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11006] }, - [2] = { default = "UI_hz_zhonghe01_83", select = "UI_hz_zhonghe01_82", name = Language[11007] }, } +local _TabData={ [1] = { default = "task_bigbtn02", select = "task_bigbtn01", name = Language[11006] }, + [2] = { default = "task_bigbtn02", select = "task_bigbtn01", name = Language[11007] }, } local _TabFontColor = { default = Color.New(255 / 255, 255 / 255, 255 / 255, 1), select = Color.New(0 / 255, 0 / 255, 0 / 255, 1)} this.timer = Timer.New()