命石飘战力提交
parent
55f0c6d3e6
commit
ffaab0f625
|
@ -983,6 +983,7 @@ function this.GetTableByBackDropData(drop)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if drop.gemNew ~= nil and #drop.gemNew > 0 then
|
if drop.gemNew ~= nil and #drop.gemNew > 0 then
|
||||||
|
local isChange=false
|
||||||
for i = 1, #drop.gemNew do
|
for i = 1, #drop.gemNew do
|
||||||
local itemdata = {}
|
local itemdata = {}
|
||||||
itemdata.sId = drop.gemNew[i].id
|
itemdata.sId = drop.gemNew[i].id
|
||||||
|
@ -1000,6 +1001,7 @@ function this.GetTableByBackDropData(drop)
|
||||||
itemdata.num = 1
|
itemdata.num = 1
|
||||||
if drop.gemNew[i].isReplace==1 then
|
if drop.gemNew[i].isReplace==1 then
|
||||||
itemdata.isReplace=true
|
itemdata.isReplace=true
|
||||||
|
isChange=true
|
||||||
else
|
else
|
||||||
itemdata.isReplace=false
|
itemdata.isReplace=false
|
||||||
end
|
end
|
||||||
|
@ -1012,6 +1014,18 @@ function this.GetTableByBackDropData(drop)
|
||||||
end
|
end
|
||||||
itemdata.pro=pros
|
itemdata.pro=pros
|
||||||
table.insert(itemDataList, itemdata)
|
table.insert(itemDataList, itemdata)
|
||||||
|
if isChange then
|
||||||
|
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gem)
|
||||||
|
--获取新战力
|
||||||
|
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
-- LogError("oldwar====".. .." temppower=="..tempPower)
|
||||||
|
if GemNewManager.oldPower ~= tempPower then
|
||||||
|
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = GemNewManager.oldPower,newValue = tempPower})
|
||||||
|
GemNewManager.oldPower=tempPower
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
--PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
|
--PokemonManager.UpdatePokemonDatas(itemdata.backData,true)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,6 +9,7 @@ function this.Initialize()
|
||||||
this.sperGemList ={} --高级命石
|
this.sperGemList ={} --高级命石
|
||||||
this.typeGemList = {}
|
this.typeGemList = {}
|
||||||
this.timer=nil
|
this.timer=nil
|
||||||
|
this.oldPower=0
|
||||||
end
|
end
|
||||||
|
|
||||||
--初始化命石
|
--初始化命石
|
||||||
|
@ -62,14 +63,14 @@ function this.InitGemsInfo(msg)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gem)
|
-- HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gem)
|
||||||
--获取新战力
|
-- --获取新战力
|
||||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
-- NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
-- local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
LogError("oldwar===="..oldWarPower.." temppower=="..tempPower)
|
-- LogError("oldwar===="..oldWarPower.." temppower=="..tempPower)
|
||||||
if oldWarPower ~= tempPower then
|
-- if oldWarPower ~= tempPower then
|
||||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
-- UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||||
end
|
-- end
|
||||||
if this.timer~=nil then
|
if this.timer~=nil then
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer=nil
|
this.timer=nil
|
||||||
|
|
|
@ -30,6 +30,7 @@ local curType=0
|
||||||
local activityId=0
|
local activityId=0
|
||||||
local progresss=0
|
local progresss=0
|
||||||
local wishLv=0
|
local wishLv=0
|
||||||
|
local oldWarPower=0
|
||||||
function Gem:InitComponent()
|
function Gem:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
if not self.playerInfoView then
|
if not self.playerInfoView then
|
||||||
|
@ -316,6 +317,16 @@ function Gem:UpdatePanelData(_type)
|
||||||
--end
|
--end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Gem)
|
||||||
|
-- --获取新战力
|
||||||
|
-- NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
-- local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
-- LogError("oldwar===="..oldWarPower.." temppower=="..tempPower)
|
||||||
|
-- if oldWarPower ~= tempPower then
|
||||||
|
-- oldWarPower=tempPower
|
||||||
|
-- UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||||
|
-- end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -335,7 +346,6 @@ end
|
||||||
function Gem:OnOpen()
|
function Gem:OnOpen()
|
||||||
self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Gem })
|
self.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Gem })
|
||||||
self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice })
|
self.BtView:OnOpen(self,{ sortOrder = self.sortingOrder, panelType = PanelTypeView.Practice })
|
||||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
|
||||||
self.TabCtrl:Init(self.tab, _TabData,2)
|
self.TabCtrl:Init(self.tab, _TabData,2)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -350,6 +360,9 @@ function Gem:OnSortingOrderChange()
|
||||||
end
|
end
|
||||||
|
|
||||||
function Gem:OnShow()
|
function Gem:OnShow()
|
||||||
|
oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
GemNewManager.oldPower=oldWarPower
|
||||||
|
LogError("oldWarPower====================="..oldWarPower)
|
||||||
self.playerInfoView:OnShow()
|
self.playerInfoView:OnShow()
|
||||||
Util.SetParticleSortLayer(self.fx_ui_xiuxingshengxin_cangzhu, self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.fx_ui_xiuxingshengxin_cangzhu, self.sortingOrder + 1)
|
||||||
--self:Refresh()
|
--self:Refresh()
|
||||||
|
|
Loading…
Reference in New Issue