diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index 1ff8da942f..073c8754dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -281,8 +281,8 @@ function SkillCaster:CheckFullSceenSkill(combat, skill) local tv = self.owner.RootPanel.GetRoleView(target) if tv then local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero - - local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil + + local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder) go2.transform:SetParent(tv.GameObject.transform.parent) -- 检测特效旋转 @@ -324,8 +324,8 @@ function SkillCaster:CheckFullSceenSkill(combat, skill) local tv = self.owner.RootPanel.GetRoleView(target) if tv then local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero - - local sortingOrder = tv.role.camp == 0 and tv.GameObject:GetComponent("Canvas").sortingOrder + 21 or nil + + local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder) go2.transform:SetParent(tv.GameObject.transform.parent) -- 检测特效旋转 @@ -356,8 +356,8 @@ function SkillCaster:CheckFullSceenSkill(combat, skill) local tv = self.owner.RootPanel.GetRoleView(target) if tv then local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero - - local sortingOrder = BattleManager.GetBattleSorting() + 40 + + local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder) go2.transform:SetParent(self.owner.GameObject.transform.parent) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua index 67018073cf..5aaf272783 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua @@ -191,6 +191,9 @@ function this.SetScroll(i) break end end + if CarbonManager.IsDailyCarbonPass(curData[#curData].Id) then + curMaxOpenId = #curData + end this.scrollView:SetIndex(curMaxOpenId - 2 < 1 and 1 or (curMaxOpenId - 2)) end diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 8eed4e8ecd..4208cd1ab9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -517,6 +517,7 @@ function ExpeditionMainPanel:SingleLayNodeShow(go,layNodeListData) end --刷新倒计时显示 function ExpeditionMainPanel:RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown) + timeDown = timeDown - (ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.EXPEDITION).SeasonInterval*60) if timeDown > 0 then _timeTextExpertgo:SetActive(true) _timeTextExpert.text = Language[10028]..self:TimeStampToDateString(timeDown) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 665fad442f..c16b34a30d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -188,6 +188,7 @@ function this.RefreshUpdateIndication(buffer) CheckRedPointStatus(RedPointType.Guild_AidMy) LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) + CheckRedPointStatus(RedPointType.Arena_Free) --三个抽奖勾选重置 PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index 97b3dfb801..84bc0c7dec 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -145,6 +145,7 @@ function this:BindEvent() this.isStartImage.sprite=Util.LoadSprite("x_xiaoyaoyou_tingzhi") isAutoRun=true end + this.btnBack:GetComponent("Button").enabled = false XiaoYaoManager.StartXiaoYao() end) --开始游历 @@ -270,6 +271,7 @@ function this.MoveTT(targetIndex,_data) if isAutoRun then if costNum>BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) then PopupTipPanel.ShowTip("云游值不足,休息一会吧!") + this.btnBack:GetComponent("Button").enabled = true this.youliTag:SetActive(false) this.isStart:SetActive(false) this.startBtn:SetActive(true) @@ -288,6 +290,7 @@ function this.MoveTT(targetIndex,_data) this.youliTag:SetActive(false) this.isStart:SetActive(false) this.startBtn:SetActive(true) + this.btnBack:GetComponent("Button").enabled = true end else this.MoveTT(targetIndex,_data)