【灵兽系统】 修改bug
parent
7175dbaf64
commit
005f36c524
Binary file not shown.
|
After Width: | Height: | Size: 47 KiB |
|
|
@ -1,5 +1,5 @@
|
||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: df79350da07a37e48b9bb579ca8c8b4d
|
guid: f3d4dae5943a34a4489bb23e4a02e0d0
|
||||||
TextureImporter:
|
TextureImporter:
|
||||||
fileIDToRecycleName: {}
|
fileIDToRecycleName: {}
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
|
|
@ -75,7 +75,7 @@ TextureImporter:
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape: []
|
physicsShape: []
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: bfeafdb81d2778c44b3f9040f4035cd0
|
spriteID: 867dff8557e6f6347a9b856b83ac0911
|
||||||
vertices: []
|
vertices: []
|
||||||
indices:
|
indices:
|
||||||
edges: []
|
edges: []
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 69 KiB |
|
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: edd15733ed7b95948931d1bb37e1948b
|
||||||
|
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: 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: 4697d8cf332729f4a902d0f3b7970d4f
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: PokemonAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 72 KiB |
|
|
@ -0,0 +1,88 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b320bc5bd3ec8d644a3ccec718997ed0
|
||||||
|
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: 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: 18244a1ca8a0da74a99fe839f1e3701c
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
spritePackingTag: PokemonAtlas
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 175 KiB |
File diff suppressed because it is too large
Load Diff
|
|
@ -387,7 +387,7 @@ function this.InitArmData()
|
||||||
--英雄长按
|
--英雄长按
|
||||||
local heroClick=Util.GetGameObject(bgListGo[pos],"DragView"..pos)
|
local heroClick=Util.GetGameObject(bgListGo[pos],"DragView"..pos)
|
||||||
Util.AddLongPressClick(heroClick, function()
|
Util.AddLongPressClick(heroClick, function()
|
||||||
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData)
|
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,nil,nil,#this.choosedList)
|
||||||
end, 0.5)
|
end, 0.5)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,6 @@ function this.RefreshShow(_curPokemonData, _pokemonDatas)
|
||||||
end
|
end
|
||||||
curPokemonData, pokemonDatas = _curPokemonData, _pokemonDatas
|
curPokemonData, pokemonDatas = _curPokemonData, _pokemonDatas
|
||||||
this.OnShowData()
|
this.OnShowData()
|
||||||
this.OnShowRedPoint()
|
|
||||||
this.contents[curIndex].view:OnShow(this,curPokemonData)
|
this.contents[curIndex].view:OnShow(this,curPokemonData)
|
||||||
end
|
end
|
||||||
function PokemonInfoPanel:OnSortingOrderChange()
|
function PokemonInfoPanel:OnSortingOrderChange()
|
||||||
|
|
@ -244,7 +243,6 @@ function PokemonInfoPanel:OnShow()
|
||||||
redPointList[i] = Util.GetGameObject(curTabBtn, "Redpot")
|
redPointList[i] = Util.GetGameObject(curTabBtn, "Redpot")
|
||||||
end
|
end
|
||||||
this.OnShowData()
|
this.OnShowData()
|
||||||
this.OnShowRedPoint()
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- tab节点显示自定义
|
-- tab节点显示自定义
|
||||||
|
|
@ -317,6 +315,7 @@ function this.OnShowData()
|
||||||
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册
|
||||||
this.replaceBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
|
this.replaceBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
|
||||||
this.restBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
|
this.restBtn:SetActive(upZhenDidis[curPokemonData.dynamicId] ~= nil)
|
||||||
|
this.OnShowRedPoint()
|
||||||
end
|
end
|
||||||
|
|
||||||
--长按升级处理
|
--长按升级处理
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,9 @@ function this.SaveFormation()
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
||||||
go.transform.parent.gameObject:SetActive(true)
|
local goParent = go.transform.parent.gameObject
|
||||||
|
goParent:SetActive(true)
|
||||||
|
local bgQuan = Util.GetGameObject(goParent, "bg/Image (1)")
|
||||||
local upZhenInfo = Util.GetGameObject(go, "upZhenInfo")
|
local upZhenInfo = Util.GetGameObject(go, "upZhenInfo")
|
||||||
local addInfo = Util.GetGameObject(go, "addInfo")
|
local addInfo = Util.GetGameObject(go, "addInfo")
|
||||||
local lockInfo = Util.GetGameObject(go, "lockInfo")
|
local lockInfo = Util.GetGameObject(go, "lockInfo")
|
||||||
|
|
@ -159,7 +161,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
||||||
state = 2
|
state = 2
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
bgQuan:SetActive(true)
|
||||||
dragViewListGo[liveIndex].gameObject:SetActive(false)
|
dragViewListGo[liveIndex].gameObject:SetActive(false)
|
||||||
PokemonGoListRedPoin[liveIndex]:SetActive(false)
|
PokemonGoListRedPoin[liveIndex]:SetActive(false)
|
||||||
if state == 1 then
|
if state == 1 then
|
||||||
|
|
@ -178,6 +180,7 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex)
|
||||||
UIManager.OpenPanel(UIName.PokemonListPanel,Pokemon_Popup_Type.PokemonListPanel_UpWar,nil,liveIndex)
|
UIManager.OpenPanel(UIName.PokemonListPanel,Pokemon_Popup_Type.PokemonListPanel_UpWar,nil,liveIndex)
|
||||||
end)
|
end)
|
||||||
elseif state == 4 then
|
elseif state == 4 then
|
||||||
|
bgQuan:SetActive(false)
|
||||||
local curData = PokemonManager.GetSinglePokemonData( singleData.pokemonId)
|
local curData = PokemonManager.GetSinglePokemonData( singleData.pokemonId)
|
||||||
dragViewListGo[liveIndex].gameObject:SetActive(true)
|
dragViewListGo[liveIndex].gameObject:SetActive(true)
|
||||||
local upLvRed = PokemonManager.GetSinglePokemonUpLvRedPoint(curData)
|
local upLvRed = PokemonManager.GetSinglePokemonUpLvRedPoint(curData)
|
||||||
|
|
@ -349,13 +352,13 @@ end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
function PokemonMainPanel:OnClose()
|
function PokemonMainPanel:OnClose()
|
||||||
ClearRedPointObject(RedPointType.Pokemon_Recruit, this.btnInfoRed)
|
|
||||||
ClearRedPointObject(RedPointType.Pokemon_Fetter, this.btnFetterRed)
|
|
||||||
ClearRedPointObject(RedPointType.Pokemon_ChipCompound, this.btnPokemonListRed)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function PokemonMainPanel:OnDestroy()
|
function PokemonMainPanel:OnDestroy()
|
||||||
|
ClearRedPointObject(RedPointType.Pokemon_Recruit, this.btnInfoRed)
|
||||||
|
ClearRedPointObject(RedPointType.Pokemon_Fetter, this.btnFetterRed)
|
||||||
|
ClearRedPointObject(RedPointType.Pokemon_ChipCompound, this.btnPokemonListRed)
|
||||||
SubUIManager.Close(this.UpView)
|
SubUIManager.Close(this.UpView)
|
||||||
dragViewListGo={}
|
dragViewListGo={}
|
||||||
for key, value in pairs(live2dList) do
|
for key, value in pairs(live2dList) do
|
||||||
|
|
|
||||||
|
|
@ -468,13 +468,13 @@ function this.RefreshPokemonUpLvRedPoint()
|
||||||
if curPokemonData then
|
if curPokemonData then
|
||||||
local singlePokemonPoint = this.GetSinglePokemonUpLvRedPoint(curPokemonData)
|
local singlePokemonPoint = this.GetSinglePokemonUpLvRedPoint(curPokemonData)
|
||||||
if singlePokemonPoint then
|
if singlePokemonPoint then
|
||||||
-- LogPink("上阵灵兽升级红点true")
|
LogPink("上阵灵兽升级红点true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogPink("上阵灵兽升级红点false")
|
LogPink("上阵灵兽升级红点false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
--上阵灵兽升级红点2
|
--上阵灵兽升级红点2
|
||||||
|
|
@ -506,12 +506,12 @@ function this.RefreshPokemonUpStarRedPoint()
|
||||||
local curPokemonData = pokemons[pokemonFormation[i].pokemonId]
|
local curPokemonData = pokemons[pokemonFormation[i].pokemonId]
|
||||||
local singlePokemonPoint = this.GetSinglePokemonUpStarRedPoint(curPokemonData)
|
local singlePokemonPoint = this.GetSinglePokemonUpStarRedPoint(curPokemonData)
|
||||||
if singlePokemonPoint then
|
if singlePokemonPoint then
|
||||||
-- LogPink("上阵灵兽升星红点true")
|
LogPink("上阵灵兽升星红点true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogPink("上阵灵兽升星红点false")
|
LogPink("上阵灵兽升星红点false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
--上阵灵兽升星红点2
|
--上阵灵兽升星红点2
|
||||||
|
|
@ -555,7 +555,7 @@ function this.RefreshPokemonCanUpZhenRedPoint()
|
||||||
end
|
end
|
||||||
local canPokemonList = this.GetCanUpZhenPokemonDatas()
|
local canPokemonList = this.GetCanUpZhenPokemonDatas()
|
||||||
if #canPokemonList <= 0 then
|
if #canPokemonList <= 0 then
|
||||||
-- LogPink("可以上阵灵兽红点false")
|
LogPink("可以上阵灵兽红点false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local pokemonPosLocks = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSetting,1).BlockUnlockLevel
|
local pokemonPosLocks = ConfigManager.GetConfigData(ConfigName.SpiritAnimalSetting,1).BlockUnlockLevel
|
||||||
|
|
@ -570,11 +570,11 @@ function this.RefreshPokemonCanUpZhenRedPoint()
|
||||||
state = 2
|
state = 2
|
||||||
end
|
end
|
||||||
if state == 3 and #canPokemonList > 0 then
|
if state == 3 and #canPokemonList > 0 then
|
||||||
-- LogPink("可以上阵灵兽红点true")
|
LogPink("可以上阵灵兽红点true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogPink("可以上阵灵兽红点false")
|
LogPink("可以上阵灵兽红点false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -587,11 +587,11 @@ function this.RefreshPokemonFetterRedPoint()
|
||||||
local curGetAllPokemonFetter = this.GetAllPokemonFetterDatas()
|
local curGetAllPokemonFetter = this.GetAllPokemonFetterDatas()
|
||||||
for k,v in ipairs(curGetAllPokemonFetter) do
|
for k,v in ipairs(curGetAllPokemonFetter) do
|
||||||
if v.enabled == 0 then
|
if v.enabled == 0 then
|
||||||
-- LogPink("可激活的羁绊true")
|
LogPink("可激活的羁绊true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogPink("可激活的羁绊false")
|
LogPink("可激活的羁绊false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
function this.IsCompound(Teamers,curPokemonSidList)
|
function this.IsCompound(Teamers,curPokemonSidList)
|
||||||
|
|
@ -621,10 +621,10 @@ function this.RefreshPokemonRecruitRedPoint()
|
||||||
end
|
end
|
||||||
local isFree = freeTime and freeTime >= 1
|
local isFree = freeTime and freeTime >= 1
|
||||||
if isFree then
|
if isFree then
|
||||||
-- LogPink("免费抽卡次数true")
|
LogPink("免费抽卡次数true")
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
-- LogPink("免费抽卡次数false")
|
LogPink("免费抽卡次数false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -641,12 +641,12 @@ function this.PokemonChipCompoundRedPoint()
|
||||||
if #pokemonChipList > 0 then
|
if #pokemonChipList > 0 then
|
||||||
for i = 1, #pokemonChipList do
|
for i = 1, #pokemonChipList do
|
||||||
if BagManager.GetItemCountById(pokemonChipList[i].id) >= itemConfig[pokemonChipList[i].id].UsePerCount then
|
if BagManager.GetItemCountById(pokemonChipList[i].id) >= itemConfig[pokemonChipList[i].id].UsePerCount then
|
||||||
-- LogPink("碎片可以合成红点true")
|
LogPink("碎片可以合成红点true")
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogPink("碎片可以合成红点false")
|
LogPink("碎片可以合成红点false")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -150,6 +150,7 @@ function this.SingleItemDataShow(_go,_fetterData)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnClose()
|
function this:OnClose()
|
||||||
|
CheckRedPointStatus(RedPointType.Pokemon_Fetter)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this:OnDestroy()
|
function this:OnDestroy()
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,12 @@ function this.SingPokemonDataShow(_go,_itemData)
|
||||||
local starSize = Vector2.New(50,50)
|
local starSize = Vector2.New(50,50)
|
||||||
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
|
SetHeroStars(Util.GetGameObject(_go.transform, "star/starGrid"), _itemData.star,1,starSize, -5,Vector2.New(0.5,0.5))
|
||||||
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
|
Util.AddOnceClick(Util.GetGameObject(_go.transform,"click"), function()
|
||||||
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,{_itemData},true)
|
local upZhenDids = PokemonManager.GetAllPokemonFormationDids()
|
||||||
|
if upZhenDids[_itemData.dynamicId] then
|
||||||
|
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,PokemonManager.GetPokemonUpZhenDatas())
|
||||||
|
else
|
||||||
|
UIManager.OpenPanel(UIName.PokemonInfoPanel,_itemData,{_itemData},true)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
function this.SingPokemonChipDataShow(_go,_itemData)
|
function this.SingPokemonChipDataShow(_go,_itemData)
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@ local pinjieImage={"r_hero_pinjiebiao_01","r_hero_pinjiebiao_02"} --该死的品
|
||||||
|
|
||||||
local orginLayer2 = 0
|
local orginLayer2 = 0
|
||||||
local orginLayer = 0
|
local orginLayer = 0
|
||||||
|
local formationHeroNum = nil
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function RoleInfoPopup:InitComponent()
|
function RoleInfoPopup:InitComponent()
|
||||||
|
|
||||||
|
|
@ -151,6 +152,7 @@ function RoleInfoPopup:OnOpen(...)
|
||||||
curHeroData = arg[1]
|
curHeroData = arg[1]
|
||||||
this.isOther = arg[2]
|
this.isOther = arg[2]
|
||||||
choosedList = arg[3] or nil
|
choosedList = arg[3] or nil
|
||||||
|
formationHeroNum = arg[4] or nil
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
|
|
@ -267,9 +269,9 @@ function this.RoleInfo1()
|
||||||
if choosedList then
|
if choosedList then
|
||||||
--local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
--local formationList = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId)
|
local allHeroTeamAddProVal = HeroManager.GetAllHeroTeamAddProVal(choosedList,curHeroData.dynamicId)
|
||||||
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal)
|
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,true,allHeroTeamAddProVal,formationHeroNum)
|
||||||
else
|
else
|
||||||
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false)
|
allAddProVal = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false,nil,nil,false,{},formationHeroNum)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.atk.text = allAddProVal[HeroProType.Attack]
|
this.atk.text = allAddProVal[HeroProType.Attack]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue