From cbe24364ec75c9ed7a3a38a3479ed29969cb6e17 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 2 Nov 2020 18:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E3=80=91=20=E8=B0=83=E4=B8=BB=E5=9F=8E=E7=9A=84=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab | 4 ++-- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- .../ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 50d1bbe877..bd282a2f00 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -1039,7 +1039,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: 1195, y: 210} + m_AnchoredPosition: {x: 1355, y: 174} m_SizeDelta: {x: 64, y: 186} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1586863083 @@ -77500,7 +77500,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: 940, y: 408.8} + m_AnchoredPosition: {x: 973.3, y: 338.3} m_SizeDelta: {x: 64, y: 186} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2549606708986302677 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index f96903be39..3674c7cd99 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -263,7 +263,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -200), --[FUNCTION_OPEN_TYPE.HAND_BOOK] = this:AddFuncItem(this.btnTujian,-2715), [FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200), - [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1400), + [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500), -- [FUNCTION_OPEN_TYPE.MONSTER_COMING] = this:AddFuncItem(this.btnMonster, -110), -- [FUNCTION_OPEN_TYPE.EXPEDITION] = this:AddFuncItem(this.btnExpedition, -110), [FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200), diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index 4e5d3306ba..9d41cbf50b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -486,7 +486,7 @@ end --上阵灵兽升级红点2 function this.GetSinglePokemonUpLvRedPoint(curPokemonData) local pokemonConFig = spiritAnimal[curPokemonData.id] - local upLvConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Quality",pokemonConFig.Quality,"Level",curPokemonData.lv + 1) + local upLvConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Quality",pokemonConFig.Quality,"Level",curPokemonData.lv) if curPokemonData.lv < pokemonConFig.MaxLevel then local canUpLv = true for j = 1, #upLvConFig.Consume do