diff --git a/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png b/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png new file mode 100644 index 0000000000..c1f93579cf Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png.meta b/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png.meta new file mode 100644 index 0000000000..040e860680 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/Ancientruins_tipsbg.png.meta @@ -0,0 +1,121 @@ +fileFormatVersion: 2 +guid: c39d460845b8bfb4aab7d859cd894c2f +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: 55, y: 0, z: 119, 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 + - 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: 4c24708e8a4314c4ab679ce85cf43561 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/bg/ui/1all/ancientruins_tipsbg + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png b/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png new file mode 100644 index 0000000000..f44b7270b4 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png.meta b/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png.meta new file mode 100644 index 0000000000..8fb99605bd --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/buttonImage/btn4-1.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 59ed96b0635ddb642aa2ceb24dcb6add +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: e656cba37d61d2741ad4f8b67df4f909 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: lz4/bg/ui/1all/buttonimage/btn4-1 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn01.png.meta b/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn01.png.meta index 852dff9398..c54dae6d31 100644 --- a/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn01.png.meta +++ b/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn01.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/ui/1all/buttonimage/task_bigbtn01 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn02.png.meta b/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn02.png.meta index c2bb178452..55b4f2e375 100644 --- a/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn02.png.meta +++ b/Assets/ManagedResources/BG/UI/1All/buttonImage/task_bigbtn02.png.meta @@ -106,5 +106,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: - assetBundleVariant: + assetBundleName: lz4/bg/ui/1all/buttonimage/task_bigbtn02 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab index 7ef71c7ad4..4830cca00b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/GuildFindPopup.prefab @@ -475,8 +475,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.0024719238, y: 2} - m_SizeDelta: {x: -0.0049744, y: 4} + m_AnchoredPosition: {x: -0.0024719238, y: 0} + m_SizeDelta: {x: -0.0049744, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3722225797642032012 CanvasRenderer: @@ -555,8 +555,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: -84, y: 587} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: -56.13, y: 593.38} + m_SizeDelta: {x: 840.35, y: 83.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7651866067593838619 CanvasRenderer: @@ -586,8 +586,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: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c39d460845b8bfb4aab7d859cd894c2f, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -664,7 +664,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: 59ed96b0635ddb642aa2ceb24dcb6add, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -824,6 +824,7 @@ GameObject: - component: {fileID: 1693624106540423122} - component: {fileID: 6076602248896240522} - component: {fileID: 8560612089575832504} + - component: {fileID: 1646514995924889402} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -871,7 +872,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.078431375, g: 0.06666667, b: 0.050980393, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -893,6 +894,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u521B\u5EFA\u516C\u4F1A" LanguageIndex: 0 +--- !u!114 &1646514995924889402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734770853837530810} + 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 &1784643486453277394 GameObject: m_ObjectHideFlags: 0 @@ -1118,7 +1134,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: -35.800003, y: 5.999996} + m_AnchoredPosition: {x: -35.800003, y: 0} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8295928824103981319 @@ -1534,6 +1550,7 @@ GameObject: - component: {fileID: 1103404424260956289} - component: {fileID: 2470421610833348116} - component: {fileID: 8298734978340831823} + - component: {fileID: 158502426755149899} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1581,7 +1598,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.078431375, g: 0.06666667, b: 0.050980393, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1603,6 +1620,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4E00\u952E\u7533\u8BF7" LanguageIndex: 0 +--- !u!114 &158502426755149899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3633257753121957727} + 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 &3998164135851392453 GameObject: m_ObjectHideFlags: 0 @@ -1638,8 +1670,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 500} - m_SizeDelta: {x: -44, y: 61.4} + m_AnchoredPosition: {x: 0, y: 498} + m_SizeDelta: {x: -50, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9048879918769901813 CanvasRenderer: @@ -2153,7 +2185,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: 71162a8d1456dde45a156c169aeccf54, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2438,8 +2470,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: ab98a801fc52d784abc0d137dc9daeb2, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: a8f530feeafc0954db3b66a08004edf3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2910,7 +2942,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: 59ed96b0635ddb642aa2ceb24dcb6add, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3048,7 +3080,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: 4ea5db9ce28275b4285f6255c7d52acf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1