diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png new file mode 100644 index 0000000000..de14738ede Binary files /dev/null and b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png differ diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png.meta b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png.meta new file mode 100644 index 0000000000..ae6f623c34 --- /dev/null +++ b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_diban.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 443280890f85e2f4d8e3f8b303b116da +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: fb4d2425307844742977f2232999f3e4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: VipAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png new file mode 100644 index 0000000000..796e9ec950 Binary files /dev/null and b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png differ diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png.meta b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png.meta new file mode 100644 index 0000000000..49bc5116e0 --- /dev/null +++ b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_juanzhou.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9e66f93772f3b2d45b534523a3a33d6e +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4971c65512184c94380fc445970fe4f3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: VipAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png new file mode 100644 index 0000000000..204dcbf285 Binary files /dev/null and b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png differ diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png.meta b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png.meta new file mode 100644 index 0000000000..2bc119a602 --- /dev/null +++ b/Assets/ManagedResources/Atlas/VipAtlas/t_tehuishangcheng_mwlb.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 1f2e4ee54ae87b54b8ddf132cec950ab +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 12574ce1a29a6ba40a33b8f79e9887af + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: VipAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png new file mode 100644 index 0000000000..376678511a Binary files /dev/null and b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png differ diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png.meta b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png.meta new file mode 100644 index 0000000000..9681123829 --- /dev/null +++ b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip13.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9149d48b3558caf478e8da6f76672048 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6ab80b3907adde8469464a992d6ee6f4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: VipAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png new file mode 100644 index 0000000000..0564a075c3 Binary files /dev/null and b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png differ diff --git a/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png.meta b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png.meta new file mode 100644 index 0000000000..9eb74afc98 --- /dev/null +++ b/Assets/ManagedResources/Atlas/VipAtlas/t_tequan_vip14.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 19408e10034080340bcf7e8e837f8e51 +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: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9ad27b20434f6b047b133ea9c2910f5a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: VipAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab index a991837e7e..45a6f50e4f 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGift.prefab @@ -5343,6 +5343,7 @@ RectTransform: - {fileID: 8732076565492756891} - {fileID: 6747441234806744336} - {fileID: 2249479841007689904} + - {fileID: 8951944902492485810} m_Father: {fileID: 2503184306461626439} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5463,7 +5464,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 75} - m_SizeDelta: {x: 100, y: 30} + m_SizeDelta: {x: 400, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1997933028730248696 CanvasRenderer: @@ -5486,7 +5487,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.32941177, g: 0.11764706, b: 0.043137256, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5494,13 +5495,13 @@ 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_FontSize: 25 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 32 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -5520,6 +5521,7 @@ GameObject: - component: {fileID: 8401498673239489844} - component: {fileID: 1806112097232180666} - component: {fileID: 2942852332482521065} + - component: {fileID: 1641115428988503643} m_Layer: 5 m_Name: btn2 m_TagString: Untagged @@ -5544,8 +5546,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: 150, y: 0} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: 200, y: 0} + m_SizeDelta: {x: 350, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8401498673239489844 CanvasRenderer: @@ -5575,7 +5577,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: 28b027b180b778c41b8092b27491f575, type: 3} + m_Sprite: {fileID: 21300000, guid: 2f8aa4834dad54c448d093eaa5d3302d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5602,7 +5604,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -5626,6 +5628,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &1641115428988503643 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260918842556662980} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1300386692391486592 GameObject: m_ObjectHideFlags: 0 @@ -5926,8 +5947,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: 130} - m_SizeDelta: {x: 400, y: 100} + m_AnchoredPosition: {x: 0, y: 164} + m_SizeDelta: {x: 384, y: 124} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2586335370741607631 CanvasRenderer: @@ -5957,7 +5978,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: 91e247fcad1d50e49881ae8351c42f12, type: 3} + m_Sprite: {fileID: 21300000, guid: 1f2e4ee54ae87b54b8ddf132cec950ab, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6312,7 +6333,7 @@ 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: 0, y: 498} + m_AnchoredPosition: {x: 0, y: 220} m_SizeDelta: {x: 800, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4183419663796758959 @@ -6330,7 +6351,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2088128666940297165} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -6389,7 +6410,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6747441234806744336 RectTransform: m_ObjectHideFlags: 0 @@ -6463,7 +6484,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8166369644700974135 RectTransform: m_ObjectHideFlags: 0 @@ -6645,7 +6666,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: 188.3, y: 18.4} + m_AnchoredPosition: {x: 188.3, y: 22} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4640564643410836341 @@ -6669,7 +6690,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36862746, g: 0.10980392, b: 0.07450981, a: 1} + m_Color: {r: 0.33333334, g: 0.29803923, b: 0.21176471, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6677,9 +6698,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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 20 - m_FontStyle: 1 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 @@ -12066,7 +12087,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8732076565492756891 RectTransform: m_ObjectHideFlags: 0 @@ -12258,17 +12279,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5786534921751410812} - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2000002, y: 1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1595694487346067251} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 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: -35.000042} - m_SizeDelta: {x: 708, y: 336} + m_SizeDelta: {x: 1008, y: 402} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4033881209679693389 CanvasRenderer: @@ -12298,7 +12319,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: 6ad4bf4afd2635c41bce3623acf90372, type: 3} + m_Sprite: {fileID: 21300000, guid: 9e66f93772f3b2d45b534523a3a33d6e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23032,6 +23053,7 @@ GameObject: - component: {fileID: 9014475331328764011} - component: {fileID: 3054121663030398331} - component: {fileID: 3073419220333745008} + - component: {fileID: 7977571338824639555} m_Layer: 5 m_Name: btn1 m_TagString: Untagged @@ -23057,8 +23079,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: -150, y: 0} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: -200, y: 0} + m_SizeDelta: {x: 350, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9014475331328764011 CanvasRenderer: @@ -23088,7 +23110,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: 28b027b180b778c41b8092b27491f575, type: 3} + m_Sprite: {fileID: 21300000, guid: 2f8aa4834dad54c448d093eaa5d3302d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23115,7 +23137,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 3 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -23139,6 +23161,25 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &7977571338824639555 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6604162349673340248} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6709669294040875246 GameObject: m_ObjectHideFlags: 0 @@ -23268,8 +23309,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.27999878, y: 9.139999} - m_SizeDelta: {x: -53.17, y: -41.16} + m_AnchoredPosition: {x: 0.009994507, y: 15.970001} + m_SizeDelta: {x: -52.62, y: -54.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &293691310229872014 CanvasRenderer: @@ -23292,7 +23333,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3679245, g: 0.109646894, b: 0.0746262, a: 1} + m_Color: {r: 0.30980393, g: 0.18431373, b: 0.0746262, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -23301,11 +23342,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + 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 @@ -23313,6 +23354,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "60\u5143\u4E03\u5929\u7279\u60E0" +--- !u!1 &6815229155297420626 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8951944902492485810} + - component: {fileID: 7203217056291112806} + - component: {fileID: 4129209328954024690} + m_Layer: 5 + m_Name: bg_meiri + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8951944902492485810 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815229155297420626} + 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: 1595694487346067251} + 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: -772} + m_SizeDelta: {x: 1080, y: 1154} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7203217056291112806 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815229155297420626} + m_CullTransparentMesh: 0 +--- !u!114 &4129209328954024690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6815229155297420626} + 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: 443280890f85e2f4d8e3f8b303b116da, 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 &6818159016353304869 GameObject: m_ObjectHideFlags: 0 @@ -24300,8 +24415,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.27999878, y: 9.139999} - m_SizeDelta: {x: -53.17, y: -41.16} + m_AnchoredPosition: {x: 0.009994507, y: 15.970001} + m_SizeDelta: {x: -52.62, y: -54.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5577082131410003319 CanvasRenderer: @@ -24324,7 +24439,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.3679245, g: 0.109646894, b: 0.0746262, a: 1} + m_Color: {r: 0.30980393, g: 0.18431373, b: 0.07450981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -24333,11 +24448,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + 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 @@ -24709,8 +24824,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: -207} - m_SizeDelta: {x: 1080, y: 1100} + m_AnchoredPosition: {x: 0, y: -243.6} + m_SizeDelta: {x: 1080, y: 1026.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8321324423810495249 CanvasRenderer: