Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
d3b53a0eba
|
|
@ -3,6 +3,7 @@ local this = {}
|
||||||
local sortingOrder=0
|
local sortingOrder=0
|
||||||
local curPokemonSidList = {}
|
local curPokemonSidList = {}
|
||||||
local spiritAnimalBook = ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)
|
local spiritAnimalBook = ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)
|
||||||
|
local spiritAnimal = ConfigManager.GetConfig(ConfigName.SpiritAnimal)
|
||||||
|
|
||||||
local fetterPreList = {}
|
local fetterPreList = {}
|
||||||
local fetterPreItemList = {}
|
local fetterPreItemList = {}
|
||||||
|
|
@ -86,7 +87,7 @@ function this.SingleItemDataShow(_go,_fetterData)
|
||||||
fetterPreItemList[_go][k]:GetComponent("Image").sprite =
|
fetterPreItemList[_go][k]:GetComponent("Image").sprite =
|
||||||
Util.LoadSprite(GetQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Quality))
|
Util.LoadSprite(GetQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Quality))
|
||||||
Util.GetGameObject(fetterPreItemList[_go][k],"icon"):GetComponent("Image").sprite =
|
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],"mask"):SetActive(curPokemonSidList[v] == nil)
|
||||||
Util.GetGameObject(fetterPreItemList[_go][k],"name"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Name
|
Util.GetGameObject(fetterPreItemList[_go][k],"name"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,v).Name
|
||||||
if config.Teamers[k + 1] then
|
if config.Teamers[k + 1] then
|
||||||
|
|
|
||||||
|
|
@ -109,8 +109,8 @@ end
|
||||||
|
|
||||||
|
|
||||||
function this.SingPokemonDataShow(_go,_itemData)
|
function this.SingPokemonDataShow(_go,_itemData)
|
||||||
-- Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
|
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,"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,"name"):GetComponent("Text").text=itemConfig[_itemData.id].Name
|
||||||
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
|
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("<color=#00FF06>%s</color>","已出战") or string.format("<color=#FF0000>%s</color>","休息中")
|
Util.GetGameObject(_go.transform,"pokemonStateText"):GetComponent("Text").text = AllPokemonFormationDids[_itemData.dynamicId] and string.format("<color=#00FF06>%s</color>","已出战") or string.format("<color=#FF0000>%s</color>","休息中")
|
||||||
|
|
|
||||||
|
|
@ -69,8 +69,8 @@ end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.SingleItemDataShow(_go,_itemData)
|
function this.SingleItemDataShow(_go,_itemData)
|
||||||
-- Util.GetGameObject(_go.transform,"frame"):GetComponent("Image").sprite=Util.LoadSprite(GetQuantityImageByquality(itemConfig[_itemData.id].Quantity))
|
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,"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,"name"):GetComponent("Text").text=itemConfig[_itemData.id].Name
|
||||||
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
|
Util.GetGameObject(_go.transform,"lv/Text"):GetComponent("Text").text=_itemData.lv
|
||||||
local starSize = Vector2.New(50,50)
|
local starSize = Vector2.New(50,50)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue