diff --git a/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png b/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png new file mode 100644 index 0000000000..2a9d3ea874 Binary files /dev/null and b/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png differ diff --git a/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png.meta b/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png.meta new file mode 100644 index 0000000000..1be7cd7344 --- /dev/null +++ b/Assets/ManagedResources/Atlas/TagAtlas/d_danaotiangong_tiangongmibao.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6187c2d2359ff994a9970f7e93744517 +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: 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: 796c96c4da62ba541a4479d60278910e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: TagAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/TreasureOfHeavenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/TreasureOfHeavenPanel.prefab index c5463908d5..b2b43e0ba3 100644 --- a/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/TreasureOfHeavenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TreasureOfHeaven/TreasureOfHeavenPanel.prefab @@ -793,7 +793,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 26, y: 235} - m_SizeDelta: {x: 318, y: 80} + m_SizeDelta: {x: 296, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &608899896 CanvasRenderer: @@ -823,7 +823,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: 02907e87996b75d4591c032e4d7c5e1a, type: 3} + m_Sprite: {fileID: 21300000, guid: 6187c2d2359ff994a9970f7e93744517, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index a46412da87..9158df68eb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -85,7 +85,7 @@ function ZhenQiYiBaoPage:SortData() local aboughtNum = a.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, a.Id) > 0 and 2 or 1 local bboughtNum = b.Limit - OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, b.Id) > 0 and 2 or 1 if aboughtNum == bboughtNum then - return a.Id < b.Id + return a.Price < b.Price else return aboughtNum > bboughtNum end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 21f3acc46d..efa53ee62e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -255,7 +255,7 @@ function this.SetMissionData() local data= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) for i = 1, 3 do this.rewardBtn[i]:SetActive(this.GetMissionState(i) == 0) - this.doneImg[i]:SetActive(this.GetMissionState(i) == -1) + this.doneImg[i]:SetActive(this.GetMissionState(i) == 1) this.btnGet[i]:SetActive(false) if i == 3 then this.btnGet[i]:SetActive(this.GetMissionState(i) == 3)