diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
index 67ed6a667d..f542eb7dcf 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
@@ -54810,7 +54810,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5654493723090188587
@@ -59789,7 +59789,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6062511932881660853
@@ -79869,11 +79869,11 @@ RectTransform:
m_Father: {fileID: 5062462498499650815}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -30.8}
- m_SizeDelta: {x: 0, y: 248.7}
- m_Pivot: {x: 0.5, y: 0.5}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -450.03607, y: 481.59106}
+ m_SizeDelta: {x: 900, y: 1024.7}
+ m_Pivot: {x: 0, y: 1}
--- !u!222 &53568527404370663
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -144871,7 +144871,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6811571571477918014
@@ -145056,7 +145056,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7092808791275506075
@@ -236599,7 +236599,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4580723804436947017
@@ -243990,7 +243990,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -20.4, y: -11.8}
+ m_AnchoredPosition: {x: -20.4, y: -11.799999}
m_SizeDelta: {x: 50.42, y: 31.520004}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8304116888084308034
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
index 91315ea1ab..d44302fd0e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
@@ -70,8 +70,10 @@ function PlayerInfoPopup:InitComponent()
for i = 1, 6 do
table.insert(this.Pokemons, Util.GetGameObject(self.gameObject, "tipImage/panel/pokemonInfo/Demons/heroPro (" .. i .. ")"))
end
+ this.pokemonObj=Util.GetGameObject(self.transform, "tipImage/panel/pokemonInfo").gameObject
this.boxLine = Util.GetGameObject(self.transform, "tipImage/panel/defendbox/line")
this.btnBox = Util.GetGameObject(self.transform, "tipImage/panel/box")
+ this.bgImg= Util.GetGameObject(self.transform, "tipImage/tipImage"):GetComponent("RectTransform")
this.btnList = {}
this.btnList[1] = Util.GetGameObject(this.btnBox, "btn1")
this.btnList[2] = Util.GetGameObject(this.btnBox, "btn2")
@@ -218,13 +220,7 @@ function this.FormationAdapter(teamInfo)
Util.GetGameObject(demon, "hero"):SetActive(false)
Util.AddOnceClick(frameBtn, function()
end)
- end
- for i, demon in ipairs(this.Pokemons) do
- Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1))
- Util.GetGameObject(demon, "hero"):SetActive(false)
- Util.AddOnceClick(frameBtn, function()
- end)
- end
+ end
--队伍阵容
for i, hero in ipairs(teamInfo.team) do
local demonId = teamInfo.team[i].heroTid
@@ -248,9 +244,27 @@ function this.FormationAdapter(teamInfo)
end)
end
end
+ local len=#teamInfo.PokemonInfos
+ LogError("长度:"..len)
+ if len>0 then
+ this.bgImg.sizeDelta=Vector2.New(900,1024)
+ this.pokemonObj:SetActive(true)
+ for i, demon in ipairs(this.Pokemons) do
+ demon.gameObject:SetActive(false)
+ Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1))
+ Util.GetGameObject(demon, "hero"):SetActive(false)
+ Util.AddOnceClick(frameBtn, function()
+ end)
+ end
+ else
+ this.bgImg.sizeDelta=Vector2.New(900,850)
+ this.pokemonObj:SetActive(false)
+ end
+
--队伍灵兽
for i, hero in ipairs(teamInfo.PokemonInfos) do
local demonId = teamInfo.PokemonInfos[i].heroTid
+ this.Pokemons[i].gameObject:SetActive(true)
if demonId then
local heroGo = Util.GetGameObject(this.Pokemons[i], "hero")
heroGo:SetActive(true)
@@ -263,60 +277,11 @@ function this.FormationAdapter(teamInfo)
local heroData = {}
Util.AddOnceClick(frameBtn, function()
local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}
- UIManager.OpenPanel(UIName.PokemonGetInfoPopup, false,pokemonData.id)
+ UIManager.OpenPanel(UIName.PokemonGetInfoPopup,true,pokemonData)
end)
end
end
- -- for i, demon in ipairs(this.Demons) do
- -- if(teamInfo.team[i]) then
- -- demon:SetActive(true)
-
- -- local roleLevel=Util.GetGameObject(demon, "lvbg/levelText"):GetComponent("Text")
- -- local frameBtn=Util.GetGameObject(demon, "frame")
- -- local hpSlider = Util.GetGameObject(demon, "Slider")
- -- hpSlider:SetActive(false)
- -- if demonId then
- -- demon:SetActive(true)
- -- local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
- -- Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
- -- Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.HeroConfig,teamInfo.team[i].heroTid).Star))
- -- SetHeroStars(starGrid, teamInfo.team[i].star)
- -- proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
- -- -- posImage.sprite=Util.LoadSprite()
- -- -- LogRed(tostring(teamInfo.position))
- -- -- posImage.sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(demonData.Profession))
- -- -- heroStage.sprite = Util.LoadSprite(HeroStageSprite[demonData.HeroStage])
- -- roleLevel.text=teamInfo.team[i].level
- -- --if effectLayer > 0 then
- -- -- self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Star == 5 or _itemData.configData.Star == 7)
- -- -- self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Star == 6)
- -- --end
- -- local heroData = {}
- -- Util.AddOnceClick(frameBtn, function()
- -- NetManager.ViewHeroInfoRequest(this._PlayerId,teamInfo.team[i].heroid,function(msg)
- -- heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
- -- GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
- -- UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
- -- end)
-
- -- end)
- -- end
- -- else
- -- demon:SetActive(false)
- -- end
-
- -- end
- -- 异妖
- -- for i, diffDemon in ipairs(this.DiffDemons) do
- -- local demonId = teamInfo.PokemonInfos[i]
- -- if demonId then
- -- diffDemon:SetActive(true)
- -- local resId = ConfigManager.GetConfigData(ConfigName.DifferDemonsConfig, demonId).LiveIcon
- -- diffDemon:GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(resId))
- -- else
- -- diffDemon:SetActive(false)
- -- end
- -- end
+
end
-- 刷新按钮显示
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua
index 402fb0ae69..3d0d56b729 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RewardPreviewPopup.lua
@@ -174,7 +174,7 @@ function this.CreatePokemonInfo(showData)
SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.previewList[1], "gird").transform)
end
this.List1[i]:OnOpen(false, {fiveData[i].Reward[1], fiveData[i].Reward[2]}, 1.1, true)
- -- this.List1[i].name:GetComponent("Text").text ="" .. string.format("%.2f", (fiveData[i].Weight / 100000) * 100) .. "%"
+ this.List1[i].name:GetComponent("Text").text ="" .. string.format("%.2f", (fiveData[i].Weight / 100000) * 100) .. "%"
this.List1[i].gameObject:SetActive(true)
end
@@ -184,7 +184,7 @@ function this.CreatePokemonInfo(showData)
SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.previewList[2], "gird").transform)
end
this.List2[i]:OnOpen(false, {fourData[i].Reward[1], fourData[i].Reward[2]}, 1.1, true)
- --this.List2[i].name:GetComponent("Text").text = "" .. string.format("%.2f", (fourData[i].Weight / 100000) * 100) .. "%"
+ this.List2[i].name:GetComponent("Text").text = "" .. string.format("%.2f", (fourData[i].Weight / 100000) * 100) .. "%"
this.List2[i].gameObject:SetActive(true)
end
@@ -194,7 +194,7 @@ function this.CreatePokemonInfo(showData)
SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.previewList[3], "gird").transform)
end
this.List3[i]:OnOpen(false, {ThreeData[i].Reward[1], ThreeData[i].Reward[2]}, 1.1, true)
- --this.List3[i].name:GetComponent("Text").text = "" .. string.format("%.2f", (ThreeData[i].Weight / 100000) * 100) .. "%"
+ this.List3[i].name:GetComponent("Text").text = "" .. string.format("%.2f", (ThreeData[i].Weight / 100000) * 100) .. "%"
end
for i = 1, #otherList do
@@ -202,7 +202,7 @@ function this.CreatePokemonInfo(showData)
this.List4[i] = SubUIManager.Open(SubUIConfig.ItemView, Util.GetGameObject(this.previewList[4], "gird").transform)
end
this.List4[i]:OnOpen(false, {otherList[i].Reward[1], otherList[i].Reward[2] }, 1.1, true)
- -- this.List4[i].name:GetComponent("Text").text = ""..string.format("%.2f",(otherList[i].Weight/100000)*100) .."%"
+ this.List4[i].name:GetComponent("Text").text = ""..string.format("%.2f",(otherList[i].Weight/100000)*100) .."%"
end
end