diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png new file mode 100644 index 0000000000..1f67edb73a Binary files /dev/null and b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png differ diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png.meta b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png.meta new file mode 100644 index 0000000000..8efdfdd8f5 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(330).png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e9b632da9163877489854c0908356a6e +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: 37d48dbd5ab681e48a3607d7cfae10f6 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png new file mode 100644 index 0000000000..5abed794d3 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png differ diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png.meta b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png.meta new file mode 100644 index 0000000000..f20ce2d976 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(338).png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8764efd1048476f48bd9a7dce5045744 +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: f08c79563f0ab40459dc25e260176452 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png new file mode 100644 index 0000000000..2caaf3a3a9 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png differ diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png.meta b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png.meta new file mode 100644 index 0000000000..fc852dc348 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(450).png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: c75ca7c93cb80ff4ea7b843c10bb0f63 +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: 6be9d8c7b2aaff7488c33061fcfab752 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png new file mode 100644 index 0000000000..ff998f599a Binary files /dev/null and b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png differ diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png.meta b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png.meta new file mode 100644 index 0000000000..657edc6319 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/5renwu/Dragon-Ball七龙珠--(77).png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9caac6692534b734da320ddd807f48c3 +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: cf364b2da9136884bb187ab67c21db69 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab index e526015585..6691d54ffa 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/CarbonTypePanel.prefab @@ -28,7 +28,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 2059892985946014174} m_Father: {fileID: 6136837587217029211} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -65,7 +66,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -389,7 +390,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: 0} + m_AnchoredPosition: {x: 0, y: 9} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1570153208 @@ -413,7 +414,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.65882355} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5419,7 +5420,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 3383104863790286593} m_Father: {fileID: 6136837587217029211} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5456,7 +5458,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5872,10 +5874,10 @@ RectTransform: m_Father: {fileID: 978495578546209590} 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: 79, y: 175} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 80, y: 0} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415955639395319411 CanvasRenderer: @@ -5905,7 +5907,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: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10971,8 +10973,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: 75.29004, y: -356.19} - m_SizeDelta: {x: 88.44, y: 88.43994} + m_AnchoredPosition: {x: 986, y: -183} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1692568740101678818 CanvasRenderer: @@ -11044,7 +11046,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11248,7 +11250,7 @@ RectTransform: m_GameObject: {fileID: 2805532382373517910} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1.25} m_Children: - {fileID: 6652774364023157594} - {fileID: 695531127845444092} @@ -11260,7 +11262,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 327.8, y: -447.3} - m_SizeDelta: {x: 452.3, y: 535.8} + m_SizeDelta: {x: 600, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7372509964265174134 CanvasRenderer: @@ -11290,7 +11292,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: 8c2971d414dec2b4f9ee929fbf394fc6, type: 3} + m_Sprite: {fileID: 21300000, guid: 8764efd1048476f48bd9a7dce5045744, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21434,8 +21436,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: -45.200012} - m_SizeDelta: {x: -50, y: -250.90002} + m_AnchoredPosition: {x: 0, y: 29.452637} + m_SizeDelta: {x: -98.2, y: -423.28} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1076334398264121550 CanvasRenderer: @@ -21465,7 +21467,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: 9a88815d0abcabb4e9052dfea2108ab7, type: 3} + m_Sprite: {fileID: 21300000, guid: 1e284e265fb44274f8005505a65c891c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -21650,7 +21652,7 @@ RectTransform: m_GameObject: {fileID: 4839429938215396552} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1.25} m_Children: - {fileID: 2465961640174556827} - {fileID: 5024305517741662426} @@ -21661,8 +21663,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: 352.8, y: 482.4} - m_SizeDelta: {x: 484, y: 542.9} + m_AnchoredPosition: {x: 366, y: 533} + m_SizeDelta: {x: 600, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2228187954786722898 CanvasRenderer: @@ -21692,7 +21694,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: 66d4835120735d44ababceeb32a3df3a, type: 3} + m_Sprite: {fileID: 21300000, guid: 9caac6692534b734da320ddd807f48c3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -31846,7 +31848,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -364.5, y: -42.699997} + m_AnchoredPosition: {x: -364.5, y: -42.700012} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3261406090063144802 @@ -32032,7 +32034,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.892, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -193.99951} + m_AnchoredPosition: {x: 0, y: -193.99976} m_SizeDelta: {x: 0, y: -386} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2428802644684589417 @@ -36845,6 +36847,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &6747610543140754739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3383104863790286593} + - component: {fileID: 281123782865105301} + - component: {fileID: 8704744730383782625} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3383104863790286593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6747610543140754739} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5200717219769878827} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -368.5, y: 0} + m_SizeDelta: {x: 345, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &281123782865105301 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6747610543140754739} + m_CullTransparentMesh: 0 +--- !u!114 &8704744730383782625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6747610543140754739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6895292208051872107 GameObject: m_ObjectHideFlags: 0 @@ -41810,7 +41886,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.109000005, y: 1} - m_AnchoredPosition: {x: 0, y: -193.99951} + m_AnchoredPosition: {x: 0, y: -193.99976} m_SizeDelta: {x: 0, y: -386} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7857412686296864224 @@ -41878,7 +41954,7 @@ RectTransform: m_GameObject: {fileID: 7208733178888156912} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1.25} m_Children: - {fileID: 2715306956263042468} - {fileID: 8959549297959982749} @@ -41889,8 +41965,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: -320.02, y: -210.4} - m_SizeDelta: {x: 512.04, y: 565.1} + m_AnchoredPosition: {x: -379, y: -210.4} + m_SizeDelta: {x: 600, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4739537170948246988 CanvasRenderer: @@ -41920,7 +41996,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: 31f3d4ac59d89854da3718e59affaa2e, type: 3} + m_Sprite: {fileID: 21300000, guid: e9b632da9163877489854c0908356a6e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -47115,6 +47191,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &7753131168828373688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2059892985946014174} + - component: {fileID: 7541941496473681794} + - component: {fileID: 3099174445238428019} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2059892985946014174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7753131168828373688} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 167193219} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -291.08, y: 0.37} + m_SizeDelta: {x: 496.83, y: 177.35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7541941496473681794 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7753131168828373688} + m_CullTransparentMesh: 0 +--- !u!114 &3099174445238428019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7753131168828373688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7827701794868837140 GameObject: m_ObjectHideFlags: 0 @@ -47491,7 +47641,7 @@ RectTransform: m_GameObject: {fileID: 8993151397504992290} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1.25} + m_LocalScale: {x: 1, y: 1, z: 1.25} m_Children: - {fileID: 2986970021626512112} - {fileID: 9099667823288208929} @@ -47503,7 +47653,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -375.9, y: 720.3} - m_SizeDelta: {x: 507.5, y: 562.7} + m_SizeDelta: {x: 600, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7789695697154601346 CanvasRenderer: @@ -47533,7 +47683,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: 21f0a13b7c2bf314ebabad48211c81ad, type: 3} + m_Sprite: {fileID: 21300000, guid: c75ca7c93cb80ff4ea7b843c10bb0f63, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua index 64cbd57911..ced8c44538 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua @@ -7,22 +7,22 @@ local orginLayer = 0 local activityType = { [1] = { - bg = "UI_hz_xy_05", + bg = "Dragon Ball七龙珠- (450)", name = Language[10331], gameObject = "daoxuanbaojing" , }, [4] = { - bg = "UI_hz_xy_08", + bg = "Dragon Ball七龙珠- (338)", name = Language[10334], gameObject = "fuochanbaojing" , }, [3] = { - bg = "UI_hz_xy_07", + bg = "Dragon Ball七龙珠- (330)", name = Language[10333], gameObject = "renjiebaojing" , }, [2] = { - bg = "UI_hz_xy_06", + bg = "Dragon-Ball七龙珠--(77)", name = Language[10332], gameObject = "yaolingbaojing" , },