Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
commit
15266c957a
|
@ -15,12 +15,12 @@ function BattleFailPopup:InitComponent()
|
||||||
orginLayer = 0
|
orginLayer = 0
|
||||||
this.btnClose = Util.GetGameObject(self.gameObject, "Lose")
|
this.btnClose = Util.GetGameObject(self.gameObject, "Lose")
|
||||||
this.failImg = Util.GetGameObject(self.gameObject, "Lose/image/ziti"):GetComponent("Image")
|
this.failImg = Util.GetGameObject(self.gameObject, "Lose/image/ziti"):GetComponent("Image")
|
||||||
this.failImg.sprite = this.spLoader:LoadSprite("UI_hz_zhonghe05_21")
|
this.failImg.sprite = this.spLoader:LoadSprite("UI_effect_JJC_JieSuan_ShiBai_png_zh")
|
||||||
this.btn_record=Util.GetGameObject(this.btnClose, "layout/record")
|
this.btn_record=Util.GetGameObject(this.btnClose, "layout/record")
|
||||||
this.btnBattleBack = Util.GetGameObject(this.btnClose, "btnBattleBack")
|
this.btnBattleBack = Util.GetGameObject(this.btnClose, "btnBattleBack")
|
||||||
-- this.btnBattleBack:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh")
|
-- this.btnBattleBack:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_silingshilian_huifanganniu_zh")
|
||||||
this.btnGrowUp = Util.GetGameObject(this.btnClose, "btnGrowUp")
|
this.btnGrowUp = Util.GetGameObject(this.btnClose, "btnGrowUp")
|
||||||
this.btnGrowUp:SetActive(true)
|
this.btnGrowUp:SetActive(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
@ -124,7 +124,6 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType)
|
||||||
this.btn_record:SetActive(false)
|
this.btn_record:SetActive(false)
|
||||||
else
|
else
|
||||||
this.btnBattleBack:SetActive(true)
|
this.btnBattleBack:SetActive(true)
|
||||||
--屏蔽我要变强界面
|
|
||||||
this.btnGrowUp:SetActive(true)
|
this.btnGrowUp:SetActive(true)
|
||||||
end
|
end
|
||||||
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟
|
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY then--车迟
|
||||||
|
@ -180,7 +179,7 @@ end
|
||||||
|
|
||||||
-- 罗浮争锋结算界面特殊显示
|
-- 罗浮争锋结算界面特殊显示
|
||||||
function this.ShowBattleResultByJumpServerHightLadder()
|
function this.ShowBattleResultByJumpServerHightLadder()
|
||||||
PopupTipPanel.ShowTip("挑战失败,罗浮争锋排行无变化!")
|
PopupTipPanel.ShowTip("挑战失败,鸟笼竞技场排行无变化!")
|
||||||
if not isBackBattle and JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then
|
if not isBackBattle and JumpServerManager.curBattleDrop.itemlist ~= nil and #JumpServerManager.curBattleDrop.itemlist > 0 then
|
||||||
local content = {}
|
local content = {}
|
||||||
for i = 1, #JumpServerManager.curBattleDrop.itemlist do
|
for i = 1, #JumpServerManager.curBattleDrop.itemlist do
|
||||||
|
|
|
@ -490,7 +490,7 @@ function this.JumpServerHithtLadder()
|
||||||
local MyRank = JumpServerManager.GetHightLadderDataMyRank()
|
local MyRank = JumpServerManager.GetHightLadderDataMyRank()
|
||||||
local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank()
|
local OldMyRank = JumpServerManager.GetHightLadderDataOldMyRank()
|
||||||
if MyRank ~= OldMyRank then
|
if MyRank ~= OldMyRank then
|
||||||
PopupTipPanel.ShowTip("挑战成功,罗浮争锋排行已提升至".. MyRank .."名!" )
|
PopupTipPanel.ShowTip("挑战成功,鸟笼竞技场排行已提升至".. MyRank .."名!" )
|
||||||
elseif MyRank == OldMyRank then
|
elseif MyRank == OldMyRank then
|
||||||
PopupTipPanel.ShowTip("挑战成功")
|
PopupTipPanel.ShowTip("挑战成功")
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue