Merge remote-tracking branch 'origin/master_xma_local' into master_develop

gaoxin 2020-11-19 15:44:53 +08:00
commit 1a88c57864
5 changed files with 14 additions and 6 deletions

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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)