From a3d42ec9fb4e1dff5dcfa82d6ba199eacc2a255d Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Tue, 4 Jun 2024 17:46:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E8=AE=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/SpecailTraining/TrainingItemListPanel.prefab | 4 ++-- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 7 ++++--- .../~Lua/Modules/RoleInfo/TrainingItemListPanel.lua | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab index 6ae9b51424..33cc24f4a1 100644 --- a/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SpecailTraining/TrainingItemListPanel.prefab @@ -2942,9 +2942,9 @@ 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: -60} + m_AnchoredPosition: {x: -60, y: -27.810028} m_SizeDelta: {x: 117.880005, y: 32.190002} - m_Pivot: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!222 &7225143497615663008 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 9c30faec3c..bb4e5d8a0c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3654,15 +3654,16 @@ end --获取某一个星级的所有英雄 function this.GetAllNumStarData(star) local heros = {} - local heros2 = {} + local heros2 = FormationManager.GetAllFormationHeroId() for i, v in pairs(heroDatas) do - if v.star==star then - table.insert(heros, v) + if v.star==star and heros2[i]==nil then + table.insert(heros, v) end end return heros end + --单个英雄升级红点 function this.LvUpBtnRedPoint(curHeroData) HeroManager.GetCurHeroUpLvOrUpStarSData(curHeroData) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua index c4b5af2a62..6f37e90a63 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TrainingItemListPanel.lua @@ -117,7 +117,7 @@ function TrainingItemListPanel:OnOpen(_curData,_func,NeedNum,selectItems1,select end elseif _curData.type==3 then - local pokemonList = PokemonManager.GetPokemonDatas() + local pokemonList = PokemonManager.GetCanUpZhenPokemonDatas() local index=0 for i=1,#pokemonList do local v={} @@ -250,6 +250,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local lockImage = Util.GetGameObject(formationMask.transform, "lockImage") local noumenon = Util.GetGameObject(go, "noumenon") local starGrid = Util.GetGameObject(go.transform, "star") + --starGrid.transform.position=Vector3.New(-60,-60,0) local cardBtn = Util.GetGameObject(go.transform, "icon") local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask") if heroData.type == RoleUpStarMatType.hero then @@ -426,7 +427,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local lockImage = Util.GetGameObject(formationMask.transform, "lockImage") local noumenon = Util.GetGameObject(go, "noumenon") local starGrid = Util.GetGameObject(go.transform, "star") - starGrid.transform.position=Vector3.New(-60,-60,0) + --starGrid.transform.position=Vector3.New(-60,-60,0) local cardBtn = Util.GetGameObject(go.transform, "icon") local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask") frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.pokemonData.config.Quality,heroData.star))