diff --git a/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png index 6da2f9bb1a..0eaf1bc6f0 100644 Binary files a/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png and b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png.meta b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png.meta index 60e9fc2d28..5df4e48504 100644 --- a/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png.meta +++ b/Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/x_xinjiangzhaohuan_icondi_ghwj_zh.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c50319e65ad9dcf49bdea89487013be3 +guid: d98413fe6a758f948b8e10cac5c6714c TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: 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 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: 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: 40cef1b65ef17954e82b634d9b6cd536 + spriteID: 4fdce93232d1cb5419d3466be7713648 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index f9211632ba..2f6ed5ca74 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -5323,7 +5323,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: 57, y: -365} + m_AnchoredPosition: {x: 62.5, y: -365} m_SizeDelta: {x: 129, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6020975154716938251 @@ -30609,7 +30609,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: 58, y: -224.5} + m_AnchoredPosition: {x: 63.5, y: -224} m_SizeDelta: {x: 127, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2892560023550008126 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index e9fc14e2bd..f12c527495 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -242,7 +242,7 @@ function QianKunBox:contentShow() self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[wishSoulData[i]].Quantity].circle) --点击能查看魂印信息 Util.AddOnceClick(self.icons[i].kuang.gameObject,function () - UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,iconsData[i].Reward[1],nil,nil) + UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,id,nil,nil) end) else self.icons[i].icon.gameObject:SetActive(false)