diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png new file mode 100644 index 0000000000..99e1a822d9 Binary files /dev/null and b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png differ diff --git a/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png.meta b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png.meta new file mode 100644 index 0000000000..c9f6bf8baa --- /dev/null +++ b/Assets/ManagedResources/BG/UI/1All/X1_shikongzhanchang_cengshu.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: deaeb25fe9494844cabaa0ab082a5a69 +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: 5ba75925600378c4f9c9f33a62def045 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab index 37dcd541ec..d54d84e654 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemBoxLvUpPopup.prefab @@ -9634,6 +9634,7 @@ GameObject: - component: {fileID: 5641341370736926859} - component: {fileID: 5774044368214880523} - component: {fileID: 2454072733596109780} + - component: {fileID: 652979012640418662} m_Layer: 0 m_Name: Text m_TagString: Untagged @@ -9657,7 +9658,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: 13.1} + m_AnchoredPosition: {x: 0, y: -16} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5774044368214880523 @@ -9681,7 +9682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.38823533, b: 0.027450982, a: 1} + m_Color: {r: 0.9716981, g: 0.7910368, b: 0.087086126, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -9702,6 +9703,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7B49\u7EA7\u63D0\u5347" +--- !u!114 &652979012640418662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650308535318925863} + 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 &764868362587421553 GameObject: m_ObjectHideFlags: 0 @@ -28884,8 +28900,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: 19, y: 464} - m_SizeDelta: {x: 487, y: 123} + m_AnchoredPosition: {x: 0, y: 457} + m_SizeDelta: {x: 322, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8922043846312088817 CanvasRenderer: @@ -28915,7 +28931,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: 51aba957240b4344d81615d7728d655a, type: 3} + m_Sprite: {fileID: 21300000, guid: deaeb25fe9494844cabaa0ab082a5a69, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -43367,7 +43383,7 @@ RectTransform: 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: 621} + m_AnchoredPosition: {x: 0, y: 592} m_SizeDelta: {x: 850, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1871788054020293439 @@ -57497,6 +57513,7 @@ GameObject: - component: {fileID: 3486346050417423225} - component: {fileID: 4799137733209416494} - component: {fileID: 6280982724527687077} + - component: {fileID: 6933616907323531419} m_Layer: 0 m_Name: Text1 m_TagString: Untagged @@ -57544,7 +57561,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9056604, g: 0.5311252, b: 0.11534355, a: 1} + m_Color: {r: 0.9528302, g: 0.8155017, b: 0.31011927, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -57566,6 +57583,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u540D\u79F0\u664B\u5347\u4E3A\u7D2B\u8272" LanguageIndex: 0 +--- !u!114 &6933616907323531419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6933616907323531418} + 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 &7171018574869535477 GameObject: m_ObjectHideFlags: 0 @@ -67280,8 +67312,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: b58cf19a281322746aeaf19b377e9cda, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: e23d094daff5d5e47a3e6899351e38e5, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -76947,7 +76979,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8510111860438971041} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: