diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG b/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG new file mode 100644 index 0000000000..0322740234 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG differ diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG.meta b/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG.meta new file mode 100644 index 0000000000..97d9f0866d --- /dev/null +++ b/Assets/ManagedResources/BG/UI/3hengtu/LZS213.JPG.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 41e46a2ce86620d42b07291ebe7bbf4d +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: 1e0be9b07d677974284f24a239270c78 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg b/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg new file mode 100644 index 0000000000..48081510e2 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg differ diff --git a/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg.meta b/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg.meta new file mode 100644 index 0000000000..d98465ddbe --- /dev/null +++ b/Assets/ManagedResources/BG/UI/3hengtu/LZS244.jpg.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 88aacfa0abb62594b94cfcc26e7097de +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: 8a17fa3819ad32c43b4f52d1b567b0da + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index 2a39342a27..d904606556 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -229,7 +229,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.09692383} + m_AnchoredPosition: {x: 0, y: -0.09716797} m_SizeDelta: {x: 0, y: -0.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3713774413455505581 @@ -383,7 +383,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: 840.1284, y: -226} + m_AnchoredPosition: {x: 966, y: -100} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3803326489293840791 @@ -624,7 +624,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: 840.1284, y: -590} + m_AnchoredPosition: {x: 966, y: -673.09} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &988307759817543788 @@ -841,7 +841,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: 840.1284, y: -407} + m_AnchoredPosition: {x: 966, y: -291.03003} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4300029144163247428 @@ -9100,7 +9100,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: 840.1284, y: -482.06} + m_AnchoredPosition: {x: 966, y: -482.06} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7365318240650836378 @@ -10428,7 +10428,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: -318} + m_AnchoredPosition: {x: 0, y: -452} m_SizeDelta: {x: 681, y: 443} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6322218054091808788 @@ -10446,7 +10446,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6553412302124382472} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab index 72da94e5f5..fb75c3f227 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/Transcript/GuildTranscriptMainPopup.prefab @@ -109,7 +109,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.2142978, y: -50} + m_AnchoredPosition: {x: 2.2142978, y: -55.7} m_SizeDelta: {x: 215.3, y: 72.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &358519245 @@ -432,7 +432,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.5, y: -50} + m_AnchoredPosition: {x: 0.5, y: -55.7} m_SizeDelta: {x: 215.3, y: 72.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1233106425 @@ -906,15 +906,15 @@ RectTransform: m_GameObject: {fileID: 767815585694021642} 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_LocalScale: {x: 0.76, y: 0.8, z: 1} m_Children: [] m_Father: {fileID: 8507410457605464740} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 43} - m_SizeDelta: {x: 817, y: 977} + m_AnchoredPosition: {x: 0, y: -213.7} + m_SizeDelta: {x: 1080, y: 589} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &767815585694021647 CanvasRenderer: @@ -937,14 +937,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.254717, g: 0.254717, b: 0.254717, a: 0.53333336} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 2a29e7b8ecff9894ea72fa570d9a375d, type: 3} + m_Sprite: {fileID: 21300000, guid: 41e46a2ce86620d42b07291ebe7bbf4d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1306,6 +1306,7 @@ GameObject: - component: {fileID: 3535554585579517494} - component: {fileID: 391564713732914746} - component: {fileID: 2202119243193627333} + - component: {fileID: 677134961474216077} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1353,7 +1354,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1373,8 +1374,23 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u626B\u8361" + m_Text: "\u626B \u8361" LanguageIndex: 0 +--- !u!114 &677134961474216077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1909906344786005750} + 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 &1909936818509183577 GameObject: m_ObjectHideFlags: 0 @@ -1665,14 +1681,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4481132, g: 0.66366976, 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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 474e2e8a2ea58b74c8c9e2239e3eb5aa, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2054,6 +2070,7 @@ GameObject: - component: {fileID: 374792995007972914} - component: {fileID: 3552291308302863934} - component: {fileID: 9144523033707088010} + - component: {fileID: 6682900936755471895} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2101,7 +2118,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2121,8 +2138,23 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6311\u6218" + m_Text: "\u6311 \u6218" LanguageIndex: 0 +--- !u!114 &6682900936755471895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360250075950694130} + 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 &3668389783302543094 GameObject: m_ObjectHideFlags: 0 @@ -2880,7 +2912,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: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} + m_Sprite: {fileID: 21300000, guid: 3792a7f8b985fe942aba6af631899c22, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3897,7 +3929,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: b204bd77afb57e14e830d912e88eb357, type: 3} + m_Sprite: {fileID: 21300000, guid: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6230,8 +6262,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: 289.4, y: 129.9} - m_SizeDelta: {x: 126, y: 121.8} + m_AnchoredPosition: {x: 289.4, y: 135} + m_SizeDelta: {x: 120, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249490810269186 CanvasRenderer: @@ -6261,7 +6293,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 @@ -6348,7 +6380,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8772249491134576767 RectTransform: m_ObjectHideFlags: 0 @@ -6365,8 +6397,8 @@ 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.7295119, y: -1223} - m_SizeDelta: {x: 898.92, y: 5.82} + m_AnchoredPosition: {x: -0.080475, y: -396} + m_SizeDelta: {x: 818.1, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249491134576765 CanvasRenderer: @@ -6396,7 +6428,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: f57339a8b1354b9428d22a0b8dce20c9, type: 3} + m_Sprite: {fileID: 21300000, guid: 88aacfa0abb62594b94cfcc26e7097de, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6483,7 +6515,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 288.2, y: -12.8} - m_SizeDelta: {x: 126, y: 121.8} + m_SizeDelta: {x: 120, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8772249491336531647 CanvasRenderer: @@ -6513,7 +6545,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