Merge branch 'master' of http://192.168.1.21:3000/root/sk-client
commit
42af7901dc
|
|
@ -55,7 +55,7 @@ function GuildSkillUpLvPopup:InitComponent()
|
|||
effectList[i].transform.localScale = Vector3.one
|
||||
effectList[i].transform.localPosition = Vector3.zero
|
||||
effectList[i]:SetActive(true)
|
||||
Util.GetGameObject(effectList[i], "partical_click2"):GetComponent("ParticleSystem"):Stop()
|
||||
--Util.GetGameObject(effectList[i], "partical_click2"):GetComponent("ParticleSystem"):Stop()
|
||||
end
|
||||
this.materialGrid = Util.GetGameObject(self.gameObject,"bg/materialGrid")
|
||||
for i = 1, 2 do
|
||||
|
|
@ -78,10 +78,12 @@ function GuildSkillUpLvPopup:BindEvent()
|
|||
return
|
||||
end
|
||||
local oldPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
Util.GetGameObject(effectList[curSeletSkill.id], "partical_click2"):SetActive(false)
|
||||
NetManager.SinGleGuildSkillUpLv(curIndex,function(msg)
|
||||
CheckRedPointStatus(RedPointType.Guild_Skill)
|
||||
PopupTipPanel.ShowTipByLanguageId(11086)
|
||||
Util.GetGameObject(effectList[curSeletSkill.id], "partical_click2"):GetComponent("ParticleSystem"):Play()
|
||||
--Util.GetGameObject(effectList[curSeletSkill.id], "partical_click2"):GetComponent("ParticleSystem"):Play()
|
||||
Util.GetGameObject(effectList[curSeletSkill.id], "partical_click2"):SetActive(true)
|
||||
GuildSkillManager.SetSkillDataLv(curIndex,curSeletSkill.id,curSeletSkill.level + 1)
|
||||
this.OnClickTabBtn(curIndex)
|
||||
this.RefreshTabRedPoint()
|
||||
|
|
@ -139,9 +141,9 @@ function GuildSkillUpLvPopup:OnShow()
|
|||
this.TabCtrl:Init(this.tabBox, _TabData, curIndex)
|
||||
-- oldWarPowerValue = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
|
||||
for i = 1, #effectList do
|
||||
Util.GetGameObject(effectList[i], "partical_click2"):GetComponent("ParticleSystem"):Stop()
|
||||
end
|
||||
--for i = 1, #effectList do
|
||||
--Util.GetGameObject(effectList[i], "partical_click2"):GetComponent("ParticleSystem"):Stop()
|
||||
--end
|
||||
end
|
||||
|
||||
function GuildSkillUpLvPopup:OnSortingOrderChange()
|
||||
|
|
|
|||
Loading…
Reference in New Issue