From 169ad402c7ea61fad0bd9714aefaa0ed78e566e9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 23 Feb 2021 19:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BD=E7=89=87=E5=BE=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b_baolishuchu_juesebanzi2_solgan_zh.png | Bin ...baolishuchu_juesebanzi2_solgan_zh.png.meta | 35 +++++++++++++++++- .../ArtFont/s_shouchong_slogan_zh.png | Bin .../ArtFont/s_shouchong_slogan_zh.png.meta | 35 +++++++++++++++++- .../s_shouchong_anniu.png | Bin .../s_shouchong_anniu.png.meta | 4 +- .../Prefabs/UI/Expert/ExpertPanel.prefab | 2 +- .../~Lua/Modules/Operating/OperatingPanel.lua | 17 +++++++++ 8 files changed, 88 insertions(+), 5 deletions(-) rename Assets/ManagedResources/{Atlas/SupremeHeroAtlas => DynamicAtlas}/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png (100%) rename Assets/ManagedResources/{Atlas/SupremeHeroAtlas => DynamicAtlas}/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta (69%) rename Assets/ManagedResources/{Atlas/FirstRechargeAtlas => DynamicAtlas}/ArtFont/s_shouchong_slogan_zh.png (100%) rename Assets/ManagedResources/{Atlas/FirstRechargeAtlas => DynamicAtlas}/ArtFont/s_shouchong_slogan_zh.png.meta (69%) rename Assets/ManagedResources/{Atlas/FirstRechargeAtlas => DynamicAtlas}/s_shouchong_anniu.png (100%) rename Assets/ManagedResources/{Atlas/FirstRechargeAtlas => DynamicAtlas}/s_shouchong_anniu.png.meta (97%) diff --git a/Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png diff --git a/Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta similarity index 69% rename from Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta index 8e823ea17b..a2ef8f14e2 100644 --- a/Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/b_baolishuchu_juesebanzi2_solgan_zh.png.meta @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 58 + 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: [] @@ -80,7 +113,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: SupremeHeroAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_slogan_zh.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/s_shouchong_slogan_zh.png similarity index 100% rename from Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_slogan_zh.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/s_shouchong_slogan_zh.png diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_slogan_zh.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/s_shouchong_slogan_zh.png.meta similarity index 69% rename from Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_slogan_zh.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/s_shouchong_slogan_zh.png.meta index 02fbeb5939..94d891e193 100644 --- a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_slogan_zh.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/s_shouchong_slogan_zh.png.meta @@ -69,6 +69,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - 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: 58 + 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: [] @@ -80,7 +113,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: FirstRechargeAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/s_shouchong_anniu.png b/Assets/ManagedResources/DynamicAtlas/s_shouchong_anniu.png similarity index 100% rename from Assets/ManagedResources/Atlas/FirstRechargeAtlas/s_shouchong_anniu.png rename to Assets/ManagedResources/DynamicAtlas/s_shouchong_anniu.png diff --git a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/s_shouchong_anniu.png.meta b/Assets/ManagedResources/DynamicAtlas/s_shouchong_anniu.png.meta similarity index 97% rename from Assets/ManagedResources/Atlas/FirstRechargeAtlas/s_shouchong_anniu.png.meta rename to Assets/ManagedResources/DynamicAtlas/s_shouchong_anniu.png.meta index 137a2e147e..20fce3ac2b 100644 --- a/Assets/ManagedResources/Atlas/FirstRechargeAtlas/s_shouchong_anniu.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/s_shouchong_anniu.png.meta @@ -73,7 +73,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 58 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 @@ -102,7 +102,7 @@ TextureImporter: indices: edges: [] weights: [] - spritePackingTag: FirstRechargeAtlas + spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index cccf147455..143eb77805 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -207503,7 +207503,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: bcb2c58100219d844997cd13b1b70c6b, type: 3} + m_Sprite: {fileID: 21300000, guid: 966519e07bf63854a948ea52175781b5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index a0df46d406..462afbd55a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -39,6 +39,21 @@ local TabToContent = { [12] = 5, } +local TabImageConfig = { + [1] = {normal = "r_meiriqiandao_anniu_01_zh", select = "r_meiriqiandao_anniu_zh"}, + [2] = {normal = "c_chengzhang_yueka002_zh", select = "c_chengzhang_yueka001_zh"}, + [3] = {normal = "c_czjj_icon2_zh", select = "c_czjj_icon1_zh"}, + [4] = {normal = "r_jitianhaoli_anniu_01_zh", select = "r_jitianhaoli_anniu_zh"}, + [5] = {normal = "m_meizhoulibao_icon2_zh", select = "m_meizhoulibao_icon1_zh"}, + [6] = {normal = "m_meiyuelibao_icon2_zh", select = "m_meiyuelibao_icon1_zh"}, + [7] = {normal = "y_yjj_128yjj001_zh", select = "y_yjj_128yjj002_zh"}, + [8] = {normal = "y_yjj_328yjj002_zh", select = "y_yjj_328yjj001_zh"}, + [9] = {normal = "r_guanzhuyouli_anniu_01_zh", select = "r_guanzhuyouli_anniu_zh"}, + [10] = {normal = "z_zhenqibaoge_anniu_02_zh", select = "z_zhenqibaoge_anniu_01_zh"}, + [11] = {normal = "s_shengxingyouli_anniu_02_zh", select = "s_shengxingyouli_anniu_01_zh"}, + [12] = {normal = "r_huodong_leijichengzhianniu_01_zh", select = "r_huodong_leijichengzhianniu_zh"}, +} + local kMaxTab = #TabToContent function OperatingPanel:InitComponent() @@ -49,7 +64,9 @@ function OperatingPanel:InitComponent() self.selectTabs = {} for i = 1, kMaxTab do self.operateTabs[i] = Util.GetGameObject(self.tabsContent.transform, "tabs_" .. i) + self.operateTabs[i]:GetComponent("Image").sprite = Util.LoadSprite(TabImageConfig[i].normal) self.selectTabs[i] = Util.GetGameObject(self.operateTabs[i], "selected") + self.selectTabs[i]:GetComponent("Image").sprite = Util.LoadSprite(TabImageConfig[i].select) end self.selectTabIndex = -1 self.operatingContents = {