diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanhaohua_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanhaohua_zh.png index 282cf2f329..340f4debf0 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanhaohua_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanhaohua_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanputong_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanputong_zh.png index 65f2976722..bdb265111e 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanputong_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_yueka_fanhuanputong_zh.png differ diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di001.jpg.meta b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di001.jpg.meta index 9786b29271..f85ba720cc 100644 --- a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di001.jpg.meta +++ b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di001.jpg.meta @@ -92,6 +92,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png index 9b0363a3ea..612da2ce93 100644 Binary files a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png and b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png differ diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png.meta b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png.meta index 755ab9e1bd..a4ecd3397e 100644 --- a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png.meta +++ b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di002.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: ead6197c344dc04418f198ed41813deb TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: y_yueka_di002 externalObjects: {} serializedVersion: 9 mipmaps: @@ -91,9 +92,40 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: y_yueka_di002 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1074 + height: 769 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4e7adab9bdc20c744bbb9c9be4b39d91 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png index 345fd68b2a..06e66ec63f 100644 Binary files a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png and b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png differ diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png.meta b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png.meta index 52fb11be42..af01cfe11f 100644 --- a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png.meta +++ b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di003.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: d67fb557ed2e5484fa76b2fa3a2a04e5 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: y_yueka_di003 externalObjects: {} serializedVersion: 9 mipmaps: @@ -91,9 +92,40 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: y_yueka_di003 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1069 + height: 769 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: cdb1b71c9b3399f418ba269e9574cc86 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png new file mode 100644 index 0000000000..753b50081a Binary files /dev/null and b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png differ diff --git a/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png.meta b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png.meta new file mode 100644 index 0000000000..ee252598a4 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/MonthCard/y_yueka_di004.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: c1045d273092d4548a92081001de6976 +TextureImporter: + fileIDToRecycleName: + 21300000: y_yueka_di004 + 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 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: y_yueka_di004 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1069 + height: 770 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e43c126eb43ea914c9a6d7a76a89d932 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f81d7a6a892a7e747a77131b66810021 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png index 815bf84e54..cc5e36ba11 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png.meta index ca83e02cdf..5eaf46db53 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_haohuayueka_zh.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: 341f249142521b146aa4593bf99a529c TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: l_yueka_haohuayueka_zh externalObjects: {} serializedVersion: 9 mipmaps: @@ -104,7 +105,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: l_yueka_haohuayueka_zh + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 144 + height: 275 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 70d53c973a9067f4cac86100018f4d84 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png index 84264473f5..f45066da8f 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png.meta index 6fda830980..2c17fe6d1e 100644 --- a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_putongyueka_zh.png.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 guid: 5845f9e560a422e4584d26c308590fd4 TextureImporter: - fileIDToRecycleName: {} + fileIDToRecycleName: + 21300000: l_yueka_putongyueka_zh externalObjects: {} serializedVersion: 9 mipmaps: @@ -104,7 +105,27 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: l_yueka_putongyueka_zh + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 143 + height: 274 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 7167238810e1ef84386e52b51177aab9 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png new file mode 100644 index 0000000000..94a0fe710d Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png.meta new file mode 100644 index 0000000000..0e78b9ad9a --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/CommonAtlas/ArtFont/l_yueka_zhiliyueka_zh.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: d5fdd180ac1f70a4b89002cbad4630e0 +TextureImporter: + fileIDToRecycleName: + 21300000: l_yueka_zhiliyueka_zh + 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 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: l_yueka_zhiliyueka_zh + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 144 + height: 274 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 437d5e8194e5d1540969339854e232a2 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1ba959062a9bcbf40a863707536a08c5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab index 88e4695369..c65b0bd5d2 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonthCardPageView/MonthCardPage.prefab @@ -74,6 +74,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &527932059456346673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8201385441617745361} + - component: {fileID: 2512064467717266730} + - component: {fileID: 1397876341484969856} + - component: {fileID: 551360269647337464} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8201385441617745361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527932059456346673} + 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: 265857190056922033} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 84.7, y: -7.34} + m_SizeDelta: {x: 68.27, y: 68.27} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2512064467717266730 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527932059456346673} + m_CullTransparentMesh: 0 +--- !u!114 &1397876341484969856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527932059456346673} + 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: 5e5c91d262c8e414ab260c59ffbe9764, 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!114 &551360269647337464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527932059456346673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1397876341484969856} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &572621229245494596 GameObject: m_ObjectHideFlags: 0 @@ -108,7 +225,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: 76.6, y: 27.6} + m_AnchoredPosition: {x: 74.8, y: 22.4} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4668609719842626927 @@ -148,6 +265,55 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &645277651437473598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 265857190056922033} + - component: {fileID: 425627881049754097} + m_Layer: 5 + m_Name: day + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &265857190056922033 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645277651437473598} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8201385441617745361} + - {fileID: 264623087456530657} + - {fileID: 3326673636124126628} + - {fileID: 6587134604720815811} + - {fileID: 6533006547223536166} + m_Father: {fileID: 7575418362025843762} + m_RootOrder: 2 + 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: 131.59998, y: -90.8} + m_SizeDelta: {x: 128, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &425627881049754097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 645277651437473598} + m_CullTransparentMesh: 0 --- !u!1 &835163315430301067 GameObject: m_ObjectHideFlags: 0 @@ -186,8 +352,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: 107.7, y: -205} - m_SizeDelta: {x: 205, y: 64} + m_AnchoredPosition: {x: 122.5, y: -170.19998} + m_SizeDelta: {x: 189.67, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2407126899749709015 CanvasRenderer: @@ -287,6 +453,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1266521000021990262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 264623087456530657} + - component: {fileID: 5375332762596319012} + - component: {fileID: 1897808834241844487} + m_Layer: 5 + m_Name: Text1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &264623087456530657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266521000021990262} + 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: 265857190056922033} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 27.8} + m_SizeDelta: {x: 465.69, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5375332762596319012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266521000021990262} + m_CullTransparentMesh: 0 +--- !u!114 &1897808834241844487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1266521000021990262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 28 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7D2F\u8BA1\u5145\u503C98\u5143\u5373\u53EF\u6FC0\u6D3B30\u5929\u6708\u5361" + LanguageIndex: 0 --- !u!1 &1445592261366595565 GameObject: m_ObjectHideFlags: 0 @@ -316,6 +562,7 @@ RectTransform: m_Children: - {fileID: 4971920776083045945} - {fileID: 5180010647268677438} + - {fileID: 7575418362025843762} m_Father: {fileID: 4971744144487204077} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -358,7 +605,7 @@ 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.0999985, y: 2} + m_AnchoredPosition: {x: -1.699997, y: 2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4369638722673338225 @@ -537,7 +784,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -558,7 +805,7 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6FC0\u6D3B\u540E\u6BCF\u65E5\u53EF\u9886 120" LanguageIndex: 0 ---- !u!1 &3201822105249476772 +--- !u!1 &2685885012971572426 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -566,50 +813,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5165780255621293144} - - component: {fileID: 6234097943826390443} - - component: {fileID: 8686942853267058641} + - component: {fileID: 4531651750384998965} + - component: {fileID: 5717909907737988345} + - component: {fileID: 1108661302250523263} + - component: {fileID: 531140639333279374} + - component: {fileID: 8416371029482456712} m_Layer: 5 - m_Name: icon + m_Name: small m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5165780255621293144 +--- !u!224 &4531651750384998965 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201822105249476772} + m_GameObject: {fileID: 2685885012971572426} 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: 6441485654904605232} - m_RootOrder: 0 + m_Children: + - {fileID: 6320424381200867460} + - {fileID: 2094348260189509364} + m_Father: {fileID: 7575418362025843762} + m_RootOrder: 3 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: 60, y: -12.1} - m_SizeDelta: {x: 68.27, y: 68.27} + m_AnchoredPosition: {x: 122.6, y: -170.09998} + m_SizeDelta: {x: 189.67, y: 57} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6234097943826390443 +--- !u!222 &5717909907737988345 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201822105249476772} + m_GameObject: {fileID: 2685885012971572426} m_CullTransparentMesh: 0 ---- !u!114 &8686942853267058641 +--- !u!114 &1108661302250523263 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3201822105249476772} + m_GameObject: {fileID: 2685885012971572426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -617,13 +868,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: 5e5c91d262c8e414ab260c59ffbe9764, type: 3} + m_Sprite: {fileID: 21300000, guid: 0369f1a4b8a6a9a4b8a0017fc41eb2b8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -632,6 +883,300 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &531140639333279374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2685885012971572426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1108661302250523263} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &8416371029482456712 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2685885012971572426} + 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 &2834214268209637220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7311895865455839107} + - component: {fileID: 2434538086358349223} + - component: {fileID: 598133122984274173} + m_Layer: 5 + m_Name: Text1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7311895865455839107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834214268209637220} + 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: 8807756257108280955} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 27.8} + m_SizeDelta: {x: 465.69, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2434538086358349223 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834214268209637220} + m_CullTransparentMesh: 0 +--- !u!114 &598133122984274173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2834214268209637220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 28 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7D2F\u8BA1\u5145\u503C98\u5143\u5373\u53EF\u6FC0\u6D3B30\u5929\u6708\u5361" + LanguageIndex: 0 +--- !u!1 &2919491301281228210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7859986225446450823} + - component: {fileID: 8309263163098307967} + - component: {fileID: 4815326316527692246} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7859986225446450823 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2919491301281228210} + 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: 7575418362025843762} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 445.8, y: 37.8} + m_SizeDelta: {x: 144, y: 276} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8309263163098307967 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2919491301281228210} + m_CullTransparentMesh: 0 +--- !u!114 &4815326316527692246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2919491301281228210} + 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: d5fdd180ac1f70a4b89002cbad4630e0, 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 &2946859341582979394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6587134604720815811} + - component: {fileID: 6391161496157761425} + - component: {fileID: 5936837895625586997} + m_Layer: 5 + m_Name: progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6587134604720815811 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946859341582979394} + 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: 265857190056922033} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -21.499985, y: -42.700073} + m_SizeDelta: {x: 77, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6391161496157761425 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946859341582979394} + m_CullTransparentMesh: 0 +--- !u!114 &5936837895625586997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946859341582979394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 48 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: (0/30) --- !u!1 &3356622969535287239 GameObject: m_ObjectHideFlags: 0 @@ -691,7 +1236,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -711,6 +1256,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: (0/30) +--- !u!1 &3695262960656417200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7575418362025843762} + - component: {fileID: 6886002773320695113} + - component: {fileID: 663917498601819242} + m_Layer: 5 + m_Name: smallImg3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7575418362025843762 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695262960656417200} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7859986225446450823} + - {fileID: 4489974066314178073} + - {fileID: 265857190056922033} + - {fileID: 4531651750384998965} + m_Father: {fileID: 7066509116918457454} + m_RootOrder: 2 + 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, y: -515} + m_SizeDelta: {x: 1069, y: 769} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6886002773320695113 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695262960656417200} + m_CullTransparentMesh: 0 +--- !u!114 &663917498601819242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3695262960656417200} + 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: 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: d67fb557ed2e5484fa76b2fa3a2a04e5, 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 &3865732237358091142 GameObject: m_ObjectHideFlags: 0 @@ -770,7 +1393,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -825,7 +1448,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: -41.3, y: -18.9} + m_AnchoredPosition: {x: -40.7, y: -17.6} m_SizeDelta: {x: 67.96, y: 67.96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3466423706481441624 @@ -903,8 +1526,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: 107.7, y: -200.70001} - m_SizeDelta: {x: 205, y: 64} + m_AnchoredPosition: {x: 118.2, y: -172.3} + m_SizeDelta: {x: 189.67, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8548845781308496013 CanvasRenderer: @@ -1004,6 +1627,85 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4428064226506225730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5835546179871124357} + - component: {fileID: 139408702170180014} + - component: {fileID: 7714052890069965788} + m_Layer: 5 + m_Name: progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5835546179871124357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428064226506225730} + 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: 8807756257108280955} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -21.499985, y: -42.700073} + m_SizeDelta: {x: 77, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &139408702170180014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428064226506225730} + m_CullTransparentMesh: 0 +--- !u!114 &7714052890069965788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428064226506225730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 48 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: (0/30) --- !u!1 &4582622455870356426 GameObject: m_ObjectHideFlags: 0 @@ -1039,7 +1741,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: 24.5, y: -18} + m_AnchoredPosition: {x: 22.299961, y: -16.700014} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2737954019301571697 @@ -1099,6 +1801,80 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1.5, y: -2.5} m_UseGraphicAlpha: 1 +--- !u!1 &4807614539625779106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2094348260189509364} + - component: {fileID: 8550141195667242421} + - component: {fileID: 8273591644498141531} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2094348260189509364 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807614539625779106} + 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: 4531651750384998965} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 72.799995, y: 22.799995} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8550141195667242421 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807614539625779106} + m_CullTransparentMesh: 0 +--- !u!114 &8273591644498141531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4807614539625779106} + 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: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &4815601026680428734 GameObject: m_ObjectHideFlags: 0 @@ -1133,7 +1909,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 74.59999, y: 28} + m_AnchoredPosition: {x: 72.799995, y: 22.799995} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8285070213480678908 @@ -1268,86 +2044,6 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1.5, y: -2.5} m_UseGraphicAlpha: 1 ---- !u!1 &5159998455764732447 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6620274020262767979} - - component: {fileID: 3642096283390823098} - - component: {fileID: 6451374743474627661} - m_Layer: 5 - m_Name: Text1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6620274020262767979 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5159998455764732447} - 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: 6441485654904605232} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -18, y: 24.7} - m_SizeDelta: {x: 465.69, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3642096283390823098 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5159998455764732447} - m_CullTransparentMesh: 0 ---- !u!114 &6451374743474627661 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5159998455764732447} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 28 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u7D2F\u8BA1\u5145\u503C98\u5143\u5373\u53EF\u6FC0\u6D3B30\u5929\u8C6A\u534E\u6708\u5361" - LanguageIndex: 0 --- !u!1 &5180010647268677439 GameObject: m_ObjectHideFlags: 0 @@ -1379,15 +2075,15 @@ RectTransform: m_Children: - {fileID: 5180010648293587640} - {fileID: 6441485655260911295} - - {fileID: 6441485654904605232} + - {fileID: 8807756257108280955} - {fileID: 5805930671271100523} m_Father: {fileID: 7066509116918457454} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -330} - m_SizeDelta: {x: 1000, y: 732} + m_AnchoredPosition: {x: -6.4, y: 14.1} + m_SizeDelta: {x: 1069, y: 770} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5180010647268677432 CanvasRenderer: @@ -1411,13 +2107,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: d67fb557ed2e5484fa76b2fa3a2a04e5, type: 3} + m_Sprite: {fileID: 21300000, guid: c1045d273092d4548a92081001de6976, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1460,8 +2156,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: 388, y: 101} - m_SizeDelta: {x: 156, y: 298} + m_AnchoredPosition: {x: 446.4, y: 37.1} + m_SizeDelta: {x: 144, y: 276} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5180010648293587642 CanvasRenderer: @@ -1538,8 +2234,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.0025634766, y: 333.985} - m_SizeDelta: {x: 1000, y: 732} + m_AnchoredPosition: {x: -4.4, y: 543.6} + m_SizeDelta: {x: 1074, y: 769} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4968833506923594175 CanvasRenderer: @@ -1563,7 +2259,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1624,165 +2320,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5180967560649300263} m_CullTransparentMesh: 0 ---- !u!1 &5435699999851080471 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1030295336322166920} - - component: {fileID: 1762281477482862947} - - component: {fileID: 2936787994941115575} - m_Layer: 5 - m_Name: Text2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1030295336322166920 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5435699999851080471} - 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: 6441485654904605232} - m_RootOrder: 2 - 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: -19.5, y: -13.2} - m_SizeDelta: {x: 465.69, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1762281477482862947 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5435699999851080471} - m_CullTransparentMesh: 0 ---- !u!114 &2936787994941115575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5435699999851080471} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 28 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6FC0\u6D3B\u540E\u6BCF\u65E5\u53EF\u9886 120" - LanguageIndex: 0 ---- !u!1 &5540127000538377356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2326893421798718775} - - component: {fileID: 2642936697831834106} - - component: {fileID: 8005655269562055583} - m_Layer: 5 - m_Name: progress - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2326893421798718775 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5540127000538377356} - 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: 6441485654904605232} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -20.499939, y: -48.19998} - m_SizeDelta: {x: 77, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2642936697831834106 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5540127000538377356} - m_CullTransparentMesh: 0 ---- !u!114 &8005655269562055583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5540127000538377356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 28 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 48 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: (0/30) --- !u!1 &5896622929611438610 GameObject: m_ObjectHideFlags: 0 @@ -1817,8 +2354,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: 386, y: 99} - m_SizeDelta: {x: 156, y: 298} + m_AnchoredPosition: {x: 436, y: 49.3} + m_SizeDelta: {x: 144, y: 276} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8406442136051189284 CanvasRenderer: @@ -1891,7 +2428,7 @@ 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.9000244, y: 2.4000244} + m_AnchoredPosition: {x: -3.7000203, y: 2.4000244} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4505636820290057087 @@ -1937,6 +2474,181 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7ACB\u5373\u6FC0\u6D3B" LanguageIndex: 0 +--- !u!1 &6200879840956219819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6533006547223536166} + - component: {fileID: 6566787259267556910} + - component: {fileID: 5025715511484819810} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6533006547223536166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200879840956219819} + 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: 265857190056922033} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -19.499985, y: -41.599953} + m_SizeDelta: {x: 77, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6566787259267556910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200879840956219819} + m_CullTransparentMesh: 0 +--- !u!114 &5025715511484819810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200879840956219819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59:96:07:10" + LanguageIndex: 0 +--- !u!1 &6408821753618600896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1633007037924680981} + - component: {fileID: 7363443406359240278} + - component: {fileID: 1519425001596781895} + - component: {fileID: 9004873548532437934} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1633007037924680981 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408821753618600896} + 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: 4489974066314178073} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 22.7, y: -18} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7363443406359240278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408821753618600896} + m_CullTransparentMesh: 0 +--- !u!114 &1519425001596781895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408821753618600896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 6000 +--- !u!114 &9004873548532437934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6408821753618600896} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1.5, y: -2.5} + m_UseGraphicAlpha: 1 --- !u!1 &6441485654668963024 GameObject: m_ObjectHideFlags: 0 @@ -1948,6 +2660,7 @@ GameObject: - component: {fileID: 6441485654668963023} - component: {fileID: 6441485654668963021} - component: {fileID: 6441485654668963022} + - component: {fileID: 4119572274089753975} m_Layer: 5 m_Name: icon m_TagString: Untagged @@ -1996,7 +2709,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2011,55 +2724,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6441485654904605233 -GameObject: +--- !u!114 &4119572274089753975 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6441485654904605232} - - component: {fileID: 6441485654904605230} - m_Layer: 5 - m_Name: day - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6441485654904605232 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6441485654904605233} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5165780255621293144} - - {fileID: 6620274020262767979} - - {fileID: 1030295336322166920} - - {fileID: 2326893421798718775} - - {fileID: 944547930558072810} - m_Father: {fileID: 5180010647268677438} - m_RootOrder: 2 - 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: 129, y: -112} - m_SizeDelta: {x: 128, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6441485654904605230 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6441485654904605233} - m_CullTransparentMesh: 0 + m_GameObject: {fileID: 6441485654668963024} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6441485654668963022} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6441485655260911296 GameObject: m_ObjectHideFlags: 0 @@ -2096,8 +2802,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: -375, y: 255.7} - m_SizeDelta: {x: 184, y: 184} + m_AnchoredPosition: {x: -370.6, y: 194.9} + m_SizeDelta: {x: 185, y: 185} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6441485655260911293 CanvasRenderer: @@ -2127,7 +2833,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: f7fe1c86f7187c9498383c55026b83aa, type: 3} + m_Sprite: {fileID: 21300000, guid: 947dcb493ade6d7489a21f44429221dc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2172,8 +2878,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: -379, y: 279.2} - m_SizeDelta: {x: 184, y: 184} + m_AnchoredPosition: {x: -366.7, y: 202.3} + m_SizeDelta: {x: 168, y: 169} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6441485656000309165 CanvasRenderer: @@ -2212,7 +2918,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7469432927734712753 +--- !u!1 &6804908516500555754 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2220,9 +2926,134 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 944547930558072810} - - component: {fileID: 7262677307925826402} - - component: {fileID: 1102133796145085935} + - component: {fileID: 4489974066314178073} + - component: {fileID: 8696511369718897512} + - component: {fileID: 219585387587278433} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4489974066314178073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804908516500555754} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1633007037924680981} + - {fileID: 2041799638272427764} + m_Father: {fileID: 7575418362025843762} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -375, y: 255.7} + m_SizeDelta: {x: 184, y: 184} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8696511369718897512 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804908516500555754} + m_CullTransparentMesh: 0 +--- !u!114 &219585387587278433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6804908516500555754} + 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: f7fe1c86f7187c9498383c55026b83aa, 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 &7182310010740003330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8807756257108280955} + - component: {fileID: 8900347307570088968} + m_Layer: 5 + m_Name: day + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8807756257108280955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7182310010740003330} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1717823373632098367} + - {fileID: 7311895865455839107} + - {fileID: 4789213461027923063} + - {fileID: 5835546179871124357} + - {fileID: 3133427568679790989} + m_Father: {fileID: 5180010647268677438} + m_RootOrder: 2 + 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: 131, y: -90.8} + m_SizeDelta: {x: 128, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8900347307570088968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7182310010740003330} + m_CullTransparentMesh: 0 +--- !u!1 &7538271840593356840 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3133427568679790989} + - component: {fileID: 3070894062492538994} + - component: {fileID: 7192666983349874229} m_Layer: 5 m_Name: time m_TagString: Untagged @@ -2230,40 +3061,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &944547930558072810 +--- !u!224 &3133427568679790989 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7469432927734712753} + m_GameObject: {fileID: 7538271840593356840} 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: 6441485654904605232} + m_Father: {fileID: 8807756257108280955} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -18.499985, y: -47.100067} + m_AnchoredPosition: {x: -19.499985, y: -41.599953} m_SizeDelta: {x: 77, y: 24} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7262677307925826402 +--- !u!222 &3070894062492538994 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7469432927734712753} + m_GameObject: {fileID: 7538271840593356840} m_CullTransparentMesh: 0 ---- !u!114 &1102133796145085935 +--- !u!114 &7192666983349874229 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7469432927734712753} + m_GameObject: {fileID: 7538271840593356840} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} @@ -2271,7 +3102,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2292,6 +3123,320 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5269\u4F59:96:07:10" LanguageIndex: 0 +--- !u!1 &7686431714652780837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3326673636124126628} + - component: {fileID: 6579253545357937568} + - component: {fileID: 4745410832393861968} + m_Layer: 5 + m_Name: Text2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3326673636124126628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7686431714652780837} + 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: 265857190056922033} + m_RootOrder: 2 + 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.1, y: -8.8} + m_SizeDelta: {x: 465.69, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6579253545357937568 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7686431714652780837} + m_CullTransparentMesh: 0 +--- !u!114 &4745410832393861968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7686431714652780837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 28 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6FC0\u6D3B\u540E\u6BCF\u65E5\u53EF\u9886 1" + LanguageIndex: 0 +--- !u!1 &7765829893784511670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4789213461027923063} + - component: {fileID: 9205281721694598817} + - component: {fileID: 3468896039935263230} + m_Layer: 5 + m_Name: Text2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4789213461027923063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7765829893784511670} + 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: 8807756257108280955} + m_RootOrder: 2 + 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.1, y: -8.8} + m_SizeDelta: {x: 465.69, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9205281721694598817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7765829893784511670} + m_CullTransparentMesh: 0 +--- !u!114 &3468896039935263230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7765829893784511670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960784, g: 0.14901961, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 28 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6FC0\u6D3B\u540E\u6BCF\u65E5\u53EF\u9886 120" + LanguageIndex: 0 +--- !u!1 &8539410786584697719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2041799638272427764} + - component: {fileID: 1980740935538376665} + - component: {fileID: 6728287156648036540} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2041799638272427764 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539410786584697719} + 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: 4489974066314178073} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -40.4, y: -18.9} + m_SizeDelta: {x: 67.96, y: 67.96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1980740935538376665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539410786584697719} + m_CullTransparentMesh: 0 +--- !u!114 &6728287156648036540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8539410786584697719} + 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: 292ef1dfcd26c54468ba4398663bd63d, 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 &8570994315660090925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6320424381200867460} + - component: {fileID: 3705220698179836014} + - component: {fileID: 7744120393174650780} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6320424381200867460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570994315660090925} + 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: 4531651750384998965} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.9000244, y: 2.4000244} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3705220698179836014 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570994315660090925} + m_CullTransparentMesh: 0 +--- !u!114 &7744120393174650780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8570994315660090925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.827451, b: 0.4627451, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7ACB\u5373\u6FC0\u6D3B" + LanguageIndex: 0 --- !u!1 &8832468536782824201 GameObject: m_ObjectHideFlags: 0 @@ -2330,7 +3475,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: 129, y: -112} + m_AnchoredPosition: {x: 129, y: -90.8} m_SizeDelta: {x: 128, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8832468536782824204 @@ -2375,7 +3520,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: 33} + m_AnchoredPosition: {x: 0, y: 27.8} m_SizeDelta: {x: 465.69, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1151637475517524053 @@ -2400,7 +3545,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.21960784, g: 0.14901961, b: 0, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2421,3 +3566,120 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5145\u503C98\u5143\u5373\u53EF\u6FC0\u6D3B30\u5929\u6708\u5361" LanguageIndex: 0 +--- !u!1 &8986614592371148200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1717823373632098367} + - component: {fileID: 1025143842765614094} + - component: {fileID: 2284855941321354814} + - component: {fileID: 4392659644533724299} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1717823373632098367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986614592371148200} + 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: 8807756257108280955} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 71.1, y: -7.34} + m_SizeDelta: {x: 68.27, y: 68.27} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1025143842765614094 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986614592371148200} + m_CullTransparentMesh: 0 +--- !u!114 &2284855941321354814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986614592371148200} + 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: 5e5c91d262c8e414ab260c59ffbe9764, 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!114 &4392659644533724299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986614592371148200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + 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} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2284855941321354814} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 15eb644412..32dc22836f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2475,6 +2475,7 @@ DirectBuyType = { MONTH_CARD_TYPE = { MONTHCARD = 1, LUXURYMONTHCARD = 2, + GIFT = 3, } --战力类型 WarPowerTypeAllNum = 3--战力类型总数量 下边结构加一种类型 此数值 + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 96b2171a4d..26b85819d5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -307,7 +307,7 @@ function this.RefreshUpdateIndication(buffer) ActivityGiftManager.isFirstForSupremeHero=false BindPhoneNumberManager.InitBindInfo(msg.playerBindPhone) LuckyTurnTableManager.ReceiveServerDataForFive(msg.posInfos,msg.posInfosAdvance) - OperatingManager.BackSetMonthCardGetStateData(msg.MonthDailyTake) + MonthCardManager.BackSetMonthCardGetStateData(msg.MonthDailyTake) MyGuildManager.SetMyFeteInfo_FiveRefresh(msg) MyGuildManager.SetGuildHelpInfo_FiveRefresh(msg) -- CarbonManager.dailyChallengeInfo=msg.dailyChallengeInfo @@ -843,7 +843,7 @@ function this.RefreshAccuMoneyNum(buffer) local msg=PlayerInfoProto_pb.RefreshRechargeIndication() msg:ParseFromString(data) VipManager.RefreshChargeMoney(msg.amount, false) - OperatingManager.RefreshMonthCardChargeMoney(msg) + MonthCardManager.RefreshMonthCardChargeMoney(msg) end -- 巅峰战阶段更新 @@ -901,7 +901,7 @@ function this.RefreshMonthCardData(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.MonthCardIndication() msg:ParseFromString(data) - OperatingManager.UpdateMonthCardData(msg) + MonthCardManager.UpdateMonthCardData(msg) end function this.RefreshGuildCarDelayProgressData(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index fc18909282..d20ca0255d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -201,7 +201,7 @@ function this.PlayerInfoRequest(func) OperatingManager.SetSignInData(msg.SignInInfo) --月卡初始化数据 - OperatingManager.InitMonthCardData(msg.monthinfos) + MonthCardManager.InitMonthCardData(msg.monthinfos) --每日副本数据 CarbonManager.dailyChallengeInfo=msg.dailyChallengeInfo diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua index ad023b17c8..9f81783f5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianManager.lua @@ -63,8 +63,10 @@ end function this.UpdateStatus() local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian) for k,v in pairs(this.rewardData) do - v.state = temp[v.id].state - v.progress = temp[v.id].progress + if temp[v.id] then + v.state = temp[v.id].state + v.progress = temp[v.id].progress + end end CheckRedPointStatus(RedPointType.NiuQiChongTian_1) CheckRedPointStatus(RedPointType.NiuQiChongTian_2) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index 0fb0013a88..712640d0d0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -210,7 +210,7 @@ function GrowthGiftPage:RequestBuy() local giftGoodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, self.curGiftsId) PayManager.Pay(giftGoodsInfo.goodsId, function(id) -- 检测月卡激活是否需要拍脸 - OperatingManager.CheckMonthCardPatFace() + MonthCardManager.CheckMonthCardPatFace() self:RefreshStatus() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua new file mode 100644 index 0000000000..c10075ca4f --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua @@ -0,0 +1,172 @@ +MonthCardManager = {} +local this = MonthCardManager + +--初始化月卡数据 +local monthCardData = {} +function this.InitMonthCardData(data) + monthCardData = {} + --LogError("月卡信息初始化 "..#data) + for i = 1, #data do + --LogError("月卡信息初始化 "..data[i].id.." "..data[i].endingTime.." "..data[i].state) + local singleMonthCard = {} + singleMonthCard.id = data[i].id + singleMonthCard.endingTime = data[i].endingTime + singleMonthCard.state = data[i].state + singleMonthCard.totleAmt = data[i].totleAmt + -- LogError("月卡信息初始化 "..i.." 月卡累计充值 "..data[i].totleAmt) + table.insert(monthCardData,singleMonthCard) + end + CheckRedPointStatus(RedPointType.MonthCard) +end +--推送更新月卡数据 +function this.UpdateMonthCardData(msg) + --LogError("月卡信息推送 "..#msg.monthinfos) + --当我数据没有 后端推过来的有数据 此时需要弹窗 + this.showStr = "" + for i = 1, #msg.monthinfos do + if monthCardData[i].endingTime <= 0 then + this.showStr = Language[11384] + end + end + monthCardData = {} + local _CurActive = {} + for i = 1, #msg.monthinfos do + --LogError("月卡信息推送 "..msg.monthinfos[i].id.." "..msg.monthinfos[i].endingTime.." "..msg.monthinfos[i].state) + local singleMonthCard = {} + singleMonthCard.id = msg.monthinfos[i].id + singleMonthCard.endingTime = msg.monthinfos[i].endingTime + singleMonthCard.state = msg.monthinfos[i].state--0 未领取 1 已领取 + singleMonthCard.totleAmt = msg.monthinfos[i].totleAmt + _CurActive[i] = true + table.insert(monthCardData,singleMonthCard) + end + -- 检测红点 + CheckRedPointStatus(RedPointType.MonthCard) + + -- 判断是否需要发送埋点数据 + if this.showStr ~= "" then + if ActTimeCtrlManager.SingleFuncState(JumpType.Welfare) then + if _CurActive[MONTH_CARD_TYPE.MONTHCARD] then + --发送埋点数据 + CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyMonthCard,0) + end + if _CurActive[MONTH_CARD_TYPE.LUXURYMONTHCARD] then + --发送埋点数据 + CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyHeightMonthCard,0) + end + end + end +end + +-- 检测月卡激活提示是否需要拍脸 +function this.CheckMonthCardPatFace() + if this.showStr and this.showStr ~= "" then + MsgPanel.ShowTwo(this.showStr, function() + JumpManager.GoJump(36004) + end, + function() + UIManager.ClosePanel() + end,Language[10586],Language[11385]) + -- 拍过后不再提示 + this.showStr = "" + return true + end +end + +function this.RefreshMonthCardChargeMoney(msg) + -- LogError("月卡金额信息推送 "..msg.monthSaveAmt.." "..msg.smonthSaveAmt) + monthCardData[MONTH_CARD_TYPE.MONTHCARD].totleAmt = msg.monthSaveAmt--月卡累计总额 + monthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].totleAmt = msg.smonthSaveAmt--豪华月卡累计总额 + -- monthCardData[MONTH_CARD_TYPE.GIFT].totleAmt = msg.smonthSaveAmt--挚礼月卡累计总额 +end +-- 月卡累计总额 +function this.GetmonthSaveAmt(index) + if monthCardData[index] and monthCardData[index].totleAmt then + return monthCardData[index].totleAmt + end + return 0 +end +-- 豪华月卡累计总额 +function this.GetsmonthSaveAmt() + return smonthSaveAmt +end +--前端设置月卡领取状态数据 +function this.SetMonthCardGetStateData(type,state) + if monthCardData[type] then + monthCardData[type].state = state--0 未领取 1 已领取 + end + CheckRedPointStatus(RedPointType.MonthCard) +end +--后端设置月卡领取状态数据 datas已领取的月卡id 五点刷新 +function this.BackSetMonthCardGetStateData(datas) + for i = 1, #monthCardData do + if monthCardData[i] then--0 未领取 1 已领取 + if datas[i] then + monthCardData[i].state = 1 + else + monthCardData[i].state = 0 + end + end + end + --事件 + CheckRedPointStatus(RedPointType.MonthCard) + Game.GlobalEvent:DispatchEvent(GameEvent.MonthCard.OnMonthCardUpdate) +end +--获取月卡数据 +function this.GetMonthCardData() + if monthCardData then + return monthCardData + else + return nil + end +end +function this.IsMonthCardActive() + local curAllMonthCardData = this.GetMonthCardData() + local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0 + local curLuxuryMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].endingTime ~= 0 + local isMonthCardActive = curLuxuryMonthCardOpenState + return isMonthCardActive +end + +--月卡到期 +local addTimeNum = 30 * 24 * 60 * 60 +function this.RefreshMonthCardEnd() + for i = 1, #monthCardData do + if monthCardData[i] and monthCardData[i].endingTime > 0 then--0 未领取 1 已领取 + local dayLuxuryNum = math.floor((monthCardData[i].endingTime + addTimeNum - GetTimeStamp()) / (24 * 3600)) + if dayLuxuryNum < 0 then + monthCardData[i].endingTime = 0 + monthCardData[i].state = 0 --0 未领取 1 已领取 + monthCardData[i].totleAmt = 0 + end + end + end + CheckRedPointStatus(RedPointType.MonthCard) +end +--单种月卡红点检测 +function this.RefreshMonthCardRedPoint(type) + if monthCardData[type] then + if monthCardData[type].endingTime ~= 0 and monthCardData[type].state == 0 then + return true + end + end + return false +end +--所有月卡红点检测 +function this.AllRefreshMonthCardRedPoint() + for i = 1, #monthCardData do + if monthCardData[i].endingTime ~= 0 and monthCardData[i].state == 0 then + return true + end + end + return false +end +--所有月卡激活状态 +function this.GetMonthCardIsOpen(type) + if monthCardData[type] then + if monthCardData[type].endingTime ~= 0 then + return true + end + end + return false +end \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua.meta b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua.meta new file mode 100644 index 0000000000..2df8f78bc0 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardManager.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90a140eb9bf35094e85451e9475ee861 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua index 34221b4090..7b77a98eef 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MonthCardPage.lua @@ -2,7 +2,8 @@ local MonthCardPage = {} local cardData = { [1] = { curState = 0 ,cardType = MONTH_CARD_TYPE.MONTHCARD}, - [2] = { curState = 0 ,cardType = MONTH_CARD_TYPE.LUXURYMONTHCARD} + [2] = { curState = 0 ,cardType = MONTH_CARD_TYPE.LUXURYMONTHCARD}, + [3] = { curState = 0 ,cardType = MONTH_CARD_TYPE.GIFT} } local sortingOrder = 0 local addTimeNum = 30 * 24 * 60 * 60 @@ -39,7 +40,7 @@ function MonthCardPage:InitComponent() self.cardPres[i].icon = Util.GetGameObject(self.cardPres[i].go, "day/icon"):GetComponent("Image") self.cardPres[i].dayRightUpText = Util.GetGameObject(self.cardPres[i].go, "Image/Text"):GetComponent("Text") self.cardPres[i].dayRightUpIcon = Util.GetGameObject(self.cardPres[i].go, "Image/icon"):GetComponent("Image") - Util.GetGameObject(self.cardPres[i].go, "day/icon"):GetComponent("RectTransform").anchoredPosition = offSetX[GetCurLanguage()] + -- Util.GetGameObject(self.cardPres[i].go, "day/icon"):GetComponent("RectTransform").anchoredPosition = offSetX[GetCurLanguage()] end end @@ -52,8 +53,8 @@ function MonthCardPage:BindEvent() else if self.curAllMonthCardData[cardData[i].cardType].state == 0 then NetManager.MonthCardTakeDailyRequest(cardData[i].cardType, function(drop) - OperatingManager.SetMonthCardGetStateData(cardData[i].cardType,1) - self.curAllMonthCardData = OperatingManager.GetMonthCardData() + MonthCardManager.SetMonthCardGetStateData(cardData[i].cardType,1) + self.curAllMonthCardData = MonthCardManager.GetMonthCardData() UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() self:SetCardShow(i) end) @@ -89,13 +90,13 @@ function MonthCardPage:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder - OperatingManager.RefreshMonthCardEnd() + MonthCardManager.RefreshMonthCardEnd() self:RefreshStoneShow() end -- 妖晶数量显示 function MonthCardPage:RefreshStoneShow(index) - self.curAllMonthCardData = OperatingManager.GetMonthCardData() + self.curAllMonthCardData = MonthCardManager.GetMonthCardData() --月卡 for i = 1, #self.cardPres do self:SetCardShow(i) @@ -108,10 +109,10 @@ function MonthCardPage:SetCardShow(i) self.cardPres[i].day2.text = Language[11380]..monthCardConFig[cardData[i].cardType].BaseReward[1][2] .."" self.cardPres[i].icon.sprite = self.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,monthCardConFig[cardData[i].cardType].BaseReward[1][1]).ResourceID)) self.cardPres[i].progress:SetActive(not cardData[i].curState) - self.cardPres[i].progress:GetComponent("Text").text = "("..OperatingManager.GetmonthSaveAmt(i).."/"..monthCardConFig[cardData[i].cardType].Price..")" + self.cardPres[i].progress:GetComponent("Text").text = "("..MonthCardManager.GetmonthSaveAmt(i).."/"..monthCardConFig[cardData[i].cardType].Price..")" self.cardPres[i].dayRightUpText = monthCardConFig[cardData[i].cardType].ContiueDays * monthCardConFig[cardData[i].cardType].BaseReward[1][2] self.cardPres[i].dayRightUpIcon = SetIcon(self.spLoader, monthCardConFig[cardData[i].cardType].BaseReward[1][1]) - self.cardPres[i].monthRedPot:SetActive(OperatingManager.RefreshMonthCardRedPoint(cardData[i].cardType)) + self.cardPres[i].monthRedPot:SetActive(MonthCardManager.RefreshMonthCardRedPoint(cardData[i].cardType)) self.cardPres[i].btnText = Language[11381] if not cardData[i].curState then self.cardPres[i].time:SetActive(false) @@ -136,6 +137,11 @@ function MonthCardPage:SetCardShow(i) Util.GetGameObject(self.cardPres[i].month, "Text"):GetComponent("Text").text = Language[10101] end end + + -- 物品点击显示详情 + Util.AddOnceClick(self.cardPres[i].icon.gameObject, function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, monthCardConFig[cardData[i].cardType].BaseReward[1][1],nil,true) + end) end function MonthCardPage:SetMonthCardTimes(timeNums,timeCom,index) @@ -147,8 +153,8 @@ function MonthCardPage:SetMonthCardTimes(timeNums,timeCom,index) self.timerList[index] = Timer.New(function() timeCom:GetComponent("Text").text = Language[10023]..TimeStampToDateStr3(timeNums) if timeNums < 0 then - OperatingManager.RefreshMonthCardEnd() - self.curAllMonthCardData = OperatingManager.GetMonthCardData() + MonthCardManager.RefreshMonthCardEnd() + self.curAllMonthCardData = MonthCardManager.GetMonthCardData() self:SetCardShow(index) self.timerList[index]:Stop() self.timerList[index] = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 7bb3d4124f..6daf370a41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -5,6 +5,7 @@ * @Author MagicianJoker, fengliudianshao@outlook.com * @Copyright Copyright (c) 2019, MagicianJoker --]] +require("Modules.Operating.MonthCardManager") OperatingManager = {} local this = OperatingManager @@ -593,191 +594,6 @@ function this.GetShowTime(endTime) end ---月卡开始 ---初始化月卡数据 -local monthSaveAmt = 0--月卡累计总额 -local smonthSaveAmt = 0--豪华月卡累计总额 -local monthCardData = {} -function this.InitMonthCardData(data) - monthCardData = {} - --LogError("月卡信息初始化 "..#data) - for i = 1, #data do - --LogError("月卡信息初始化 "..data[i].id.." "..data[i].endingTime.." "..data[i].state) - local singleMonthCard = {} - singleMonthCard.id = data[i].id - singleMonthCard.endingTime = data[i].endingTime - singleMonthCard.state = data[i].state - if i == MONTH_CARD_TYPE.MONTHCARD then - --LogError("月卡信息初始化 月卡累计充值 "..data[i].totleAmt) - monthSaveAmt = data[i].totleAmt - elseif i == MONTH_CARD_TYPE.LUXURYMONTHCARD then - --LogError("月卡信息初始化 豪华月卡累计充值 "..data[i].totleAmt) - smonthSaveAmt = data[i].totleAmt - end - table.insert(monthCardData,singleMonthCard) - end - CheckRedPointStatus(RedPointType.MonthCard) -end ---推送更新月卡数据 -function this.UpdateMonthCardData(msg) - --LogError("月卡信息推送 "..#msg.monthinfos) - --当我数据没有 后端推过来的有数据 此时需要弹窗 - this.showStr = "" - for i = 1, #msg.monthinfos do - if monthCardData[i].endingTime <= 0 then - this.showStr = Language[11384] - end - end - monthCardData = {} - local curActiveMONTHCARD = false - local curActiveLUXURYMONTHCARD = false - for i = 1, #msg.monthinfos do - --LogError("月卡信息推送 "..msg.monthinfos[i].id.." "..msg.monthinfos[i].endingTime.." "..msg.monthinfos[i].state) - local singleMonthCard = {} - singleMonthCard.id = msg.monthinfos[i].id - singleMonthCard.endingTime = msg.monthinfos[i].endingTime - singleMonthCard.state = msg.monthinfos[i].state--0 未领取 1 已领取 - if i == MONTH_CARD_TYPE.MONTHCARD then - monthSaveAmt = msg.monthinfos[i].totleAmt - curActiveMONTHCARD = true - elseif i == MONTH_CARD_TYPE.LUXURYMONTHCARD then - smonthSaveAmt = msg.monthinfos[i].totleAmt - curActiveLUXURYMONTHCARD = true - end - table.insert(monthCardData,singleMonthCard) - end - CheckRedPointStatus(RedPointType.MonthCard) - if this.showStr ~= "" then - if ActTimeCtrlManager.SingleFuncState(JumpType.Welfare) then - if curActiveMONTHCARD then - --发送埋点数据 - CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyMonthCard,0) - end - if curActiveLUXURYMONTHCARD then - --发送埋点数据 - CustomEventManager.SendCustomEvents(FBSDKCustomEventType.FirstBuyHeightMonthCard,0) - end - end - end -end - --- 检测月卡激活提示是否需要拍脸 -function this.CheckMonthCardPatFace() - if this.showStr and this.showStr ~= "" then - MsgPanel.ShowTwo(this.showStr, function() - JumpManager.GoJump(36004) - end, - function() - UIManager.ClosePanel() - end,Language[10586],Language[11385]) - -- 拍过后不再提示 - this.showStr = "" - return true - end -end - -function this.RefreshMonthCardChargeMoney(msg) - -- LogError("月卡金额信息推送 "..msg.monthSaveAmt.." "..msg.smonthSaveAmt) - monthSaveAmt = msg.monthSaveAmt--月卡累计总额 - smonthSaveAmt = msg.smonthSaveAmt--豪华月卡累计总额 -end --- 月卡累计总额 -function this.GetmonthSaveAmt(index) - if index == MONTH_CARD_TYPE.MONTHCARD then - return monthSaveAmt - else - return smonthSaveAmt - end -end --- 豪华月卡累计总额 -function this.GetsmonthSaveAmt() - return smonthSaveAmt -end ---前端设置月卡领取状态数据 -function this.SetMonthCardGetStateData(type,state) - if monthCardData[type] then - monthCardData[type].state = state--0 未领取 1 已领取 - end - CheckRedPointStatus(RedPointType.MonthCard) -end ---后端设置月卡领取状态数据 datas已领取的月卡id 五点刷新 -function this.BackSetMonthCardGetStateData(datas) - for i = 1, #monthCardData do - if monthCardData[i] then--0 未领取 1 已领取 - if datas[i] then - monthCardData[i].state = 1 - else - monthCardData[i].state = 0 - end - end - end - --事件 - CheckRedPointStatus(RedPointType.MonthCard) - Game.GlobalEvent:DispatchEvent(GameEvent.MonthCard.OnMonthCardUpdate) -end ---获取月卡数据 -function this.GetMonthCardData() - if monthCardData then - return monthCardData - else - return nil - end -end -function this.IsMonthCardActive() - local curAllMonthCardData = this.GetMonthCardData() - local curMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.MONTHCARD].endingTime ~= 0 - local curLuxuryMonthCardOpenState = curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].endingTime ~= 0 - local isMonthCardActive = curLuxuryMonthCardOpenState - return isMonthCardActive -end - ---月卡到期 -local addTimeNum = 30 * 24 * 60 * 60 -function this.RefreshMonthCardEnd() - for i = 1, #monthCardData do - if monthCardData[i] and monthCardData[i].endingTime > 0 then--0 未领取 1 已领取 - local dayLuxuryNum = math.floor((monthCardData[i].endingTime + addTimeNum - GetTimeStamp()) / (24 * 3600)) - if dayLuxuryNum < 0 then - monthCardData[i].endingTime = 0 - monthCardData[i].state = 0--0 未领取 1 已领取 - if i == MONTH_CARD_TYPE.MONTHCARD then - monthSaveAmt = 0--月卡累计总额 - else - smonthSaveAmt = 0--豪华月卡累计总额 - end - end - end - end - CheckRedPointStatus(RedPointType.MonthCard) -end ---单种月卡红点检测 -function this.RefreshMonthCardRedPoint(type) - if monthCardData[type] then - if monthCardData[type].endingTime ~= 0 and monthCardData[type].state == 0 then - return true - end - end - return false -end ---所有月卡红点检测 -function this.AllRefreshMonthCardRedPoint() - for i = 1, #monthCardData do - if monthCardData[i].endingTime ~= 0 and monthCardData[i].state == 0 then - return true - end - end - return false -end ---所有月卡激活状态 -function this.GetMonthCardIsOpen(type) - if monthCardData[type] then - if monthCardData[type].endingTime ~= 0 then - return true - end - end - return false -end ---月卡结束 --礼包抢购是否开启 function this.IsGiftBuyActive() local activeNum = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 635994cb74..f273a2f12d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -406,7 +406,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Setting_Title,PlayerManager.GetPlayerTitleRedPoint) --月卡 --（24暂时关闭）放开这里就行 - RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint) + RPData:AddCheckFunc(RedPointType.MonthCard,MonthCardManager.AllRefreshMonthCardRedPoint) --连续充值 RPData:AddCheckFunc(RedPointType.ContinuityRecharge,ActivityGiftManager.GetContinuityRechargeRedPoint) -- 头像红点 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 5303d47ac0..4b21f80cc7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -571,7 +571,7 @@ function RewardItemPopup:RedCheckFuns() --检测是否需要弹每日任务飘窗 TaskManager.RefreshShowDailyMissionTipPanel() -- 检测月卡激活是否需要拍脸 - OperatingManager.CheckMonthCardPatFace() + MonthCardManager.CheckMonthCardPatFace() --寻宝迷踪红点检测 CheckRedPointStatus(RedPointType.XunBaoMiZong) end diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index b9f67a23bb..3361a5e198 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -277,7 +277,7 @@ function this.GetMonthCardOpenState() --else -- isActive = false --end - local curAllMonthCardData = OperatingManager.GetMonthCardData() + local curAllMonthCardData = MonthCardManager.GetMonthCardData() isActive = curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD] and curAllMonthCardData[MONTH_CARD_TYPE.LUXURYMONTHCARD].endingTime ~= 0 return isActive end diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua index ffabe7ef04..1994cb3e12 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipPanel.lua @@ -283,7 +283,7 @@ end -- 点击领取按钮 function VipPanel:BtnRewardClick() -- 豪华月卡的激活状态 - local isActive = OperatingManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD)--VipManager.GetMonthCardOpenState() + local isActive = MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD)--VipManager.GetMonthCardOpenState() local getState = VipManager.GetRewardState() if not isActive then JumpManager.GoJump(36004) @@ -307,7 +307,7 @@ end -- 设置领取按钮显示状态 function VipPanel:RefreshBtnState() - local isActive = OperatingManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD)--VipManager.GetMonthCardOpenState() + local isActive = MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD)--VipManager.GetMonthCardOpenState() Log("豪华月卡是否激活 -- " .. tostring(isActive)) local getState = VipManager.GetRewardState() local str = ""