From 194187e5e5c0d3686b9705556ada57a98ad98cc3 Mon Sep 17 00:00:00 2001
From: zhangqiang <657634622@qq.com>
Date: Sat, 24 Oct 2020 15:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua | 3 ++-
.../~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua | 4 ++--
.../~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua
index 9f430d48d2..f2b5549c4e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua
@@ -3,6 +3,7 @@ local this = {}
local sortingOrder=0
local curPokemonSidList = {}
local spiritAnimalBook = ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)
+local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
local fetterPreList = {}
local fetterPreItemList = {}
@@ -86,7 +87,7 @@ function this.SingleItemDataShow(_go,_fetterData)
fetterPreItemList[_go][k]:GetComponent("Image").sprite =
Util.LoadSprite(GetQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Quality))
Util.GetGameObject(fetterPreItemList[_go][k],"icon"):GetComponent("Image").sprite =
- Util.LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,v).ResourceID))
+ Util.LoadSprite(GetResourcePath(spiritAnimal[v].Icon))
Util.GetGameObject(fetterPreItemList[_go][k],"mask"):SetActive(curPokemonSidList[v] == nil)
Util.GetGameObject(fetterPreItemList[_go][k],"name"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Name
if config.Teamers[k + 1] then
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua
index bbdfdd7faf..b271d33490 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_List.lua
@@ -109,8 +109,8 @@ end
function this.SingPokemonDataShow(_go,_itemData)
- -- Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
- Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[_itemData.id].ResourceID))
+ Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
+ Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(spiritAnimal[_itemData.id].Icon))
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=itemConfig[_itemData.id].Name
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text = AllPokemonFormationDids[_itemData.dynamicId] and string.format("%s","已出战") or string.format("%s","休息中")
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua
index c304f66709..62c147b2d9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_UpWar.lua
@@ -69,8 +69,8 @@ end)
end
function this.SingleItemDataShow(_go,_itemData)
- -- Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
- Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[_itemData.id].ResourceID))
+ Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
+ Util.GetGameObject(_go.transform,"icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(spiritAnimal[_itemData.id].Icon))
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=itemConfig[_itemData.id].Name
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
local starSize = Vector2.New(50,50)