diff --git a/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png b/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png new file mode 100644 index 0000000000..bb2ba39f74 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png.meta b/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png.meta new file mode 100644 index 0000000000..ded9771f66 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityGiftAtlas/ArtFont/onekeySweep_zh.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 89d2588b01764e047989db86e361ac79 +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: 56 + 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: ca6f3b451aca3c94193d971f4ba81cac + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityGiftAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab index 7fb5b50209..aff7f41c51 100644 --- a/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Map/MapPanel.prefab @@ -223,7 +223,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 530, y: 90} m_Pivot: {x: 0.5, y: 0} --- !u!114 &543123651 MonoBehaviour: @@ -484,8 +484,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -20, y: 257} - m_SizeDelta: {x: 426.1, y: 0} + m_AnchoredPosition: {x: -29, y: 262} + m_SizeDelta: {x: 426.1, y: 128} m_Pivot: {x: 1, y: 0} --- !u!114 &1530677022 MonoBehaviour: @@ -561,9 +561,9 @@ RectTransform: m_Father: {fileID: 224963046119617888} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -200.52} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1542938824 @@ -909,9 +909,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63.5, y: -63} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222767406942535930 @@ -11378,9 +11378,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 190.5, y: -64} m_SizeDelta: {x: 127, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1374282065204091655 @@ -11979,10 +11979,10 @@ RectTransform: m_Father: {fileID: 4149605185548300908} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 9, y: 0} - m_SizeDelta: {x: 0, y: 86} + m_SizeDelta: {x: 315, y: 86} m_Pivot: {x: 0, y: 1} --- !u!222 &1371611014670686407 CanvasRenderer: @@ -37434,9 +37434,9 @@ RectTransform: m_Father: {fileID: 7737561222015288609} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -67.5} m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4852086384894688426 @@ -37550,8 +37550,8 @@ RectTransform: m_Father: {fileID: 2574529201874018074} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2, y: -20} m_Pivot: {x: 0.5, y: 0.5} @@ -47497,9 +47497,9 @@ RectTransform: m_Father: {fileID: 224963046119617888} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -63} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2746532898759778030 @@ -63647,7 +63647,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -221.5, y: 0} - m_SizeDelta: {x: 0, y: 86} + m_SizeDelta: {x: 435, y: 86} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4151294092829747772 CanvasRenderer: @@ -64194,10 +64194,10 @@ RectTransform: m_Father: {fileID: 224787418950452670} m_RootOrder: 17 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: 100, y: 100} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -100, y: 483} + m_SizeDelta: {x: 174, y: 174} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1712483036945392404 CanvasRenderer: @@ -64227,7 +64227,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: 2475f1497ebd6d24e81685f3db43d8e7, type: 3} + m_Sprite: {fileID: 21300000, guid: 89d2588b01764e047989db86e361ac79, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -64636,9 +64636,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 317.5, y: -64} m_SizeDelta: {x: 127, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3776263709751302196 @@ -64772,7 +64772,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -69974,7 +69974,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 78} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 288, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1025382664160607553 CanvasRenderer: @@ -110052,10 +110052,10 @@ RectTransform: m_Father: {fileID: 450262287389847687} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 144, y: -40} + m_SizeDelta: {x: 188, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3974413921375269519 CanvasRenderer: @@ -111456,10 +111456,10 @@ RectTransform: m_Father: {fileID: 543123650} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -80} + m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0} --- !u!222 &6636352288110051540 CanvasRenderer: @@ -112013,9 +112013,9 @@ RectTransform: m_Father: {fileID: 1530677021} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 444.5, y: -63} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4556992764502876251 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index c843ba8741..c53bebe7ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -181,6 +181,11 @@ function TrialMapPanel:OnOpen() if CarbonManager.difficulty ~= 2 then return end this.InitShowState() + if MapTrialManager.curTowerLevel<=MapTrialManager.towerCleanFloor then + this.btn_sweep:SetActive(true) + else + this.btn_sweep:SetActive(false) + end -- 检测引导 GuideManager.CheckCarbonGuild(CARBON_TYPE.TRIAL)