diff --git a/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png b/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png new file mode 100644 index 0000000000..ebc2763109 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png.meta new file mode 100644 index 0000000000..1b187f0860 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_yiyuan_huisudiban.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: 91f59481a5d43e340a9cc5b2cea39feb +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: 512, y: 245, z: 510, w: 474} + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 4bbef5b8146a74e4a9e2f7940152cdec + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png b/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png new file mode 100644 index 0000000000..29a137c50f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png.meta b/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png.meta new file mode 100644 index 0000000000..94b3bc63d7 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/hiddenweapon_bg2.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 10aa07eaba5edfc40bebd304c09e13d2 +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: d654f236fd97a7d4697b0268e10a7d49 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png b/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png new file mode 100644 index 0000000000..15dcbfd4fd Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png differ diff --git a/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png.meta b/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png.meta new file mode 100644 index 0000000000..25c67935ed --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1shaonvshu/bg_l2d_girl045017.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: f4e0f2aac65ddde4f97575e064b00ba3 +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: 3361cae3c674bd4479ea94128ad82a02 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab index 30df13760d..008fef40e3 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab @@ -36,10 +36,10 @@ RectTransform: m_Father: {fileID: 7828067444209862821} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 25, y: 0} - m_SizeDelta: {x: 892.9, y: 161.10625} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &784533625 CanvasRenderer: @@ -198,10 +198,10 @@ RectTransform: m_Father: {fileID: 784533622} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -108.74} - m_SizeDelta: {x: 892.9, y: 32} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 892.9, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1264153469 CanvasRenderer: @@ -520,10 +520,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -198.7} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4192642123678137673 CanvasRenderer: @@ -987,9 +987,9 @@ RectTransform: m_Father: {fileID: 4861493823762066456} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 450, y: -372} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90, y: -372} m_SizeDelta: {x: 60, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6755658365017777620 @@ -1157,7 +1157,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: 40} + m_AnchoredPosition: {x: 0, y: 44.2} m_SizeDelta: {x: 900, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3232154718162923356 @@ -1598,7 +1598,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7627507569009959225 RectTransform: m_ObjectHideFlags: 0 @@ -1785,7 +1785,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.7, y: -3.8} + m_AnchoredPosition: {x: 0, y: -3.8} m_SizeDelta: {x: 294, y: 65.85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1166264514122509227 @@ -2266,10 +2266,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 631.24, y: -198.7} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4193491506658224975 CanvasRenderer: @@ -2552,7 +2552,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -2577,7 +2577,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 2, y: -1} + m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 --- !u!114 &3714106349820284539 MonoBehaviour: @@ -2592,7 +2592,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0.91372555, g: 0.627451, b: 0.23137257, a: 1} - m_EffectDistance: {x: 3, y: -3} + m_EffectDistance: {x: 2, y: -2} m_UseGraphicAlpha: 1 --- !u!1 &2696076604178069306 GameObject: @@ -2632,8 +2632,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 61.9} - m_SizeDelta: {x: 921.6, y: 193.7} + m_AnchoredPosition: {x: 0, y: 44.25} + m_SizeDelta: {x: 921.6, y: 229.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076604178069309 CanvasRenderer: @@ -2706,7 +2706,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: 23.2} + m_AnchoredPosition: {x: 0, y: -41} m_SizeDelta: {x: 1078, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076604292581351 @@ -2856,7 +2856,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: -197.61, y: -418} + m_AnchoredPosition: {x: -197.61, y: -491} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076604634790016 @@ -2975,7 +2975,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: 26, y: 38.5} + m_AnchoredPosition: {x: 0, y: 38.5} m_SizeDelta: {x: 921.6, y: 276.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076604749491809 @@ -3094,7 +3094,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -8.6, y: -435.3} + m_AnchoredPosition: {x: -8.6, y: -386} m_SizeDelta: {x: 471, y: 471} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076604783406984 @@ -3112,7 +3112,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2696076604783406709} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -3145,7 +3145,6 @@ GameObject: - component: {fileID: 2696076604845476861} - component: {fileID: 2696076604845476863} - component: {fileID: 2696076604845476862} - - component: {fileID: 1196121040237182585} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3193,7 +3192,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9716981, g: 0.9579477, b: 0.9579477, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3214,21 +3213,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5378 \u4E0B" ---- !u!114 &1196121040237182585 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2696076604845476860} - 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 &2696076604901738612 GameObject: m_ObjectHideFlags: 0 @@ -3298,11 +3282,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 45 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -3323,7 +3307,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: 1} - m_EffectDistance: {x: 2, y: -1} + m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 --- !u!114 &6808787067947443507 MonoBehaviour: @@ -3338,7 +3322,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0.9921569, g: 0.6509804, b: 0.16470589, a: 1} - m_EffectDistance: {x: 3, y: -1} + m_EffectDistance: {x: 2, y: -1} m_UseGraphicAlpha: 1 --- !u!1 &2696076605080798649 GameObject: @@ -3374,7 +3358,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: -6.4, y: 195.8} + m_AnchoredPosition: {x: -6.4, y: 189.3} m_SizeDelta: {x: 220, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605080798652 @@ -3419,7 +3403,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -5.7, y: 209.7} + m_AnchoredPosition: {x: 0, y: 218.8} m_SizeDelta: {x: 217, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605123514093 @@ -3466,12 +3450,12 @@ RectTransform: - {fileID: 2696076604634790029} - {fileID: 2696076605675086636} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1.1, y: -315.9} - m_SizeDelta: {x: 1077.8, y: 998.6} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 732} + m_SizeDelta: {x: 0, y: 1174.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605182956556 CanvasRenderer: @@ -3494,15 +3478,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.8627451} 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: 0e733869d01c63d49aa999ebc995023b, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 91f59481a5d43e340a9cc5b2cea39feb, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3595,7 +3579,6 @@ GameObject: - component: {fileID: 2696076605408989875} - component: {fileID: 2696076605408989877} - component: {fileID: 2696076605408989876} - - component: {fileID: 5096233179619075617} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3643,7 +3626,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9716981, g: 0.9579477, b: 0.9579477, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3664,21 +3647,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u66F4 \u6362" ---- !u!114 &5096233179619075617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2696076605408989874} - 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 &2696076605480272396 GameObject: m_ObjectHideFlags: 0 @@ -3953,7 +3921,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: 243.76, y: -418} + m_AnchoredPosition: {x: 243.76, y: -491} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605675086639 @@ -4165,7 +4133,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.000032425, y: -238.65} + m_AnchoredPosition: {x: 0, y: -314} m_SizeDelta: {x: 1077.8, y: 521.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605811343762 @@ -4215,7 +4183,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.000031471, y: 256.6} + m_AnchoredPosition: {x: 0.000031471, y: 189} m_SizeDelta: {x: 1077.8, y: 469.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2696076605879052418 @@ -4263,8 +4231,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 420, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2218287864736075253 CanvasRenderer: @@ -4287,14 +4255,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.09803922} + m_Color: {r: 1, g: 1, b: 1, a: 0.72156864} 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: 34dda1e4a003d714dbdfa2b95ee1ff00, type: 3} + m_Sprite: {fileID: 21300000, guid: 10aa07eaba5edfc40bebd304c09e13d2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4481,12 +4449,12 @@ RectTransform: m_Children: - {fileID: 8031147885079919500} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 424} - m_SizeDelta: {x: 294, y: 38.35} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -536} + m_SizeDelta: {x: 294, y: 38.349976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5434801542625148002 CanvasRenderer: @@ -4778,7 +4746,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: -15} + m_AnchoredPosition: {x: 0, y: -3.5} m_SizeDelta: {x: 900, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1408906740075628343 @@ -5386,10 +5354,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 631.24, y: -147.8} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1097500068713108729 CanvasRenderer: @@ -6019,9 +5987,9 @@ RectTransform: - {fileID: 2696076604783406710} - {fileID: 7991299031522924707} - {fileID: 3736121473185287106} - - {fileID: 147497016996599419} - {fileID: 6495523033131202779} - {fileID: 2696076605182956554} + - {fileID: 147497016996599419} - {fileID: 4861346342474304956} - {fileID: 8065447153457146527} m_Father: {fileID: 0} @@ -6200,9 +6168,9 @@ RectTransform: m_Father: {fileID: 4861493823762066456} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -450, y: -372} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 90, y: -372} m_SizeDelta: {x: 60, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1510806655689698514 @@ -6572,10 +6540,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -147.8} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &953203482525733610 CanvasRenderer: @@ -6652,10 +6620,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -46} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4231266154525233757 CanvasRenderer: @@ -6975,7 +6943,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: -70} + m_AnchoredPosition: {x: 0, y: -51.2} m_SizeDelta: {x: 900, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3520866519031902347 @@ -7206,10 +7174,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -96.9} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7356569671111956133 CanvasRenderer: @@ -7740,8 +7708,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000015258789} - m_SizeDelta: {x: 917.9, y: 131.48} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3992972364876945023 CanvasRenderer: @@ -9138,10 +9106,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 631.24, y: -96.9} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9011644192802842300 CanvasRenderer: @@ -9220,8 +9188,8 @@ RectTransform: m_Father: {fileID: 784533622} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 892.9, y: 88} m_Pivot: {x: 0, y: 1} @@ -9467,8 +9435,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: 37, y: 72} - m_SizeDelta: {x: 921.6, y: 178.9} + m_AnchoredPosition: {x: 0, y: 37.4} + m_SizeDelta: {x: 921.6, y: 248.11} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7670233032460502 CanvasRenderer: @@ -9582,9 +9550,9 @@ RectTransform: m_Father: {fileID: 8031147885079919500} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 84.2, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8034247711045555034 @@ -9656,9 +9624,9 @@ RectTransform: m_Father: {fileID: 8031147885079919500} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033305612909427904 @@ -9805,9 +9773,9 @@ RectTransform: m_Father: {fileID: 8031147885079919500} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 138.4, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033740791181500418 @@ -10029,9 +9997,9 @@ RectTransform: m_Father: {fileID: 8031147885079919500} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 192.6, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033384636391358646 @@ -10130,7 +10098,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 276.8, y: 60} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7925854678764562170 MonoBehaviour: @@ -10358,9 +10326,9 @@ RectTransform: m_Father: {fileID: 8031147885079919500} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 246.8, y: -30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8033925425785736688 @@ -10509,8 +10477,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -117} - m_SizeDelta: {x: 900, y: 5} + m_AnchoredPosition: {x: 0, y: -112.5} + m_SizeDelta: {x: 900, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1151083078638495039 CanvasRenderer: @@ -10941,11 +10909,11 @@ RectTransform: m_Children: - {fileID: 6140365952946721514} m_Father: {fileID: 4861493823762066456} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -23, y: -650.1} + m_AnchoredPosition: {x: 0, y: -636} m_SizeDelta: {x: 294, y: 74} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1899733988045460309 @@ -11151,9 +11119,9 @@ RectTransform: m_Father: {fileID: 784533622} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 435, y: -160.10625} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 870, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7652094132290220573 @@ -11210,7 +11178,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3304429331901886327 RectTransform: m_ObjectHideFlags: 0 @@ -11227,8 +11195,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 38.099976} - m_SizeDelta: {x: 0, y: 76.19995} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 420, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5541773145885492078 CanvasRenderer: @@ -11258,8 +11226,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 09da1f9ba1a24a7438b43e0007e63854, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d31d5894799b9594db4667b9472aab39, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11300,10 +11268,10 @@ RectTransform: m_Father: {fileID: 1368775956793594653} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 631.24, y: -46} - m_SizeDelta: {x: 170, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1576946442750862080 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponListPanel.prefab index be3e84d7b5..2708e0d10e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponListPanel.prefab @@ -415,7 +415,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: 7a37c8663d7814543baf6de1e8b993be, type: 3} + m_Sprite: {fileID: 21300000, guid: d2f6e214a18508a4aa35531e0e059c2d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -440,7 +440,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8225155373219562069 RectTransform: m_ObjectHideFlags: 0 @@ -635,7 +635,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -2083.2502, y: 13.600006} - m_SizeDelta: {x: 856.5, y: 0} + m_SizeDelta: {x: 856.5, y: 650.99} m_Pivot: {x: 0, y: 1} --- !u!114 &4140631636949200151 MonoBehaviour: @@ -805,7 +805,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -862,8 +862,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: -283, y: 100} - m_SizeDelta: {x: 226, y: 154} + m_AnchoredPosition: {x: -315.4, y: 251.5} + m_SizeDelta: {x: 404.21, y: 236.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7388033864893320037 CanvasRenderer: @@ -1096,12 +1096,12 @@ RectTransform: - {fileID: 7979926815984756978} - {fileID: 3168702124832269055} m_Father: {fileID: 4309399692861101256} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 278.86, y: 1.6779995} - m_SizeDelta: {x: 144.05, y: 52.91} + m_AnchoredPosition: {x: 283.3, y: 0} + m_SizeDelta: {x: 165, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5778636851066645241 CanvasRenderer: @@ -1131,8 +1131,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6d6b014fb4be4e247b02f760eca14db1, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1240,7 +1240,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.23137257, g: 0.23137257, b: 0.23137257, a: 1} + m_Color: {r: 0.084905684, g: 0.084905684, b: 0.084905684, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1429,6 +1429,7 @@ RectTransform: m_Children: - {fileID: 4687696098256423358} - {fileID: 8192949961705790136} + - {fileID: 3851734294491522869} - {fileID: 7618768176140177941} - {fileID: 841764182723998645} - {fileID: 70204882621558030} @@ -1438,8 +1439,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1233, y: -249.52002} - m_SizeDelta: {x: 867, y: 148.15} + m_AnchoredPosition: {x: -1000, y: 1014} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1149514123027599131 GameObject: @@ -1569,10 +1570,10 @@ RectTransform: m_Father: {fileID: 247250443658767388} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 204.28, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &430306834752465940 CanvasRenderer: @@ -1643,10 +1644,10 @@ RectTransform: m_Father: {fileID: 4004438615410668281} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 856.72, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -648.99} + m_SizeDelta: {x: 856.72, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1127896390522614478 CanvasRenderer: @@ -1720,7 +1721,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 115, y: -7} + m_AnchoredPosition: {x: 213, y: -71} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7117319864630082632 @@ -1792,10 +1793,10 @@ RectTransform: m_Father: {fileID: 247250443658767388} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.82, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5140209319127565666 CanvasRenderer: @@ -1866,10 +1867,10 @@ RectTransform: m_Father: {fileID: 4352075039876160969} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 159.46, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6143927582529733607 CanvasRenderer: @@ -1940,10 +1941,10 @@ RectTransform: m_Father: {fileID: 4352075039876160969} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5580516555455715907 CanvasRenderer: @@ -2047,7 +2048,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: 7a37c8663d7814543baf6de1e8b993be, type: 3} + m_Sprite: {fileID: 21300000, guid: d2f6e214a18508a4aa35531e0e059c2d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2252,10 +2253,10 @@ RectTransform: m_Father: {fileID: 4352075039876160969} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.64, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4574484424828713294 CanvasRenderer: @@ -2368,6 +2369,155 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &1978893036680872225 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6892405068302768085} + - component: {fileID: 5229383747768406645} + - component: {fileID: 958170443709518834} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6892405068302768085 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978893036680872225} + 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: 2120940193346071387} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5229383747768406645 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978893036680872225} + m_CullTransparentMesh: 0 +--- !u!114 &958170443709518834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978893036680872225} + 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: 0.7686275, g: 0.57254905, b: 0.03529412, a: 0.39215687} + 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &2010696436198420609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2120940193346071387} + - component: {fileID: 9120998949031722835} + - component: {fileID: 8397818425419694564} + m_Layer: 5 + m_Name: Huawen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2120940193346071387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010696436198420609} + 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: 6892405068302768085} + m_Father: {fileID: 5061966328917434158} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9120998949031722835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010696436198420609} + m_CullTransparentMesh: 0 +--- !u!114 &8397818425419694564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010696436198420609} + 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: 0.5754717, g: 0.4331976, b: 0.04071733, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2042952470251452691 GameObject: m_ObjectHideFlags: 0 @@ -2507,8 +2657,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5635943dd19a31546bb798d2a5002a41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2620,12 +2770,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 5061966328917434158} - m_RootOrder: 2 + 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: -308.9, y: 1.97} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4480691198534513696 CanvasRenderer: @@ -2696,10 +2846,10 @@ RectTransform: m_Father: {fileID: 922662529229931830} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131.95, y: -15} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2483085719324788843 GameObject: @@ -2870,8 +3020,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: -7.1, y: -77.76} - m_SizeDelta: {x: 820.5, y: 1007.68} + m_AnchoredPosition: {x: -5.22, y: -75.662} + m_SizeDelta: {x: 813.81, y: 1011.876} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2613663604958110604 GameObject: @@ -2905,10 +3055,10 @@ RectTransform: m_Father: {fileID: 247250443658767388} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 114.64, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3315761895830211823 CanvasRenderer: @@ -2981,10 +3131,10 @@ RectTransform: m_Father: {fileID: 4458106941359138159} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 260, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 433.4, y: -49.995} + m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3624168937168555753 CanvasRenderer: @@ -3134,7 +3284,7 @@ RectTransform: m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} m_Children: [] m_Father: {fileID: 5061966328917434158} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3227,7 +3377,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5334477232582362566 RectTransform: m_ObjectHideFlags: 0 @@ -3442,12 +3592,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8223954996182050980} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 305.05, y: 30} - m_SizeDelta: {x: 234.3, y: 35.55} + m_AnchoredPosition: {x: 338.6, y: 37.9} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4309290633523318159 CanvasRenderer: @@ -3470,7 +3620,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 0.7971698, g: 0.9734519, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3550,7 +3700,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.084905684, g: 0.084905684, b: 0.084905684, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3604,10 +3754,10 @@ RectTransform: m_Father: {fileID: 922662529229931830} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 556.92, y: -15} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3509897106532993218 GameObject: @@ -3674,7 +3824,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: 7a37c8663d7814543baf6de1e8b993be, type: 3} + m_Sprite: {fileID: 21300000, guid: d2f6e214a18508a4aa35531e0e059c2d, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3795,10 +3945,10 @@ RectTransform: m_Father: {fileID: 4352075039876160969} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 69.82, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1947203097727417635 CanvasRenderer: @@ -3946,7 +4096,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: -391, y: 150} + m_AnchoredPosition: {x: -313.41, y: 249.9} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8221578451803152986 @@ -4016,11 +4166,11 @@ RectTransform: m_LocalScale: {x: 0.9997858, y: 0.9997858, z: 0.9997858} m_Children: [] m_Father: {fileID: 8223954996182050980} - m_RootOrder: 7 + m_RootOrder: 8 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: 256, y: -1} + m_AnchoredPosition: {x: 302.5, y: -1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1909076206526651315 @@ -4066,6 +4216,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5408 \u6210" LanguageIndex: 0 +--- !u!1 &3826183322728491326 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3851734294491522869} + - component: {fileID: 546685660817340131} + - component: {fileID: 6732880878100175147} + m_Layer: 5 + m_Name: Huawen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3851734294491522869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3826183322728491326} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_Children: + - {fileID: 3108083275890545163} + m_Father: {fileID: 4309399692861101256} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &546685660817340131 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3826183322728491326} + m_CullTransparentMesh: 0 +--- !u!114 &6732880878100175147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3826183322728491326} + 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: 0.5754717, g: 0.4331976, b: 0.04071733, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3957910198048749415 GameObject: m_ObjectHideFlags: 0 @@ -4172,8 +4397,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: -7.0999975, y: -77.75997} - m_SizeDelta: {x: 820.5, y: 1007.7} + m_AnchoredPosition: {x: -5.22, y: -75.662} + m_SizeDelta: {x: 813.81, y: 1011.876} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4149774998273216101 GameObject: @@ -4280,10 +4505,11 @@ RectTransform: m_GameObject: {fileID: 4168611955974088518} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_LocalScale: {x: 1, y: 1, z: 1.0002142} m_Children: - {fileID: 3561515721246751468} - {fileID: 297861958545505840} + - {fileID: 850872361162633071} - {fileID: 834513433144832160} - {fileID: 4152157474830276038} - {fileID: 5523353185677185570} @@ -4296,8 +4522,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -928.9249, y: 513} - m_SizeDelta: {x: 793.6, y: 128.1} + m_AnchoredPosition: {x: -1000, y: 1203.52} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4169868745877254277 GameObject: @@ -4569,12 +4795,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 8223954996182050980} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -308.33, y: 1.59} - m_SizeDelta: {x: 180, y: 180} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2406488890853899961 CanvasRenderer: @@ -4645,10 +4871,10 @@ RectTransform: m_Father: {fileID: 247250443658767388} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 159.46, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7234967474954744338 CanvasRenderer: @@ -4721,10 +4947,10 @@ RectTransform: m_Father: {fileID: 4004438615410668281} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -596.995} + m_SizeDelta: {x: 866.8, y: 99.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4385783224930684088 MonoBehaviour: @@ -4841,7 +5067,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.23584908, g: 0.23584908, b: 0.23584908, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -4895,10 +5121,10 @@ RectTransform: m_Father: {fileID: 247250443658767388} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2881547395284006126 CanvasRenderer: @@ -4937,6 +5163,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5202777832535931668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3108083275890545163} + - component: {fileID: 8141137238703175743} + - component: {fileID: 7352498988949020064} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3108083275890545163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5202777832535931668} + 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: 3851734294491522869} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8141137238703175743 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5202777832535931668} + m_CullTransparentMesh: 0 +--- !u!114 &7352498988949020064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5202777832535931668} + 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: 0.7686275, g: 0.57254905, b: 0.03529412, a: 0.39215687} + 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &5280717213686955159 GameObject: m_ObjectHideFlags: 0 @@ -5070,10 +5370,10 @@ RectTransform: m_Father: {fileID: 4004438615410668281} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 855.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -273.5} + m_SizeDelta: {x: 855.2, y: 547} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2132218441971241185 MonoBehaviour: @@ -5209,8 +5509,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.7999878, y: -4.274994} - m_SizeDelta: {x: -70.8, y: -8.55} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -0.00000047683716} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2403253193857132886 CanvasRenderer: @@ -5240,8 +5540,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5635943dd19a31546bb798d2a5002a41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5274,10 +5574,11 @@ RectTransform: m_GameObject: {fileID: 5524401047977714642} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_LocalScale: {x: 1, y: 1, z: 1.0002142} m_Children: - {fileID: 7322918071535222085} - {fileID: 4187846135682764310} + - {fileID: 2120940193346071387} - {fileID: 1101292505956420619} - {fileID: 6039147297962884951} - {fileID: 8244041765983506354} @@ -5290,8 +5591,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -929, y: -247.1} - m_SizeDelta: {x: 793.6, y: 128.1} + m_AnchoredPosition: {x: -1000, y: 840} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5725674721487534359 GameObject: @@ -5585,8 +5886,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5635943dd19a31546bb798d2a5002a41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5778,12 +6079,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 8223954996182050980} - m_RootOrder: 2 + 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: -308.9, y: 1.97} - m_SizeDelta: {x: 200, y: 200} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &179055499374318758 CanvasRenderer: @@ -5853,12 +6154,12 @@ RectTransform: m_Children: - {fileID: 6771835160794603689} m_Father: {fileID: 5061966328917434158} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 296.8, y: -7} - m_SizeDelta: {x: 205.6, y: 30.1} + m_AnchoredPosition: {x: 338, y: 0} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3091681318151416631 CanvasRenderer: @@ -5881,7 +6182,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.44705886, g: 0.41176474, b: 0.4666667, a: 1} + m_Color: {r: 0.1792453, g: 0.1767088, b: 0.1767088, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6186,6 +6487,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9009\u62E9\u51FA\u6218\u7075\u517D" LanguageIndex: 0 +--- !u!1 &6576518904037980463 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5663446345496168099} + - component: {fileID: 1413147830288309099} + - component: {fileID: 7868807685739765885} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5663446345496168099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576518904037980463} + 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: 850872361162633071} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1413147830288309099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576518904037980463} + m_CullTransparentMesh: 0 +--- !u!114 &7868807685739765885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6576518904037980463} + 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: 0.7686275, g: 0.57254905, b: 0.03529412, a: 0.39215687} + 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &6772710584703395922 GameObject: m_ObjectHideFlags: 0 @@ -6312,10 +6687,10 @@ RectTransform: m_Father: {fileID: 922662529229931830} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 556.92, y: -63.239998} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7027315354555399334 GameObject: @@ -6333,7 +6708,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6683252957138639438 RectTransform: m_ObjectHideFlags: 0 @@ -6398,10 +6773,10 @@ RectTransform: m_Father: {fileID: 4352075039876160969} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 204.28, y: -25} - m_SizeDelta: {x: 50, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7187056871743065327 CanvasRenderer: @@ -6474,8 +6849,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: 56.7, y: 15.9} - m_SizeDelta: {x: 20, y: 20} + m_AnchoredPosition: {x: 67.2, y: 21.9} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1174822338523768780 CanvasRenderer: @@ -6666,12 +7041,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4309399692861101256} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 271.8, y: 26} - m_SizeDelta: {x: 118.1, y: 45.655} + m_AnchoredPosition: {x: 338.6, y: 37.899956} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3341222646732745206 CanvasRenderer: @@ -6694,7 +7069,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 0.7971698, g: 0.9734519, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6828,10 +7203,10 @@ RectTransform: m_Father: {fileID: 922662529229931830} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 131.95, y: -63.239998} + m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7920211754064964007 GameObject: @@ -6864,12 +7239,12 @@ RectTransform: m_Children: - {fileID: 8160650376141024962} m_Father: {fileID: 8223954996182050980} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 296.8, y: -7} - m_SizeDelta: {x: 205.6, y: 30.1} + m_AnchoredPosition: {x: 338, y: 0} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5852001148479770842 CanvasRenderer: @@ -6892,7 +7267,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6944,12 +7319,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 5061966328917434158} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -308.33, y: 1.59} - m_SizeDelta: {x: 180, y: 180} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &203544732001758662 CanvasRenderer: @@ -7099,7 +7474,7 @@ RectTransform: m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} m_Children: [] m_Father: {fileID: 8223954996182050980} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7211,7 +7586,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: 181, y: -71} + m_AnchoredPosition: {x: 202, y: -71} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &819222794223867671 @@ -7282,12 +7657,12 @@ RectTransform: m_Children: - {fileID: 1930718121678259388} m_Father: {fileID: 4309399692861101256} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 259.26, y: -28.172} - m_SizeDelta: {x: 93.144, y: 43.64} + m_AnchoredPosition: {x: 338, y: -22.4} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6062853530043885079 CanvasRenderer: @@ -7310,7 +7685,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7477,12 +7852,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5061966328917434158} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 305.05, y: 30} - m_SizeDelta: {x: 234.3, y: 35.55} + m_AnchoredPosition: {x: 338.6, y: 37.899956} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1767667204075574534 CanvasRenderer: @@ -7505,7 +7880,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 0.7971698, g: 0.9734519, b: 1, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7559,12 +7934,12 @@ RectTransform: - {fileID: 3682683822606707087} - {fileID: 247250443658767388} m_Father: {fileID: 8223954996182050980} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 344, y: -39.3} - m_SizeDelta: {x: 300.6, y: 49.5} + m_AnchoredPosition: {x: 338, y: -38.2} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2227349248694854656 CanvasRenderer: @@ -7587,7 +7962,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7667,7 +8042,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7813,7 +8188,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4309399692861101256} - m_RootOrder: 2 + 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} @@ -7860,12 +8235,12 @@ RectTransform: - {fileID: 9057100951701939505} - {fileID: 4352075039876160969} m_Father: {fileID: 5061966328917434158} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 344, y: -39.3} - m_SizeDelta: {x: 300.6, y: 49.5} + m_AnchoredPosition: {x: 338, y: -35.9} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5026602923542847981 CanvasRenderer: @@ -7888,7 +8263,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.1792453, g: 0.1767088, b: 0.1767088, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7942,12 +8317,12 @@ RectTransform: m_Children: - {fileID: 4027560428926744418} m_Father: {fileID: 5061966328917434158} - m_RootOrder: 8 + m_RootOrder: 9 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: 283.3, y: 1.42} - m_SizeDelta: {x: 143.39, y: 52.95} + m_AnchoredPosition: {x: 283.3, y: 0} + m_SizeDelta: {x: 165, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8751668370764895636 CanvasRenderer: @@ -7977,8 +8352,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6d6b014fb4be4e247b02f760eca14db1, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5ce4cf7c6a156d64ca117ce0caf6a53b, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8190,7 +8565,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8269,7 +8644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8290,3 +8665,78 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 66 +--- !u!1 &9213797177782493763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 850872361162633071} + - component: {fileID: 1466972890037517856} + - component: {fileID: 5286476793848985713} + m_Layer: 5 + m_Name: Huawen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &850872361162633071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9213797177782493763} + 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: 5663446345496168099} + m_Father: {fileID: 8223954996182050980} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1466972890037517856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9213797177782493763} + m_CullTransparentMesh: 0 +--- !u!114 &5286476793848985713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9213797177782493763} + 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: 0.5754717, g: 0.4331976, b: 0.04071733, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab index 11465a29aa..d74419d105 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponUpPanel.prefab @@ -347,7 +347,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 460.8, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 921.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8020006507883475629 @@ -431,7 +431,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: 27, y: -64} + m_AnchoredPosition: {x: 27, y: -59} m_SizeDelta: {x: 927.2, y: 247} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7612907875374738917 @@ -727,7 +727,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 463.4, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 876.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5543922836007099624 @@ -820,8 +820,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 0, y: 10} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7693084348957489150 CanvasRenderer: @@ -897,7 +897,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.000045776367} m_SizeDelta: {x: 921.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4363852263215371060 @@ -923,7 +923,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 40 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 10 @@ -1273,16 +1273,14 @@ RectTransform: m_Children: - {fileID: 8328731494424657240} - {fileID: 6211683919829280738} - - {fileID: 3893828624446996308} - {fileID: 3929986147979154006} - - {fileID: 3450200103343875745} m_Father: {fileID: 6675196813181403050} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 420, y: 180} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8106770099941789160 CanvasRenderer: @@ -1312,8 +1310,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 09da1f9ba1a24a7438b43e0007e63854, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 10aa07eaba5edfc40bebd304c09e13d2, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1854,7 +1852,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 268.2} + m_SizeDelta: {x: 0, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433971438079520 CanvasRenderer: @@ -1901,7 +1899,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 119.5} + m_SizeDelta: {x: 1080, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433971459062833 CanvasRenderer: @@ -2140,11 +2138,11 @@ RectTransform: m_Children: - {fileID: 2521433973137916857} m_Father: {fileID: 6675196813181403050} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 14} + m_AnchoredPosition: {x: 0, y: -54} m_SizeDelta: {x: 1080, y: 238.2} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2521433971832506222 @@ -2192,7 +2190,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 364.8} + m_SizeDelta: {x: 1080, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972037583579 CanvasRenderer: @@ -2236,7 +2234,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: 11, y: -47} + m_AnchoredPosition: {x: 0, y: -27} m_SizeDelta: {x: 104.6, y: 121.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972106733198 @@ -2385,8 +2383,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 7} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 250, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972327183030 CanvasRenderer: @@ -2501,8 +2499,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 27} - m_SizeDelta: {x: 972.1, y: 207.8} + m_AnchoredPosition: {x: 562, y: 30} + m_SizeDelta: {x: 972.1, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972372736462 CanvasRenderer: @@ -2744,7 +2742,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: -99} + m_AnchoredPosition: {x: 550, y: -94.3} m_SizeDelta: {x: 238, y: 47} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2521433972845276864 @@ -3248,7 +3246,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: f494cbf65575d6847bf980da78f83bbd, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c13ee1b60f5c104ba8da33dcea7c65e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3625,8 +3623,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3017447788117375758} - m_Father: {fileID: 6176427214401596552} - m_RootOrder: 2 + m_Father: {fileID: 6675196813181403050} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -4601,7 +4599,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 460.8, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 921.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &99618445818788559 @@ -4758,7 +4756,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 463.4, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 876.8, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &524564526553235147 @@ -4847,11 +4845,11 @@ RectTransform: m_Children: - {fileID: 2615814839033395081} m_Father: {fileID: 6675196813181403050} - m_RootOrder: 2 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -156} + m_AnchoredPosition: {x: 0, y: -601} m_SizeDelta: {x: 294, y: 74} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6372558036476302970 @@ -4899,7 +4897,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 49} + m_SizeDelta: {x: 160, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835687216688569 CanvasRenderer: @@ -4931,11 +4929,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 42 + m_FontSize: 50 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 - m_MaxSize: 45 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -4990,7 +4988,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4232835687250830473 RectTransform: m_ObjectHideFlags: 0 @@ -5011,7 +5009,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: -9} + m_AnchoredPosition: {x: 0, y: -25} m_SizeDelta: {x: 921.6, y: 219.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835687250830479 @@ -5167,8 +5165,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 7} - m_SizeDelta: {x: 250, y: 100} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 250, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835687836527410 CanvasRenderer: @@ -5299,12 +5297,12 @@ RectTransform: - {fileID: 2521433971438079522} - {fileID: 2521433971459062832} m_Father: {fileID: 6675196813181403050} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000013351, y: -214.6} - m_SizeDelta: {x: 1080, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 742} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835688393017278 CanvasRenderer: @@ -5327,15 +5325,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.8627451} 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: 0e733869d01c63d49aa999ebc995023b, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 91f59481a5d43e340a9cc5b2cea39feb, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5372,7 +5370,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 140 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 0 @@ -5414,7 +5412,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: 105} + m_AnchoredPosition: {x: 0, y: 92} m_SizeDelta: {x: 217, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835688430425614 @@ -5464,7 +5462,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 315.7} + m_SizeDelta: {x: 1080, y: 330} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4232835688686533424 CanvasRenderer: @@ -5925,8 +5923,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.000061035156, y: 2.899994} - m_SizeDelta: {x: 0, y: 5} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7301701130667166715 CanvasRenderer: @@ -7895,11 +7893,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6176427214401596552} + - {fileID: 3893828624446996308} + - {fileID: 3450200103343875745} - {fileID: 5890283966329884458} - - {fileID: 303852434540796884} - {fileID: 9146953081295757750} - {fileID: 4232835688393017272} - {fileID: 2521433971832506192} + - {fileID: 303852434540796884} - {fileID: 6675063071754133006} m_Father: {fileID: 0} m_RootOrder: 0 @@ -8001,7 +8001,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6675196813181403050} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -8656,11 +8656,11 @@ RectTransform: m_Children: - {fileID: 1628636229182048963} m_Father: {fileID: 6675196813181403050} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 351} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -536} m_SizeDelta: {x: 294, y: 38.349976} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7877727971375654507 @@ -8748,11 +8748,11 @@ RectTransform: m_Children: - {fileID: 2045030427152012932} m_Father: {fileID: 6675196813181403050} - m_RootOrder: 1 + 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: 0, y: 541} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -386} m_SizeDelta: {x: 330, y: 330} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &844483896672669784 @@ -8770,7 +8770,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7973990399029319384} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -9010,8 +9010,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3798848024312793519} - m_Father: {fileID: 6176427214401596552} - m_RootOrder: 4 + m_Father: {fileID: 6675196813181403050} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -9391,7 +9391,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6176427214401596552} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab index 9d5ae85c40..d82805aae1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab @@ -1344,8 +1344,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: -133.1, y: -13.200001} - m_SizeDelta: {x: 236, y: 69.5} + m_AnchoredPosition: {x: -161.51, y: -13.200001} + m_SizeDelta: {x: 340.26, y: 69.5} m_Pivot: {x: 0, y: 0.5} --- !u!222 &309248663674038662 CanvasRenderer: @@ -3310,8 +3310,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: 83, y: 39} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 99.2, y: 27.4} + m_SizeDelta: {x: 54, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2573756644717642345 CanvasRenderer: @@ -9695,7 +9695,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 205, y: 109} + m_SizeDelta: {x: 221, y: 73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2816885767294164763 CanvasRenderer: @@ -9725,7 +9725,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a0197572fad951f42aea1fe738f49ab6, type: 3} + m_Sprite: {fileID: 21300000, guid: 1c13ee1b60f5c104ba8da33dcea7c65e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10097,7 +10097,7 @@ RectTransform: m_GameObject: {fileID: 5607870180097899956} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100.375} - m_LocalScale: {x: 0.00375, y: 0.00375, z: 0.00375} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6729611954407434404} - {fileID: 6877614142805537581} @@ -10110,7 +10110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -4.529297, y: -116.52936} + m_AnchoredPosition: {x: -744, y: -116.52936} m_SizeDelta: {x: 209, y: 105} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6890477205070885592 @@ -13197,13 +13197,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6330414708180383424} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8326139279270606670} m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -13239,7 +13239,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -16547,10 +16547,10 @@ RectTransform: m_Father: {fileID: 6274276792458260021} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 0, y: 418} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241396574210726628 CanvasRenderer: @@ -16580,7 +16580,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: 1a804d2a1e5a85f439d70f3d8133a2a3, type: 3} + m_Sprite: {fileID: 21300000, guid: f4e0f2aac65ddde4f97575e064b00ba3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16698,7 +16698,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 205, y: 109} + m_SizeDelta: {x: 221, y: 73} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2576360448304305248 CanvasRenderer: @@ -16728,7 +16728,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: e1443944b35bf714c9f3a8758f1a4673, type: 3} + m_Sprite: {fileID: 21300000, guid: 60543ff590fbc834aaf7693a3a83ab9e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab index 9e2b98095f..949aab1e3e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab @@ -31,7 +31,7 @@ RectTransform: m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} m_Children: [] m_Father: {fileID: 6861335391625502492} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -665,7 +665,7 @@ RectTransform: - {fileID: 395828500356168348} - {fileID: 2028442216281820147} m_Father: {fileID: 6861335391625502492} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -693,7 +693,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -780,8 +780,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2bc0f324630f3a14e9c479e62f9f1554, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 93cdbf91298a588478393900a05b8647, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -814,10 +814,11 @@ RectTransform: m_GameObject: {fileID: 578592716626341430} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4606631941937181983} - {fileID: 8499735268478621286} + - {fileID: 374780012204526839} - {fileID: 3147127543442412914} - {fileID: 3716492036976711716} - {fileID: 4708909235863613012} @@ -830,9 +831,84 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1416, y: 435.40002} - m_SizeDelta: {x: 804.8, y: 148.5} + m_AnchoredPosition: {x: -2004, y: 299} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &610871085379917261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 374780012204526839} + - component: {fileID: 2485461049148167896} + - component: {fileID: 5135538997563788329} + m_Layer: 5 + m_Name: huawen (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &374780012204526839 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610871085379917261} + 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: 8397054805343083431} + m_Father: {fileID: 7902341944916259896} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2485461049148167896 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610871085379917261} + m_CullTransparentMesh: 0 +--- !u!114 &5135538997563788329 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610871085379917261} + 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: 0.46168566, g: 0.70741105, b: 0.7830189, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &632068632474137322 GameObject: m_ObjectHideFlags: 0 @@ -1063,7 +1139,7 @@ RectTransform: m_LocalScale: {x: 0.99978584, y: 0.99978584, z: 0.99978584} m_Children: [] m_Father: {fileID: 7902341944916259896} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1145,8 +1221,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3.6, y: 306.07} - m_SizeDelta: {x: 812.1, y: 1075.18} + m_AnchoredPosition: {x: 7.42, y: 306.07} + m_SizeDelta: {x: 812.79, y: 1075.18} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &901912493587518605 GameObject: @@ -1213,8 +1289,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3b43e0dcd2e3aee4aa98eee5cb810819, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1313,6 +1389,7 @@ GameObject: - component: {fileID: 5312106733049325876} - component: {fileID: 5759443425803507341} - component: {fileID: 8481155909888375680} + - component: {fileID: 713682319589282298} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -1332,12 +1409,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2330869915964145961} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 363, y: 32.6} - m_SizeDelta: {x: 300.6, y: 65.6} + m_AnchoredPosition: {x: 338.6, y: 45} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5759443425803507341 CanvasRenderer: @@ -1360,7 +1437,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 1, g: 0.8627451, b: 0.68235296, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1369,7 +1446,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -1382,6 +1459,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &713682319589282298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986251193989566478} + 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 &1309622809618722204 GameObject: m_ObjectHideFlags: 0 @@ -1515,12 +1607,12 @@ RectTransform: m_Children: - {fileID: 3064148930752989416} m_Father: {fileID: 2330869915964145961} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 259.26, y: -27.8} - m_SizeDelta: {x: 93.144, y: 43.64} + m_AnchoredPosition: {x: 338, y: -27.8} + m_SizeDelta: {x: 300, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4402369311973345832 CanvasRenderer: @@ -1543,7 +1635,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.454902, g: 0.41960788, b: 0.47450984, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -1565,6 +1657,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6570\u91CF\uFF1A" LanguageIndex: 0 +--- !u!1 &1595553765165406637 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5234043026183675444} + - component: {fileID: 750712578584216} + - component: {fileID: 3788613959655333002} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5234043026183675444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595553765165406637} + 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: 1378837950016804666} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &750712578584216 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595553765165406637} + m_CullTransparentMesh: 0 +--- !u!114 &3788613959655333002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595553765165406637} + 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: 0.45882356, g: 0.7058824, b: 0.7803922, 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &1635833676486853691 GameObject: m_ObjectHideFlags: 0 @@ -1602,10 +1768,10 @@ RectTransform: m_Father: {fileID: 5263201763110471827} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 855.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -273.5} + m_SizeDelta: {x: 855.2, y: 547} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4518461394217738839 MonoBehaviour: @@ -1753,7 +1919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2491897635081094985 RectTransform: m_ObjectHideFlags: 0 @@ -1884,6 +2050,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2041519765824919341 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8397054805343083431} + - component: {fileID: 2657845709555399833} + - component: {fileID: 9169566289948360857} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8397054805343083431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041519765824919341} + 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: 374780012204526839} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2657845709555399833 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041519765824919341} + m_CullTransparentMesh: 0 +--- !u!114 &9169566289948360857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2041519765824919341} + 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: 0.45882356, g: 0.7058824, b: 0.7803922, 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &2089532078063229006 GameObject: m_ObjectHideFlags: 0 @@ -2141,6 +2381,7 @@ GameObject: - component: {fileID: 4708909235863613012} - component: {fileID: 798697634588757426} - component: {fileID: 5011911157490506251} + - component: {fileID: 6769518077834184194} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -2160,12 +2401,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 354, y: 45} - m_SizeDelta: {x: 300.6, y: 110} + m_AnchoredPosition: {x: 338.6, y: 45} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &798697634588757426 CanvasRenderer: @@ -2188,7 +2429,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 1, g: 0.8627451, b: 0.68235296, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2197,7 +2438,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 28 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -2210,6 +2451,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9752\u9E3E" LanguageIndex: 0 +--- !u!114 &6769518077834184194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2267616939600752212} + 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 &2328400149929956475 GameObject: m_ObjectHideFlags: 0 @@ -2242,10 +2498,10 @@ RectTransform: m_Father: {fileID: 5263201763110471827} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 856.72, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -648.99} + m_SizeDelta: {x: 856.72, y: 4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4336661691157481441 CanvasRenderer: @@ -2316,12 +2572,12 @@ RectTransform: m_Children: - {fileID: 9056346513904392846} m_Father: {fileID: 6861335391625502492} - m_RootOrder: 8 + m_RootOrder: 9 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: 285.73, y: -7.07} - m_SizeDelta: {x: 164.68, y: 54.15} + m_AnchoredPosition: {x: 285.73, y: 5.5} + m_SizeDelta: {x: 165, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &163819372599327465 CanvasRenderer: @@ -2814,7 +3070,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3218,11 +3474,11 @@ RectTransform: m_Children: - {fileID: 1960289367974706054} m_Father: {fileID: 7902341944916259896} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 360.3, y: -0.8} + m_AnchoredPosition: {x: 338, y: 0} m_SizeDelta: {x: 300.6, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6752290392390157319 @@ -3246,7 +3502,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3303,7 +3559,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: -239.59998, y: 90.5} + m_AnchoredPosition: {x: -328, y: 251} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &78928356562615579 @@ -3554,7 +3810,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 115, y: 329} + m_AnchoredPosition: {x: 175, y: 272} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1862177375710403708 @@ -3746,7 +4002,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u699C\u5355\u4E3A\u7A7A" + m_Text: "\u6CA1\u6709\u53EF\u5408\u6210\u7684\u788E\u7247" LanguageIndex: 0 --- !u!1 &3896596242208929948 GameObject: @@ -3815,10 +4071,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 40 + m_FontSize: 28 m_FontStyle: 2 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -3839,6 +4095,7 @@ GameObject: - component: {fileID: 7788500961126533581} - component: {fileID: 8513560359860010498} - component: {fileID: 1044731043083146900} + - component: {fileID: 8621258237299402331} m_Layer: 5 m_Name: name m_TagString: Untagged @@ -3858,12 +4115,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861335391625502492} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 338.6, y: 23.8} - m_SizeDelta: {x: 299.07, y: 40.9} + m_AnchoredPosition: {x: 338.6, y: 33.5} + m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8513560359860010498 CanvasRenderer: @@ -3886,7 +4143,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.5647059, b: 0.08235294, a: 1} + m_Color: {r: 1, g: 0.86309886, b: 0.6839622, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3908,6 +4165,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u795E\u517D" LanguageIndex: 0 +--- !u!114 &8621258237299402331 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3942890841887424050} + 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 &3998579437230733086 GameObject: m_ObjectHideFlags: 0 @@ -4106,6 +4378,81 @@ RectTransform: m_AnchoredPosition: {x: 131.95, y: -63.239998} m_SizeDelta: {x: 263.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4200177858957614749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3257687899496315527} + - component: {fileID: 2057183782884947258} + - component: {fileID: 5203829621438687291} + m_Layer: 5 + m_Name: huawen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3257687899496315527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200177858957614749} + 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: 1523525841249605569} + m_Father: {fileID: 6861335391625502492} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2057183782884947258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200177858957614749} + m_CullTransparentMesh: 0 +--- !u!114 &5203829621438687291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4200177858957614749} + 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: 0.46168566, g: 0.70741105, b: 0.7830189, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4221294572109841682 GameObject: m_ObjectHideFlags: 0 @@ -4131,10 +4478,11 @@ RectTransform: m_GameObject: {fileID: 4221294572109841682} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 966585169211168150} - {fileID: 91256649950995740} + - {fileID: 3257687899496315527} - {fileID: 110353308023344166} - {fileID: 1853085824433668464} - {fileID: 7788500961126533581} @@ -4148,7 +4496,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -2004, y: 476} - m_SizeDelta: {x: 814.26, y: 130.1} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4262756788402330538 GameObject: @@ -4402,7 +4750,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: -239.59998, y: 90.5} + m_AnchoredPosition: {x: -328, y: 251} m_SizeDelta: {x: 402, y: 234} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8526293784330986628 @@ -4588,7 +4936,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 115, y: 329} + m_AnchoredPosition: {x: 175, y: 272} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7883231417507999494 @@ -4628,6 +4976,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4744709738554282426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1523525841249605569} + - component: {fileID: 4057992089744057471} + - component: {fileID: 192499567757560669} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1523525841249605569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4744709738554282426} + 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: 3257687899496315527} + 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: 419.6, y: 0} + m_SizeDelta: {x: 149, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4057992089744057471 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4744709738554282426} + m_CullTransparentMesh: 0 +--- !u!114 &192499567757560669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4744709738554282426} + 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: 0.45882356, g: 0.7058824, b: 0.7803922, 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: 72677683575a3cd4a80e1f3a2509dfb0, 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 &4766367516037420135 GameObject: m_ObjectHideFlags: 0 @@ -4736,10 +5158,10 @@ RectTransform: m_Father: {fileID: 6971957839476499601} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 260, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 433.4, y: -49.995} + m_SizeDelta: {x: 260, y: 99.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1512027051913486422 CanvasRenderer: @@ -4899,12 +5321,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 6861335391625502492} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -283.12, y: -3.74} - m_SizeDelta: {x: 140.77, y: 136.04} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7428123842904795789 CanvasRenderer: @@ -5087,8 +5509,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2bc0f324630f3a14e9c479e62f9f1554, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 93cdbf91298a588478393900a05b8647, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5205,7 +5627,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2330869915964145961} - m_RootOrder: 2 + 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} @@ -5251,7 +5673,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5563,8 +5985,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2bc0f324630f3a14e9c479e62f9f1554, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 93cdbf91298a588478393900a05b8647, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5601,6 +6023,7 @@ RectTransform: m_Children: - {fileID: 5106948723013669908} - {fileID: 4070011551931542151} + - {fileID: 1378837950016804666} - {fileID: 4914207063976446917} - {fileID: 5312106733049325876} - {fileID: 6487891556991376904} @@ -5610,8 +6033,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1416, y: 435.40002} - m_SizeDelta: {x: 804.8, y: 148.5} + m_AnchoredPosition: {x: -2004, y: 109} + m_SizeDelta: {x: 814, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5706933110758858176 GameObject: @@ -5645,11 +6068,11 @@ RectTransform: - {fileID: 8200868749550275046} - {fileID: 1016874156854376854} m_Father: {fileID: 7902341944916259896} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 360.3, y: -46.1} + m_AnchoredPosition: {x: 338, y: -35} m_SizeDelta: {x: 300.6, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2555391022047323045 @@ -5673,7 +6096,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -5711,7 +6134,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2937635953175023364 RectTransform: m_ObjectHideFlags: 0 @@ -5852,8 +6275,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: 11.943, y: 312.43} - m_SizeDelta: {x: 830.5, y: 1063.4} + m_AnchoredPosition: {x: 6.9, y: 307.16} + m_SizeDelta: {x: 840.7, y: 1073.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5935303785263305452 GameObject: @@ -5913,7 +6336,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6204,12 +6627,12 @@ RectTransform: - {fileID: 7523486913981510544} - {fileID: 8137854966103219395} m_Father: {fileID: 2330869915964145961} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 270.12, y: 0} - m_SizeDelta: {x: 234.31, y: 66.69} + m_AnchoredPosition: {x: 285.73, y: 0} + m_SizeDelta: {x: 165, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5979528672487799334 CanvasRenderer: @@ -6324,7 +6747,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: 96.9, y: 17.7} + m_AnchoredPosition: {x: 71.6, y: 27.1} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3226745134179389187 @@ -6543,15 +6966,15 @@ RectTransform: m_GameObject: {fileID: 6349641605898572657} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} - m_RootOrder: 2 + 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: -318, y: 1.97} - m_SizeDelta: {x: 254.65, y: 254.65} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3219624093629425343 CanvasRenderer: @@ -6673,10 +7096,10 @@ RectTransform: m_Father: {fileID: 5263201763110471827} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 428.25, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 428.25, y: -596.995} + m_SizeDelta: {x: 866.8, y: 99.99} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5152306157904648720 MonoBehaviour: @@ -6809,6 +7232,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6958769779991904257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378837950016804666} + - component: {fileID: 1284542677299077873} + - component: {fileID: 6698683043304710559} + m_Layer: 5 + m_Name: huawen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1378837950016804666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6958769779991904257} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002142, y: 1.0002142, z: 1.0002142} + m_Children: + - {fileID: 5234043026183675444} + m_Father: {fileID: 2330869915964145961} + 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: -93.35, y: 3.48} + m_SizeDelta: {x: 625.31, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1284542677299077873 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6958769779991904257} + m_CullTransparentMesh: 0 +--- !u!114 &6698683043304710559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6958769779991904257} + 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: 0.46168566, g: 0.70741105, b: 0.7830189, a: 0.38431373} + 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: 2b94eeb880db76e49acd7d54adb7c324, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7047752142077278368 GameObject: m_ObjectHideFlags: 0 @@ -7053,7 +7551,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5742798183766346997 RectTransform: m_ObjectHideFlags: 0 @@ -7466,15 +7964,15 @@ RectTransform: m_GameObject: {fileID: 7585193143221097598} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] m_Father: {fileID: 7902341944916259896} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -317.4299, y: 1.59} - m_SizeDelta: {x: 236.61, y: 236.61} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5562267882983650265 CanvasRenderer: @@ -7703,7 +8201,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u699C\u5355\u4E3A\u7A7A" + m_Text: "\u65E0\u53EF\u51FA\u6218\u7075\u517D" LanguageIndex: 0 --- !u!1 &7973702576188653247 GameObject: @@ -7794,12 +8292,12 @@ RectTransform: m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.7} m_Children: [] m_Father: {fileID: 6861335391625502492} - m_RootOrder: 2 + 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: -283, y: -2.29} - m_SizeDelta: {x: 151.72, y: 148.17} + m_AnchoredPosition: {x: -310, y: 0} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &471397340392783851 CanvasRenderer: @@ -8015,8 +8513,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3b43e0dcd2e3aee4aa98eee5cb810819, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8135,11 +8633,11 @@ RectTransform: m_Children: - {fileID: 45829138913825212} m_Father: {fileID: 6861335391625502492} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 338, y: -7} + m_AnchoredPosition: {x: 338, y: 0} m_SizeDelta: {x: 300.6, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &576119899368139775 @@ -8163,7 +8661,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -8250,8 +8748,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5635943dd19a31546bb798d2a5002a41, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 1abea20f8ec919344b481c23ebe05634, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8293,7 +8791,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 183.69998, y: 0.0000066757} + m_AnchoredPosition: {x: 119.6, y: 0.0000066757} m_SizeDelta: {x: 82.88, y: 43.64} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &941079969177336181 @@ -8317,7 +8815,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.4431373, g: 0.40784317, b: 0.46274513, a: 1} + m_Color: {r: 0.14509805, g: 0.14509805, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -8331,7 +8829,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 5 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -8378,7 +8876,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -2083.2502, y: 13.600006} - m_SizeDelta: {x: 856.5, y: 0} + m_SizeDelta: {x: 856.5, y: 650.99} m_Pivot: {x: 0, y: 1} --- !u!114 &5109811759825171654 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua index 999f199b9e..fd8ad42a49 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_List.lua @@ -29,14 +29,14 @@ function this:InitComponent(gameObject) this.ItemPre1 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ItemPre1") local v2 = this.ScrollParentView1:GetComponent("RectTransform").rect this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView1.transform, - this.ItemPre1, nil, Vector2.New(820,1030), 1, 1, Vector2.New(0,10)) + this.ItemPre1, nil, Vector2.New(813.81,1011.876), 1, 1, Vector2.New(0,10)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 this.ItemPre2 = Util.GetGameObject(gameObject, "GodWeaponListPanel_List/ItemPre2") local v2 = this.ScrollParentView2:GetComponent("RectTransform").rect this.ScrollView2 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView2.transform, - this.ItemPre2, nil, Vector2.New(820,1030), 1, 1, Vector2.New(0,10)) + this.ItemPre2, nil, Vector2.New(813.81,1011.876), 1, 1, Vector2.New(0,10)) this.ScrollView2.moveTween.MomentumAmount = 1 this.ScrollView2.moveTween.Strength = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua index e5f9200505..01f0ea0750 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua @@ -252,7 +252,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) LogError("curData.star===="..curData.star) PokemonManager.SetHeroStars(this.spLoader, starGrid, curData.star,1,starSize) local nameText = Util.GetGameObject(parent, "nameText"):GetComponent("Text") - nameText.text = GetStringByEquipQua(spiritAnimalConfig.Quality, GetLanguageStrById(spiritAnimalConfig.Name)) + nameText.text = GetLanguageStrById(spiritAnimalConfig.Name) local liveImg=Util.GetGameObject(go, "upZhenInfo/pokemonLive"):GetComponent("Image") -- 特效显示配置 local config = EffectConfig[spiritAnimalConfig.Quality] diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua index 81c48e214f..2f113f1b5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua @@ -28,14 +28,14 @@ function this:InitComponent(gameObject) this.ItemPre1 = Util.GetGameObject(gameObject, "PokemonListPanel_List/ItemPre1") local v2 = this.ScrollParentView1:GetComponent("RectTransform").rect this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView1.transform, - this.ItemPre1, nil, Vector2.New(867.1, 1112.8), 1, 1, Vector2.New(0,0)) + this.ItemPre1, nil, Vector2.New(825, 1073.9), 1, 1, Vector2.New(-5,-5.3)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 this.ItemPre2 = Util.GetGameObject(gameObject, "PokemonListPanel_List/ItemPre2") local v2 = this.ScrollParentView2:GetComponent("RectTransform").rect this.ScrollView2 = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.ScrollParentView2.transform, - this.ItemPre2, nil, Vector2.New(867.1, 1112.8), 1, 1, Vector2.New(0,0)) + this.ItemPre2, nil, Vector2.New(825, 1073.9), 1, 1, Vector2.New(-5,-5.3)) this.ScrollView2.moveTween.MomentumAmount = 1 this.ScrollView2.moveTween.Strength = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua index 2b0edc303a..7a41f8da44 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua @@ -14,7 +14,7 @@ function this:InitComponent(gameObject) this.ItemPre = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ItemPre") local v2 = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView"):GetComponent("RectTransform").rect this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/ScrollParentView").transform, - this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,0)) + this.ItemPre, nil, Vector2.New(-v2.x*2, -v2.y*2), 1, 1, Vector2.New(0,10)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 1 this.NoneImage = Util.GetGameObject(gameObject, "PokemonListPanel_UpWar/NoneImage")