diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png new file mode 100644 index 0000000000..beb68bc27b Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png.meta new file mode 100644 index 0000000000..ed7f6b2140 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: c268ac91fa1b5cb47a9af8a4510f6a70 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 936d62495b28ee0479116b606a80275a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png new file mode 100644 index 0000000000..2c9b06db90 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png.meta new file mode 100644 index 0000000000..33ae6a4245 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e006832977b75db42bb6cccecee2f526 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1e47e848a2e69c14b8e080414f9bc77f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png new file mode 100644 index 0000000000..3f7a6435c1 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png.meta new file mode 100644 index 0000000000..c1aa91c5f9 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_fuli_zhoukajiangli_03.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5f151b37e01a0ef43a24fa61dc8d103b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d5273f7264948464c9558da0a2f2fdf3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png b/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png new file mode 100644 index 0000000000..89b5765774 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png.meta b/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png.meta new file mode 100644 index 0000000000..2dbf19e863 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/wenzi/task_getrewared.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9fabd21c1777b2d48b83629efbf8625e +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6aa1934496344ce448b0b065f980c516 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab index 81430ed528..6b1a35cd03 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -9.5} - m_SizeDelta: {x: 190, y: 116} + m_SizeDelta: {x: 131, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5241612533594477244 CanvasRenderer: @@ -65,7 +65,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: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fabd21c1777b2d48b83629efbf8625e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -109,7 +109,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -9.5} - m_SizeDelta: {x: 190, y: 116} + m_SizeDelta: {x: 153, y: 134} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7398196303962190437 CanvasRenderer: @@ -139,7 +139,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: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 446292257114b7f4fb18559f3ddad7d5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -213,7 +213,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f151b37e01a0ef43a24fa61dc8d103b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,7 +287,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f151b37e01a0ef43a24fa61dc8d103b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -435,7 +435,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d81c6385ac2e2cb4ab9075339d5de54e, type: 3} + m_Sprite: {fileID: 21300000, guid: e006832977b75db42bb6cccecee2f526, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -511,7 +511,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: c268ac91fa1b5cb47a9af8a4510f6a70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -680,6 +680,7 @@ GameObject: - component: {fileID: 4422427196976470991} - component: {fileID: 522811996955816772} - component: {fileID: 266779229420697745} + - component: {fileID: 5998324268104783164} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -703,7 +704,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: -91.2} + m_AnchoredPosition: {x: 0, y: -128.00005} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &522811996955816772 @@ -727,7 +728,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882353, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -747,7 +748,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u597D\u4E1C\u897F" +--- !u!114 &5998324268104783164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579449887995061277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1607215731919709994 GameObject: m_ObjectHideFlags: 0 @@ -759,6 +775,7 @@ GameObject: - component: {fileID: 1212126921020516804} - component: {fileID: 5762427487394347174} - component: {fileID: 7277255322399856634} + - component: {fileID: 2718412865559448849} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -782,7 +799,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: 112.4} + m_AnchoredPosition: {x: 0, y: 131.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5762427487394347174 @@ -806,7 +823,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -827,6 +844,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" +--- !u!114 &2718412865559448849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607215731919709994} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1614429796188178361 GameObject: m_ObjectHideFlags: 0 @@ -878,6 +910,7 @@ GameObject: - component: {fileID: 7811990597443639773} - component: {fileID: 4642902924194272608} - component: {fileID: 7012993802235775602} + - component: {fileID: 6443806141571869707} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -901,7 +934,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: -91.2} + m_AnchoredPosition: {x: 0, y: -128.00005} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4642902924194272608 @@ -925,7 +958,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882353, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -945,7 +978,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u597D\u4E1C\u897F" +--- !u!114 &6443806141571869707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737188995352071950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1786114654935204018 GameObject: m_ObjectHideFlags: 0 @@ -957,6 +1005,7 @@ GameObject: - component: {fileID: 3945808531473423172} - component: {fileID: 5358846347005802101} - component: {fileID: 1429785781904375890} + - component: {fileID: 1796301739536223614} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -980,7 +1029,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: -91.2} + m_AnchoredPosition: {x: 0, y: -128.9} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5358846347005802101 @@ -1004,7 +1053,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882353, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1024,7 +1073,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u597D\u4E1C\u897F" +--- !u!114 &1796301739536223614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1786114654935204018} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.24528301, g: 0.16313635, b: 0.16313635, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1 &2062048615451649657 GameObject: m_ObjectHideFlags: 0 @@ -1203,7 +1267,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f151b37e01a0ef43a24fa61dc8d103b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1223,6 +1287,7 @@ GameObject: - component: {fileID: 6908847340007262688} - component: {fileID: 4161025386798191695} - component: {fileID: 5119175701715492901} + - component: {fileID: 253511775768575658} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -1246,7 +1311,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: 112.4} + m_AnchoredPosition: {x: 0, y: 127.99998} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4161025386798191695 @@ -1270,7 +1335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1291,6 +1356,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" +--- !u!114 &253511775768575658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2244577694796230261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2269380890863389870 GameObject: m_ObjectHideFlags: 0 @@ -6032,8 +6112,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: 86.8, y: 99} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 86.8, y: 88} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2563307424467517212 CanvasRenderer: @@ -11020,7 +11100,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: d81c6385ac2e2cb4ab9075339d5de54e, type: 3} + m_Sprite: {fileID: 21300000, guid: e006832977b75db42bb6cccecee2f526, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11076,6 +11156,7 @@ GameObject: - component: {fileID: 6451649100292102193} - component: {fileID: 3818372136396611943} - component: {fileID: 2691383680044598072} + - component: {fileID: 4105938609812870690} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -11099,7 +11180,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: 112.4} + m_AnchoredPosition: {x: 0, y: 127.99998} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3818372136396611943 @@ -11123,7 +11204,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11144,6 +11225,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" +--- !u!114 &4105938609812870690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3653570832041470696} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3743139429155526843 GameObject: m_ObjectHideFlags: 0 @@ -11155,6 +11251,7 @@ GameObject: - component: {fileID: 7839572260528806218} - component: {fileID: 4786009014066023969} - component: {fileID: 8488017631757689322} + - component: {fileID: 8515777393575953380} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -11178,7 +11275,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: 112.4} + m_AnchoredPosition: {x: 0, y: 127.99998} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4786009014066023969 @@ -11202,7 +11299,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -11223,6 +11320,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" +--- !u!114 &8515777393575953380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3743139429155526843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3883114178146305022 GameObject: m_ObjectHideFlags: 0 @@ -15964,8 +16076,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: 86.8, y: 99} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 86.8, y: 88} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4803947482376728096 CanvasRenderer: @@ -16015,6 +16127,7 @@ GameObject: - component: {fileID: 882907335241367496} - component: {fileID: 5287643657749928741} - component: {fileID: 3926311633213717784} + - component: {fileID: 2152965081880819594} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -16038,7 +16151,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: -91.2} + m_AnchoredPosition: {x: 0, y: -128} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5287643657749928741 @@ -16062,7 +16175,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882353, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -16082,7 +16195,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u597D\u4E1C\u897F" +--- !u!114 &2152965081880819594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4770917099816857243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5038438235326934768 GameObject: m_ObjectHideFlags: 0 @@ -16118,7 +16246,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -9.5} - m_SizeDelta: {x: 190, y: 116} + m_SizeDelta: {x: 131, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4323473018237741395 CanvasRenderer: @@ -16148,7 +16276,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: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fabd21c1777b2d48b83629efbf8625e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16222,7 +16350,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f151b37e01a0ef43a24fa61dc8d103b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -20940,6 +21068,7 @@ GameObject: - component: {fileID: 4696638606794315808} - component: {fileID: 1943025254413034695} - component: {fileID: 3538424479274287370} + - component: {fileID: 2070802261762950048} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -20963,7 +21092,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: -91.2} + m_AnchoredPosition: {x: 0, y: -128.00005} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1943025254413034695 @@ -20987,7 +21116,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882353, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -21007,7 +21136,22 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: "\u597D\u4E1C\u897F" +--- !u!114 &2070802261762950048 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5728645398371455428} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5753506545296446812 GameObject: m_ObjectHideFlags: 0 @@ -21073,7 +21217,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: d81c6385ac2e2cb4ab9075339d5de54e, type: 3} + m_Sprite: {fileID: 21300000, guid: e006832977b75db42bb6cccecee2f526, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21117,7 +21261,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -9.5} - m_SizeDelta: {x: 190, y: 116} + m_SizeDelta: {x: 131, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7847722953088151104 CanvasRenderer: @@ -21147,7 +21291,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: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fabd21c1777b2d48b83629efbf8625e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21224,7 +21368,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, y: 0} + m_AnchoredPosition: {x: 0, y: -201} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6077852557678932913 @@ -21477,7 +21621,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: -30} + m_AnchoredPosition: {x: 0, y: 167} m_SizeDelta: {x: 1080, y: 981.29504} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6077852558007825338 @@ -21579,7 +21723,7 @@ MonoBehaviour: m_Top: -14 m_Bottom: 130 m_ChildAlignment: 1 - m_Spacing: -110 + m_Spacing: -50 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -21712,7 +21856,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: 1.9, y: -4} + m_AnchoredPosition: {x: 1.9, y: 174} m_SizeDelta: {x: 528, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6077852558425806813 @@ -22045,7 +22189,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: -13, y: 138} + m_AnchoredPosition: {x: -13, y: 302} m_SizeDelta: {x: 1080, y: 1056} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6077852559619287936 @@ -22336,7 +22480,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: c268ac91fa1b5cb47a9af8a4510f6a70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22379,8 +22523,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: 86.8, y: 99} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 86.8, y: 88} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4423769936779883218 CanvasRenderer: @@ -22454,7 +22598,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -9.5} - m_SizeDelta: {x: 190, y: 116} + m_SizeDelta: {x: 131, y: 115} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3027237465011074793 CanvasRenderer: @@ -22484,7 +22628,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: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fabd21c1777b2d48b83629efbf8625e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22558,7 +22702,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: 5f151b37e01a0ef43a24fa61dc8d103b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22634,7 +22778,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: c268ac91fa1b5cb47a9af8a4510f6a70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22746,7 +22890,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: c268ac91fa1b5cb47a9af8a4510f6a70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -22841,6 +22985,7 @@ GameObject: - component: {fileID: 4675460590493358700} - component: {fileID: 2164662754055551232} - component: {fileID: 422219195860246130} + - component: {fileID: 2100240068166438070} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -22864,7 +23009,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: 112.4} + m_AnchoredPosition: {x: 0, y: 128} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2164662754055551232 @@ -22888,7 +23033,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.45882356, g: 0.2627451, b: 0.03137255, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -22909,6 +23054,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B2C\u4E00\u5929" +--- !u!114 &2100240068166438070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005368271365946786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &9012725638230901108 GameObject: m_ObjectHideFlags: 0 @@ -22976,7 +23136,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: 5364a4d81faaf9847800c54e76f42aea, type: 3} + m_Sprite: {fileID: 21300000, guid: c268ac91fa1b5cb47a9af8a4510f6a70, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23050,7 +23210,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: d81c6385ac2e2cb4ab9075339d5de54e, type: 3} + m_Sprite: {fileID: 21300000, guid: e006832977b75db42bb6cccecee2f526, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -23093,8 +23253,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: 86.8, y: 99} - m_SizeDelta: {x: 30, y: 30} + m_AnchoredPosition: {x: 86.8, y: 88} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8784474989986307623 CanvasRenderer: @@ -23198,7 +23358,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: d81c6385ac2e2cb4ab9075339d5de54e, type: 3} + m_Sprite: {fileID: 21300000, guid: e006832977b75db42bb6cccecee2f526, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua index 105d7401dd..2bbe4a5bbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua @@ -9,10 +9,10 @@ function ExpertPre:New(gameObject) end local BtnState = { - [0] = {Img = "Btn_hz_cheng_01", isRed = true, isGray = false, Text = Language[11948],}, - [1] = {Img = "Btn_hz_cheng_01", isRed = false, isGray = false, Text = Language[10556]}, - [2] = {Img = "Btn_hz_cheng_01", isRed = false, isGray = true, Text = Language[10101]}, - [3] = {Img = "Btn_hz_lan_01", isRed = false, isGray = true, Text = Language[12300]}, + [0] = {Img = "X1_zhanling_pata_bt_03", isRed = true, isGray = false, Text = Language[11948],}, + [1] = {Img = "X1_bt_bianzhiqi_bt_01", isRed = false, isGray = false, Text = Language[10556]}, + [2] = {Img = "X1_zhanling_pata_bt_03", isRed = false, isGray = true, Text = Language[10101]}, + [3] = {Img = "X1_bt_bianzhiqi_bt_01", isRed = false, isGray = true, Text = Language[12300]}, } --初始化组件(用于子类重写)