diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua index 97156a6d8e..3265d65c94 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoManager.lua @@ -101,7 +101,10 @@ function this.StartXiaoYao() elseif msg.pathType == 4 then this.InitHeroData(msg.goodsInfo,2) elseif msg.pathType == 0 then - end + end + --this.InitMonsterData(msg.monster,2) + -- this.InitLuckyTurnTables(msg) + --this.InitHeroData(msg.goodsInfo,2) Game.GlobalEvent:DispatchEvent(GameEvent.XiaoYao.StartXiaoYao, msg) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index c5c1141ff6..3cbea1a080 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -253,6 +253,7 @@ function this.MoveTT(targetIndex,_data) this._PlayTimeStamp = curTimeStamp SoundManager.PlaySound(SoundConfig.UI_Xyy_jiaobu) SoundManager.PlaySound(SoundConfig.UI_Xyy_jinbi) + Util.GetGameObject(this.gridParent.transform:GetChild(curGridIndex-1).gameObject,"eventPoint"):SetActive(false) end end):OnComplete(function () this.mapProcess.text=string.format(Language[12008],(curGridIndex/#allGridData*100)) @@ -376,10 +377,16 @@ function this.SetEventBtn(_data) isShow=true if allGridData[i].eventData.Style==24 then targetBtn=this.rouleBtn + PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(2)),1) + --XiaoYaoManager.CheckRedPoint2() elseif allGridData[i].eventData.Style==25 then targetBtn=this.bossBtn + PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(3)),1) + --XiaoYaoManager.CheckRedPoint2() elseif allGridData[i].eventData.Style==26 then targetBtn=this.shopBtn + PlayerPrefs.SetInt(string.format("%s#%s#%s",PlayerManager.uid,tostring(XiaoYaoManager.curMapId),tostring(1)),1) + --XiaoYaoManager.CheckRedPoint2() end end end @@ -401,8 +408,9 @@ function this.PlayEffect() if this.moneyEffect then this.moneyEffect:SetActive(false) end + this.RefreshEventBtn() end) - this.RefreshEventBtn() + SoundManager.PlaySound(SoundConfig.Sound_FightArea_Gold) end --界面打开时调用(用于子类重写) @@ -430,6 +438,7 @@ function this:OnOpen(_mapData) newObjToParent(this.grid, this.gridParent.transform) end local gridCount=this.gridParent.transform.childCount + curGridIndex=mapData.location for i = 1, gridCount do local obj=this.gridParent.transform:GetChild(i-1) allEffect[i] = Util.GetGameObject(obj.gameObject,"UI_Effect_XiaoYaoYao-ShiJianDian") @@ -449,6 +458,9 @@ function this:OnOpen(_mapData) Util.GetGameObject(eventObj,"icon"):GetComponent("Image").sprite=this.spLoader:LoadSprite(allGridData[i].eventData.EventPointBg) Util.GetGameObject(eventObj,"name"):GetComponent("Text").text= SubString2(GetLanguageStrById(allGridData[i].eventData.Desc),7) end + if curGridIndex>i then + eventObj:SetActive(false) + end else eventObj:SetActive(false) end @@ -456,7 +468,7 @@ function this:OnOpen(_mapData) obj.gameObject:SetActive(false) end end - curGridIndex=mapData.location + this.LoadTT() Log("当前位置索引:"..curGridIndex) this.TT.transform:DOAnchorPos(Vector3(allGridData[curGridIndex].x,allGridData[curGridIndex].y,0),0)