Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-06-10 20:17:03 +08:00
commit 83553d8aef
3 changed files with 12 additions and 3 deletions

View File

@ -50,6 +50,8 @@ end
function this.Close() function this.Close()
this.root:SetActive(false) this.root:SetActive(false)
SoundManager.PlaySound(SoundConfig.BGM_CarbonMap)
end end
function this.Destroy() function this.Destroy()

View File

@ -110,7 +110,7 @@ end
--设置速度 --设置速度
local index = 1 local index = 1
function this.tableTurnEffect() function this.tableTurnEffect(index)
local red = Util.GetGameObject(this.itemsList[index],"Red") local red = Util.GetGameObject(this.itemsList[index],"Red")
red:SetActive(false) red:SetActive(false)
if index == 12 then--t归零 if index == 12 then--t归零
@ -121,7 +121,9 @@ function this.tableTurnEffect()
index = index + 1 index = index + 1
--检测最后的奖励 --检测最后的奖励
local cfg = this.TrialGameConfig[this.list[index]] local cfg = this.TrialGameConfig[this.list[index]]
SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan) if not index then
SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan)
end
if stopId and stopId == cfg.Id then if stopId and stopId == cfg.Id then
--游戏结束显示掉落 --游戏结束显示掉落
Timer.New(function() Timer.New(function()

View File

@ -89,6 +89,7 @@ function RoleEquipChangePopup:BindEvent()
openThisPanel.UpdateEquipPosHeroData(1,type,equipDataList,0,position) openThisPanel.UpdateEquipPosHeroData(1,type,equipDataList,0,position)
end) end)
else else
NetManager.EquipUnLoadOptRequest(curHeroData.dynamicId,equipIdList ,1, function () NetManager.EquipUnLoadOptRequest(curHeroData.dynamicId,equipIdList ,1, function ()
self:ClosePanel() self:ClosePanel()
openThisPanel.UpdateEquipPosHeroData(1,type,equipDataList) openThisPanel.UpdateEquipPosHeroData(1,type,equipDataList)
@ -151,8 +152,12 @@ function RoleEquipChangePopup:OnShow()
this.equipPanel[2].bg:SetActive(false) this.equipPanel[2].bg:SetActive(false)
this.equipPanel[1].bg:SetActive(true) this.equipPanel[1].bg:SetActive(true)
this.equipPanel[1].curEquipText:SetActive(false) this.equipPanel[1].curEquipText:SetActive(false)
this.equipPanel[1].curEquipBtnDown:SetActive(true)
this.equipPanel[1].curEquipBtnDownText.text = Language[12221] this.equipPanel[1].curEquipBtnDownText.text = Language[12221]
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
this.equipPanel[1].curEquipBtnDown:SetActive(false)
else
this.equipPanel[1].curEquipBtnDown:SetActive(true)
end
this.ShowCurEquipData(1) this.ShowCurEquipData(1)
elseif type==3 then elseif type==3 then
this.equipPanel[2].bg:SetActive(true) this.equipPanel[2].bg:SetActive(true)