From 0af293c7d9a9992841340df7692ff7090bba8ea8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 5 Mar 2021 15:12:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E5=B7=85=E5=B3=B0=E8=B5=9B=20?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont}/UI_effect_jiesuan_bai01.png | Bin .../ArtFont}/UI_effect_jiesuan_bai01.png.meta | 10 ++--- .../ArenaTopMatch/ArenaTopMatchPanel.prefab | 4 +- .../ArenaTopMatch/TopMatchRecordPopup.prefab | 38 +++++++++--------- .../ArenaTopMatch/ATMMyGuessHistoryPopup.lua | 2 + .../Modules/ArenaTopMatch/RecordPopup.lua | 4 +- 6 files changed, 30 insertions(+), 28 deletions(-) rename Assets/ManagedResources/{PublicArtRes/Textures => DynamicAtlas/ArtFont}/UI_effect_jiesuan_bai01.png (100%) rename Assets/ManagedResources/{PublicArtRes/Textures => DynamicAtlas/ArtFont}/UI_effect_jiesuan_bai01.png.meta (96%) diff --git a/Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_bai01.png b/Assets/ManagedResources/DynamicAtlas/ArtFont/UI_effect_jiesuan_bai01.png similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_bai01.png rename to Assets/ManagedResources/DynamicAtlas/ArtFont/UI_effect_jiesuan_bai01.png diff --git a/Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_bai01.png.meta b/Assets/ManagedResources/DynamicAtlas/ArtFont/UI_effect_jiesuan_bai01.png.meta similarity index 96% rename from Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_bai01.png.meta rename to Assets/ManagedResources/DynamicAtlas/ArtFont/UI_effect_jiesuan_bai01.png.meta index 9ad7486baa..3fbde5cfc3 100644 --- a/Assets/ManagedResources/PublicArtRes/Textures/UI_effect_jiesuan_bai01.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/ArtFont/UI_effect_jiesuan_bai01.png.meta @@ -31,12 +31,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -73,12 +73,12 @@ TextureImporter: buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 4 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android @@ -95,7 +95,7 @@ TextureImporter: buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 - textureFormat: 65 + textureFormat: 58 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index fcb916934a..c9e7e816a6 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -20566,7 +20566,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.0000076293945, y: 0.00012207031} - m_SizeDelta: {x: 297.94, y: 135} + m_SizeDelta: {x: 187, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &862902006 CanvasRenderer: @@ -40052,7 +40052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -79.399994, y: 600} + m_AnchoredPosition: {x: -79.3999, y: 600} m_SizeDelta: {x: 122, y: 122} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1490294014 diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/TopMatchRecordPopup.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/TopMatchRecordPopup.prefab index fa5ada5039..7d0e426961 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/TopMatchRecordPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/TopMatchRecordPopup.prefab @@ -715,8 +715,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: 182, y: -37.499985} - m_SizeDelta: {x: 160, y: 50} + m_AnchoredPosition: {x: 147.6, y: -37.499985} + m_SizeDelta: {x: 91, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1140979271 CanvasRenderer: @@ -750,13 +750,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 30 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u79EF\u5206" @@ -813,7 +813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1591045715 RectTransform: m_ObjectHideFlags: 0 @@ -984,7 +984,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: -60, y: -56.6} + m_AnchoredPosition: {x: -60, y: -40.1} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8381992428165824203 @@ -2293,7 +2293,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -14, y: -37.499985} - m_SizeDelta: {x: 160, y: 50} + m_SizeDelta: {x: 211.67, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3123008693985460469 CanvasRenderer: @@ -2327,13 +2327,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 30 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u73A9\u5BB6\u540D\u5B57\u4E03\u4E2A\u5B57" @@ -2452,7 +2452,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: 244, y: -56.000015} + m_AnchoredPosition: {x: 147.1, y: -80.3} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2116139224854375446 @@ -2913,7 +2913,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: 20, y: -7.100006} + m_AnchoredPosition: {x: 20, y: 7} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3071228195415356122 @@ -2993,7 +2993,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: 87.100006, y: -56.600006} + m_AnchoredPosition: {x: -59.800056, y: -80.899994} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2277385294711848035 @@ -3973,7 +3973,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3405659535368045500 RectTransform: m_ObjectHideFlags: 0 @@ -4704,7 +4704,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: 97, y: -56.000015} + m_AnchoredPosition: {x: 147, y: -39.500015} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6848953398962843977 @@ -4987,7 +4987,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: 66.7, y: 0} + m_AnchoredPosition: {x: 122, y: 0} m_SizeDelta: {x: 160, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6575920878512271627 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua index 7a3094a1b4..2dfef7230c 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ATMMyGuessHistoryPopup.lua @@ -79,9 +79,11 @@ function this.RefreshData(go, itemData) local redName = Util.GetGameObject(go, "name_2"):GetComponent("Text") local zhan = Util.GetGameObject(go, "zhan") local bai = Util.GetGameObject(go, "bai") + Util.GetGameObject(go, "bai"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_bai01_zh") local shengOrBaiParent1 = Util.GetGameObject(go, "shengOrBaiParent1") local shengOrBaiParent2 = Util.GetGameObject(go, "shengOrBaiParent2") local sheng = Util.GetGameObject(go, "sheng") + Util.GetGameObject(go, "sheng"):GetComponent("Image").sprite = Util.LoadSprite("UI_effect_jiesuan_shengli02_zh") local state = Util.GetGameObject(go, "state"):GetComponent("Text") local betNum = Util.GetGameObject(go, "betNum"):GetComponent("Text") local getNum = Util.GetGameObject(go, "getNum"):GetComponent("Text") diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua index f0fc83fcf2..3bb7eb8bab 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/RecordPopup.lua @@ -74,7 +74,7 @@ function this.RefreshData(go, itemData) --- 基础信息 local head = Util.GetGameObject(go, "head") local lv_name = Util.GetGameObject(go, "name"):GetComponent("Text") - local power = Util.GetGameObject(go, "power/Text"):GetComponent("Text") + local power = Util.GetGameObject(go, "power"):GetComponent("Text")--/Text local result = Util.GetGameObject(go, "result"):GetComponent("Text") local scoreLab = Util.GetGameObject(go, "score"):GetComponent("Text") local deltaScore = Util.GetGameObject(go, "score/Text"):GetComponent("Text") @@ -95,7 +95,7 @@ function this.RefreshData(go, itemData) end lv_name.text = "lv" .. personInfo.level .. " " .. personInfo.name - power.text = personInfo.totalForce + power.text = Language[10104] .. personInfo.totalForce match.text = ArenaTopMatchManager.GetTurnNameByRoundTimes(itemData.roundTimes) LogPink("itemData.roundTimes "..itemData.roundTimes.." "..ArenaTopMatchManager.GetTurnNameByRoundTimes(itemData.roundTimes)) From 3c32b2aa4a27288547e7125c0ce55ad3505dacab Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 5 Mar 2021 15:14:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=88=91=E8=A6=81=E5=8F=98=E5=BC=BA=20=E7=81=B5?= =?UTF-8?q?=E5=85=BDlv=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Effects/Model/Materials.meta | 8 ++++++++ .../~Lua/Modules/Pokemon/PokemonMainPanel.lua | 6 +++++- .../~Lua/Modules/Power/GiveMePowerPanel.lua | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 Assets/ManagedResources/Effects/Model/Materials.meta diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta new file mode 100644 index 0000000000..85c619cb77 --- /dev/null +++ b/Assets/ManagedResources/Effects/Model/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70e7feb15403e214f801e51b8b4e0461 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 89e400832d..1670bb8c6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -169,7 +169,11 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) go.transform.parent.gameObject:SetActive(false) elseif state == 2 then lockInfo:SetActive(true) - Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = pokemonPosLocks[liveIndex]..Language[10056] + if GetCurLanguage() == 0 then + Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = pokemonPosLocks[liveIndex]..Language[10056] + else + Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = Language[10056]..pokemonPosLocks[liveIndex] + end Util.AddOnceClick( Util.GetGameObject(go, "lockInfo/lockInfo/lockClick"), function() PopupTipPanel.ShowTip(pokemonPosLocks[liveIndex]..Language[10056]) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index cf1b54fcb8..4732c66e34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -474,9 +474,9 @@ function this.ShowRmdPanel(index) local childBox = Util.GetGameObject(node, "childbox") local childName = Util.GetGameObject(childBox, "name"):GetComponent("Text") local childContent = Util.GetGameObject(childBox, "content"):GetComponent("Text") - title.text = GetLanguageStrById(data.DescFirst) + title.text = ""--GetLanguageStrById(data.DescFirst) local strList = string.split(GetLanguageStrById(data.DescSecond), "#") - childName.text = "      "..strList[1] -- 空格用于调整文字的起始位置 + childName.text = GetLanguageStrById(data.DescFirst).." "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 childContent.text = "       "..strList[2] -- 全角空格可以避免自动换行 for index, heroId in ipairs(data.ItemId) do local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroId) From 16982ef939b169a624200e96b26939f9403deaeb Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 5 Mar 2021 15:19:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Power/GiveMePowerPanel.prefab | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab index 974fdefb60..e206251249 100644 --- a/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Power/GiveMePowerPanel.prefab @@ -467,8 +467,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 399, y: -14.799999} - m_SizeDelta: {x: 798, y: 60} + m_AnchoredPosition: {x: 107.7, y: -14.799999} + m_SizeDelta: {x: 215.4, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1372727728810463521 CanvasRenderer: @@ -505,7 +505,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 300 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -604,7 +604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1226896253369639726 RectTransform: m_ObjectHideFlags: 0 @@ -6026,7 +6026,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1476706327392456444 RectTransform: m_ObjectHideFlags: 0 @@ -8381,7 +8381,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 300 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 From 8ad991380062918d42dba36daad45698dc52db1f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 5 Mar 2021 15:24:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=88=91=E8=A6=81=E5=8F=98=E5=BC=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index 4732c66e34..cff25f6dcd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -476,7 +476,7 @@ function this.ShowRmdPanel(index) local childContent = Util.GetGameObject(childBox, "content"):GetComponent("Text") title.text = ""--GetLanguageStrById(data.DescFirst) local strList = string.split(GetLanguageStrById(data.DescSecond), "#") - childName.text = GetLanguageStrById(data.DescFirst).." "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 + childName.text = GetLanguageStrById(data.DescFirst).." : "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 childContent.text = "       "..strList[2] -- 全角空格可以避免自动换行 for index, heroId in ipairs(data.ItemId) do local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroId)