diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG b/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG new file mode 100644 index 0000000000..8cf51dc76d Binary files /dev/null and b/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG differ diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG.meta b/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG.meta new file mode 100644 index 0000000000..a1671fd0ff --- /dev/null +++ b/Assets/ManagedResources/BG/UI/3hengtu/LZH15.JPG.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 9fc5bbfb69477a8479f83ebbabe7bdb0 +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: db262c45b56f0e045be6f7ff08baebfc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png b/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png new file mode 100644 index 0000000000..e09a5a0299 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png differ diff --git a/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png.meta b/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png.meta new file mode 100644 index 0000000000..ec23bcbcd8 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/5renwu/Dragon Ball七龙珠- (625).png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 5f257aca0b313b142ac88d24b375f41b +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: 6e61d219827c5b347922f5a0e6188083 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab index 2ff23e0507..87be8915e0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab @@ -183,7 +183,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: 3.7} m_SizeDelta: {x: 168, y: 152} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1461795694 @@ -295,7 +295,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: -43.1} + m_AnchoredPosition: {x: 0, y: -69} m_SizeDelta: {x: 160, y: 132.71} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1790694090 @@ -810,7 +810,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -335.6, y: 7.5} - m_SizeDelta: {x: 125, y: 127} + m_SizeDelta: {x: 98, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1193563521840781645 CanvasRenderer: @@ -840,7 +840,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: a3cc16b83b5bd5448a051df62e723493, type: 3} + m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2589,12 +2589,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7928700322618677471} - m_RootOrder: 0 + m_Father: {fileID: 3995650248301756071} + 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: -8, y: -37} + m_AnchoredPosition: {x: 0, y: 158} m_SizeDelta: {x: 240, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5458125339333162267 @@ -2619,7 +2619,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4605,7 +4605,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: 123, y: 110} + m_AnchoredPosition: {x: 108.8, y: 94} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3237493543798140826 @@ -5448,6 +5448,7 @@ RectTransform: - {fileID: 5225222707268928931} - {fileID: 4740747647566745407} - {fileID: 3400156158053226791} + - {fileID: 3313309440141745824} m_Father: {fileID: 2384741869561909548} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6183,8 +6184,7 @@ 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: - - {fileID: 3313309440141745824} + m_Children: [] m_Father: {fileID: 3995650248301756071} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6221,7 +6221,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: 64028836f7a6d9643933be0748dd3036, type: 3} + m_Sprite: {fileID: 21300000, guid: 9fc5bbfb69477a8479f83ebbabe7bdb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7453,8 +7453,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: -4, y: 127} - m_SizeDelta: {x: 365, y: 261} + m_AnchoredPosition: {x: 0, y: 260} + m_SizeDelta: {x: 217, y: 225} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1248165550345191026 CanvasRenderer: @@ -7471,7 +7471,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7292373875626833789} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -7484,7 +7484,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: 3e8ed147f86c3724b8d374c9ec937f97, type: 3} + m_Sprite: {fileID: 21300000, guid: 7e78311ebdc298c4aa94b64bbd3b0d7a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -8491,7 +8491,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: -2, y: 107} + m_AnchoredPosition: {x: -2, y: 92} m_SizeDelta: {x: 550, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8737532196289447247