神兵信息弹窗修改提交
parent
10fee38b64
commit
207c1f3426
Binary file not shown.
|
After Width: | Height: | Size: 868 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3aa6d295bb5d2ca43a38dd836d80e91e
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: f469a96c2dc85b0488e9ee09ceba60e7
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: GodWeaponAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d6e0fd07d8262234aba55c8b867c802f
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -490,6 +490,7 @@ UIName = {
|
|||
GodsWayTreasurePanel=498,
|
||||
GodWeaponMainPanel=499,--神兵主界面
|
||||
GodWeaponListPanel=500, --神兵列表
|
||||
GodWeaponGetInfoPopup=502,--神兵信息弹窗
|
||||
}
|
||||
|
||||
SubUIConfig = {
|
||||
|
|
|
|||
|
|
@ -521,7 +521,6 @@ TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
|
|||
TEAMONETEAMINFO = protobuf.Descriptor();
|
||||
TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -529,6 +528,7 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD = protobuf.FieldDescriptor();
|
|||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO = protobuf.Descriptor();
|
||||
TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -5856,21 +5856,10 @@ TEAMONETEAMINFO_POKEMONINFOS_FIELD.message_type = TEAMSIMPLEINFO
|
|||
TEAMONETEAMINFO_POKEMONINFOS_FIELD.type = 11
|
||||
TEAMONETEAMINFO_POKEMONINFOS_FIELD.cpp_type = 10
|
||||
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier"
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier"
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 3
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 2
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {}
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10
|
||||
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.name = "totalForce"
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.totalForce"
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 4
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 3
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.number = 3
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.index = 2
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.label = 1
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_TOTALFORCE_FIELD.default_value = 0
|
||||
|
|
@ -5879,8 +5868,8 @@ TEAMONETEAMINFO_TOTALFORCE_FIELD.cpp_type = 1
|
|||
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.name = "remainHp"
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.remainHp"
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.number = 5
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.index = 4
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.number = 4
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.index = 3
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.label = 3
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {}
|
||||
|
|
@ -5889,8 +5878,8 @@ TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2
|
|||
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow"
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow"
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 6
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 5
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {}
|
||||
|
|
@ -5900,8 +5889,8 @@ TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10
|
|||
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.name = "transformationCardInfo"
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.transformationCardInfo"
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 7
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 6
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.number = 6
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.index = 5
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.label = 3
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.default_value = {}
|
||||
|
|
@ -5911,8 +5900,8 @@ TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD.cpp_type = 10
|
|||
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.name = "sixiangxinfaInfo"
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sixiangxinfaInfo"
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 8
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 7
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.number = 7
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.index = 6
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.label = 3
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.default_value = {}
|
||||
|
|
@ -5922,8 +5911,8 @@ TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD.cpp_type = 10
|
|||
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.name = "lifeGridInfo"
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.lifeGridInfo"
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 9
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 8
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.number = 8
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.index = 7
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.label = 3
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.default_value = {}
|
||||
|
|
@ -5933,8 +5922,8 @@ TEAMONETEAMINFO_LIFEGRIDINFO_FIELD.cpp_type = 10
|
|||
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.name = "userMountInfo"
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.userMountInfo"
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 10
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 9
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.number = 9
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.index = 8
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.label = 3
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.default_value = {}
|
||||
|
|
@ -5942,11 +5931,22 @@ TEAMONETEAMINFO_USERMOUNTINFO_FIELD.message_type = USERMOUNTINFO
|
|||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.type = 11
|
||||
TEAMONETEAMINFO_USERMOUNTINFO_FIELD.cpp_type = 10
|
||||
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.name = "MagicSoldier"
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.MagicSoldier"
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.number = 10
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.index = 9
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.label = 3
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.has_default_value = false
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.default_value = {}
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.message_type = TEAMSIMPLEINFO
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.type = 11
|
||||
TEAMONETEAMINFO_MAGICSOLDIER_FIELD.cpp_type = 10
|
||||
|
||||
TEAMONETEAMINFO.name = "TeamOneTeamInfo"
|
||||
TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo"
|
||||
TEAMONETEAMINFO.nested_types = {}
|
||||
TEAMONETEAMINFO.enum_types = {}
|
||||
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD}
|
||||
TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD, TEAMONETEAMINFO_TRANSFORMATIONCARDINFO_FIELD, TEAMONETEAMINFO_SIXIANGXINFAINFO_FIELD, TEAMONETEAMINFO_LIFEGRIDINFO_FIELD, TEAMONETEAMINFO_USERMOUNTINFO_FIELD, TEAMONETEAMINFO_MAGICSOLDIER_FIELD}
|
||||
TEAMONETEAMINFO.is_extendable = false
|
||||
TEAMONETEAMINFO.extensions = {}
|
||||
TEAMONEINFO_UID_FIELD.name = "uid"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,182 @@
|
|||
require("Base/BasePanel")
|
||||
GodWeaponGetInfoPopup = Inherit(BasePanel)
|
||||
local this=GodWeaponGetInfoPopup
|
||||
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
|
||||
local pokemonBackData
|
||||
local pokemonSid
|
||||
local isGet
|
||||
local proList = {}
|
||||
local skillList={}
|
||||
--初始化组件(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:InitComponent()
|
||||
this.spLoader = SpriteLoader.New()
|
||||
|
||||
this.BtnBack=Util.GetGameObject(self.transform, "bg/btnBack")
|
||||
this.liveRoot=Util.GetGameObject(self.transform, "bg/liveRoot"):GetComponent("Image")
|
||||
this.heroName = Util.GetGameObject(self.transform, "bg/nameInfo/nameText"):GetComponent("Text")
|
||||
this.starGrid = Util.GetGameObject(self.transform, "bg/PokemonInfo/starGrid(Clone)")
|
||||
--属性
|
||||
for i = 0, 4 do
|
||||
proList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/pro/singlePro ("..i..")")
|
||||
end
|
||||
--技能
|
||||
for i = 1, 2 do
|
||||
skillList[i] = Util.GetGameObject(self.transform,"bg/PokemonInfo/skillGrid/skill"..i)
|
||||
skillList[i]:SetActive(false)
|
||||
end
|
||||
this.skillGrid=Util.GetGameObject(self.transform,"bg/PokemonInfo/skillGrid")
|
||||
this.skillPre=Util.GetGameObject(self.transform,"bg/PokemonInfo/skill")
|
||||
|
||||
end
|
||||
local triggerCallBack
|
||||
--绑定事件(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:BindEvent()
|
||||
|
||||
Util.AddClick(this.BtnBack, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
--添加事件监听(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:AddListener()
|
||||
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:RemoveListener()
|
||||
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:OnOpen(_isGet,data)--data 未获得的时候为灵兽静态ID 获得的时候为本地数据
|
||||
|
||||
isGet=_isGet
|
||||
if isGet then
|
||||
pokemonBackData = data
|
||||
else
|
||||
pokemonSid = data
|
||||
end
|
||||
end
|
||||
function GodWeaponGetInfoPopup:OnShow()
|
||||
if isGet then
|
||||
this.GetShowPanelData()
|
||||
else
|
||||
this.NoGetShowPanelData()
|
||||
end
|
||||
end
|
||||
function this.GetShowPanelData()
|
||||
local pokemonSData=ConfigManager.GetConfigData(ConfigName.ShenBing, pokemonBackData.tempId)
|
||||
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
|
||||
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
|
||||
--this.ShowPokemonLive(pokemonSData)
|
||||
this.liveRoot.sprite=this.spLoader:LoadSprite(GetResourcePath(pokemonSData.Icon))
|
||||
--星级
|
||||
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, pokemonBackData.star,2,Vector2.New(60,60))
|
||||
--属性
|
||||
local allAddProVal=GodWeaponManager.GetSinglePokemonAddProDataByLvAndStar(pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
|
||||
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
|
||||
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = pokemonBackData.level
|
||||
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
|
||||
local index = 0
|
||||
for key, value in pairs(allAddProVal) do
|
||||
index = index + 1
|
||||
if proList[index] then
|
||||
Util.GetGameObject(proList[index].transform,"proName"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig,key).Info)
|
||||
Util.GetGameObject(proList[index].transform,"proValue"):GetComponent("Text").text = value
|
||||
Util.GetGameObject(proList[index].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.PropertyConfig,key).PropertyIcon))
|
||||
end
|
||||
end
|
||||
LogError("pokemonBackData.tempId=="..pokemonBackData.tempId.." pokemonBackData.star=="..pokemonBackData.star)
|
||||
local skills=ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.ShenBingSkill,"SpiritAnimalMatch",pokemonBackData.tempId,"StarMatch",pokemonBackData.star)
|
||||
for i = 1, #skillList do
|
||||
skillList[i]:SetActive(false)
|
||||
end
|
||||
for i = 1, #skills do
|
||||
skillList[i]:SetActive(true)
|
||||
local skillName=Util.GetGameObject(skillList[i].transform,"nameText"):GetComponent("Text")
|
||||
local skillIcon=Util.GetGameObject(skillList[i].transform,"icon"):GetComponent("Image")
|
||||
local skillBtn=Util.GetGameObject(skillList[i].transform,"bg/PokemonInfo/skill/icon")
|
||||
skillName.text=skills[i].Name
|
||||
skillIcon.sprite= this.spLoader:LoadSprite(GetResourcePath(skills[i].Icon))
|
||||
end
|
||||
|
||||
-- local curSkillId = 0
|
||||
-- local skillArray = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,pokemonBackData.tempId).SkillArray
|
||||
-- for i = 1, #skillArray do
|
||||
-- if skillArray[i][1] == pokemonBackData.star then
|
||||
-- curSkillId = skillArray[i][2]
|
||||
-- end
|
||||
-- end
|
||||
-- local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
|
||||
-- this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
|
||||
-- this.skillLvGo:SetActive(true)
|
||||
-- this.skillLv.text = curSkillConFig.Level
|
||||
-- this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
|
||||
Util.AddOnceClick(this.skillBtn, function()
|
||||
UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonBackData.tempId,pokemonBackData.level,pokemonBackData.star)
|
||||
end)
|
||||
end
|
||||
function this.NoGetShowPanelData()
|
||||
local pokemonSData=ConfigManager.GetConfigData(ConfigName.SpiritAnimal, pokemonSid)
|
||||
this.heroName.text = GetStringByEquipQua(pokemonSData.Quality, GetLanguageStrById(pokemonSData.Name))
|
||||
SetTextVerTial(this.heroName,Vector3.New(96.87,0,0))
|
||||
--this.ShowPokemonLive(pokemonSData)
|
||||
--星级
|
||||
PokemonManager.SetHeroStars(this.spLoader, this.starGrid, 0,2,Vector2.New(60,60))
|
||||
--属性
|
||||
local allAddProVal = PokemonManager.GetSinglePokemonAddProDataBySid(pokemonSid) --this.CalculateHeroAllProValList(heroSData,heroStar,heroStar ~= heroSData.Star)
|
||||
Util.GetGameObject(proList[0].transform,"proName"):GetComponent("Text").text =Language[10453]
|
||||
Util.GetGameObject(proList[0].transform,"proValue"):GetComponent("Text").text = "1/"..pokemonSData.MaxLevel
|
||||
Util.GetGameObject(proList[0].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_jinengdian05")
|
||||
local index = 0
|
||||
for key, value in pairs(allAddProVal) do
|
||||
index = index + 1
|
||||
if proList[index] then
|
||||
Util.GetGameObject(proList[index].transform,"proName"):GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PropertyConfig,key).Info)
|
||||
Util.GetGameObject(proList[index].transform,"proValue"):GetComponent("Text").text = value
|
||||
Util.GetGameObject(proList[index].transform,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.PropertyConfig,key).PropertyIcon))
|
||||
end
|
||||
end
|
||||
local curSkillId = 0
|
||||
local skillArray = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,pokemonSid).SkillArray
|
||||
for i = 1, #skillArray do
|
||||
if skillArray[i][1] == 0 then
|
||||
curSkillId = skillArray[i][2]
|
||||
end
|
||||
end
|
||||
local curSkillConFig = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSkill,curSkillId)
|
||||
this.skillName.text = GetLanguageStrById(curSkillConFig.Name)
|
||||
this.skillLvGo:SetActive(false)
|
||||
-- this.skillLv.text = curSkillConFig.Level
|
||||
this.skillIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(curSkillConFig.Icon))
|
||||
Util.AddOnceClick(this.skillBtn, function()
|
||||
-- UIManager.OpenPanel(UIName.PokemonSkillInfoPopup,pokemonSid,1,0)
|
||||
UIManager.OpenPanel(UIName.PokemonAllSkillInfoPopup,pokemonSid,1,0)
|
||||
end)
|
||||
end
|
||||
|
||||
function this.ShowPokemonLive(_heroSConfigData)
|
||||
LogPink("_heroSConfigData.Live ".._heroSConfigData.Live)
|
||||
this.testLiveGO = poolManager:LoadLive(GetResourcePath(_heroSConfigData.Live), this.liveRoot.transform,
|
||||
Vector3.one * _heroSConfigData.Scale * 0.7, Vector3.New(_heroSConfigData.Position[1], _heroSConfigData.Position[2], 0))
|
||||
local SkeletonGraphic = this.testLiveGO:GetComponent("SkeletonGraphic")
|
||||
local idle = function() SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete + idle
|
||||
poolManager:SetLiveClearCall(GetResourcePath(_heroSConfigData.Live), this.testLiveGO, function ()
|
||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||
end)
|
||||
end
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:OnClose()
|
||||
|
||||
poolManager:UnLoadLive(this.testLiveGO.name, this.testLiveGO)
|
||||
this.testLiveGO = nil
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function GodWeaponGetInfoPopup:OnDestroy()
|
||||
this.spLoader:Destroy()
|
||||
|
||||
end
|
||||
|
||||
return GodWeaponGetInfoPopup
|
||||
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 219291a8f162d3540b059d7db7add697
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -48,20 +48,20 @@ function this:OnShow(_parent,_curUpZhenPokemonData,_upZhenIndex)
|
|||
polemonList = GodWeaponManager.GetCanUpZhenWeapons()
|
||||
end
|
||||
table.sort(polemonList, function(a,b)
|
||||
if a.config.Quality == b.config.Quality then
|
||||
if a.star == b.star then
|
||||
if a.lv == b.lv then
|
||||
return a.id < b.id
|
||||
if a.config.Quality == b.config.Quality then
|
||||
if a.star == b.star then
|
||||
if a.lv == b.lv then
|
||||
return a.id < b.id
|
||||
else
|
||||
return a.lv > b.lv
|
||||
end
|
||||
else
|
||||
return a.lv > b.lv
|
||||
return a.star > b.star
|
||||
end
|
||||
else
|
||||
return a.star > b.star
|
||||
return a.config.Quality > b.config.Quality
|
||||
end
|
||||
else
|
||||
return a.config.Quality > b.config.Quality
|
||||
end
|
||||
end)
|
||||
end)
|
||||
this.ScrollView:SetData(polemonList, function (index, go)
|
||||
this.SingleItemDataShow(go, polemonList[index])
|
||||
end)
|
||||
|
|
@ -127,6 +127,7 @@ function this.SingleItemDataShow(_go,_itemData)
|
|||
LogError("上阵成功")
|
||||
GodWeaponManager.SetWeaponUpZhen(_itemData.dynamicId,upZhenIndex)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Pokemon.PokemonUpZhenRefresh)
|
||||
this:OnShow(parent,nil,upZhenIndex)
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
|||
elseif state == 3 then
|
||||
addInfo:SetActive(true)
|
||||
PokemonGoListRedPoin[liveIndex]:SetActive(#canUpZhenPokemonList > 0)
|
||||
Util.AddOnceClick( Util.GetGameObject(go, "addInfo/addInfo/addClick1"), function()
|
||||
Util.AddOnceClick( Util.GetGameObject(go, "addInfo/addInfo/addClick"..liveIndex), function()
|
||||
UIManager.OpenPanel(UIName.GodWeaponListPanel,1,nil,liveIndex)
|
||||
end)
|
||||
elseif state == 4 then
|
||||
|
|
@ -329,7 +329,6 @@ function this.OnEndDrag(Pointgo,data)--结束拖动
|
|||
if _i==nil then
|
||||
_i=tonumber(string.sub(Pointgo.transform.name,-1))
|
||||
end
|
||||
LogError("namein==="..nameIn.." _i===".._i.." _j==".._j)
|
||||
if nameIn=="DragView".._i then --有人
|
||||
NetManager.RequestMagicSoldierExchange(PokemonDataList[_j].Did,PokemonDataList[_i].Did,function()
|
||||
|
||||
|
|
|
|||
|
|
@ -210,6 +210,35 @@ function this.GetSinglePokemonAddProData(_did,_star)--_star 传值的话就用
|
|||
return addEndAllProVal
|
||||
end
|
||||
|
||||
|
||||
function this.GetSinglePokemonAddProDataByLvAndStar(_did,_lv,_star)--_star 传值的话就用此星级计算属性
|
||||
LogError("did".._did.. " lv".._lv.." star".._star)
|
||||
local addAllProVal = {}
|
||||
local curPokemonConFig = ConfigManager.GetConfigData(ConfigName.ShenBing,_did)
|
||||
local curPokemonLvConFig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ShenBingLevel,"Quality",curPokemonConFig.Quality,"Level",_lv)
|
||||
local curPokemonStarConFig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ShenbingStar,"Quality",curPokemonConFig.Quality,"Star",_star)
|
||||
--基础
|
||||
addAllProVal[HeroProType.Hp] = curPokemonConFig.Hp
|
||||
addAllProVal[HeroProType.Attack] = curPokemonConFig.Attack
|
||||
addAllProVal[HeroProType.PhysicalDefence] = curPokemonConFig.PhysicalDefence
|
||||
addAllProVal[HeroProType.MagicDefence] = curPokemonConFig.MagicDefence
|
||||
--升级
|
||||
for i = 1, #curPokemonLvConFig.CharacterLevelPara do
|
||||
local curPro = curPokemonLvConFig.CharacterLevelPara[i]
|
||||
if curPro[2] > 0 then
|
||||
if addAllProVal[curPro[1]] then
|
||||
addAllProVal[curPro[1]]=addAllProVal[curPro[1]]+curPro[2]
|
||||
else
|
||||
addAllProVal[curPro[1]]=curPro[2]
|
||||
end
|
||||
end
|
||||
end
|
||||
--升星 属性=(基础属性+等级属性)*(1+星级倍率)
|
||||
local StarPara = curPokemonStarConFig.StarPara/10000
|
||||
local addEndAllProVal = {}
|
||||
for key, value in pairs(addAllProVal) do
|
||||
addEndAllProVal[key] = value * (1 + StarPara)
|
||||
end
|
||||
return addEndAllProVal
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -489,6 +489,7 @@ function this.FormationAdapter(teamInfo)
|
|||
local demonId = teamInfo.MagicSoldier[i].heroTid
|
||||
--this.Weapons[].gameObject:SetActive(true)
|
||||
if demonId then
|
||||
LogError("hero.position=="..teamInfo.MagicSoldier[i].position)
|
||||
local heroGo = Util.GetGameObject(this.Weapons[hero.position], "hero")
|
||||
heroGo:SetActive(true)
|
||||
SetHeroStars(this.spLoader, Util.GetGameObject(heroGo, "starGrid"), hero.star)
|
||||
|
|
@ -499,8 +500,8 @@ function this.FormationAdapter(teamInfo)
|
|||
local frameBtn = Util.GetGameObject(this.Weapons[i], "frame")
|
||||
local heroData = {}
|
||||
Util.AddOnceClick(frameBtn, function()
|
||||
--local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}
|
||||
--UIManager.OpenPanel(UIName.PokemonGetInfoPopup,true,pokemonData)
|
||||
local pokemonData={tempId=demonId,id=demonId,star=hero.star,level=hero.level}
|
||||
UIManager.OpenPanel(UIName.GodWeaponGetInfoPopup,true,pokemonData)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue