Merge remote-tracking branch 'origin/master_xma_local' into master_develop
commit
1a88c57864
|
|
@ -282,7 +282,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
||||||
if tv then
|
if tv then
|
||||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
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)
|
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||||
go2.transform:SetParent(tv.GameObject.transform.parent)
|
go2.transform:SetParent(tv.GameObject.transform.parent)
|
||||||
-- 检测特效旋转
|
-- 检测特效旋转
|
||||||
|
|
@ -325,7 +325,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
||||||
if tv then
|
if tv then
|
||||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
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)
|
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||||
go2.transform:SetParent(tv.GameObject.transform.parent)
|
go2.transform:SetParent(tv.GameObject.transform.parent)
|
||||||
-- 检测特效旋转
|
-- 检测特效旋转
|
||||||
|
|
@ -357,7 +357,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill)
|
||||||
if tv then
|
if tv then
|
||||||
local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero
|
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)
|
local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder)
|
||||||
go2.transform:SetParent(self.owner.GameObject.transform.parent)
|
go2.transform:SetParent(self.owner.GameObject.transform.parent)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,9 @@ function this.SetScroll(i)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if CarbonManager.IsDailyCarbonPass(curData[#curData].Id) then
|
||||||
|
curMaxOpenId = #curData
|
||||||
|
end
|
||||||
this.scrollView:SetIndex(curMaxOpenId - 2 < 1 and 1 or (curMaxOpenId - 2))
|
this.scrollView:SetIndex(curMaxOpenId - 2 < 1 and 1 or (curMaxOpenId - 2))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -517,6 +517,7 @@ function ExpeditionMainPanel:SingleLayNodeShow(go,layNodeListData)
|
||||||
end
|
end
|
||||||
--刷新倒计时显示
|
--刷新倒计时显示
|
||||||
function ExpeditionMainPanel:RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
|
function ExpeditionMainPanel:RemainTimeDown(_timeTextExpertgo,_timeTextExpert,timeDown)
|
||||||
|
timeDown = timeDown - (ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.EXPEDITION).SeasonInterval*60)
|
||||||
if timeDown > 0 then
|
if timeDown > 0 then
|
||||||
_timeTextExpertgo:SetActive(true)
|
_timeTextExpertgo:SetActive(true)
|
||||||
_timeTextExpert.text = Language[10028]..self:TimeStampToDateString(timeDown)
|
_timeTextExpert.text = Language[10028]..self:TimeStampToDateString(timeDown)
|
||||||
|
|
|
||||||
|
|
@ -188,6 +188,7 @@ function this.RefreshUpdateIndication(buffer)
|
||||||
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
CheckRedPointStatus(RedPointType.Guild_AidMy)
|
||||||
|
|
||||||
LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime)
|
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.Ten,0)
|
||||||
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
|
PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0)
|
||||||
|
|
|
||||||
|
|
@ -145,6 +145,7 @@ function this:BindEvent()
|
||||||
this.isStartImage.sprite=Util.LoadSprite("x_xiaoyaoyou_tingzhi")
|
this.isStartImage.sprite=Util.LoadSprite("x_xiaoyaoyou_tingzhi")
|
||||||
isAutoRun=true
|
isAutoRun=true
|
||||||
end
|
end
|
||||||
|
this.btnBack:GetComponent("Button").enabled = false
|
||||||
XiaoYaoManager.StartXiaoYao()
|
XiaoYaoManager.StartXiaoYao()
|
||||||
end)
|
end)
|
||||||
--开始游历
|
--开始游历
|
||||||
|
|
@ -270,6 +271,7 @@ function this.MoveTT(targetIndex,_data)
|
||||||
if isAutoRun then
|
if isAutoRun then
|
||||||
if costNum>BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) then
|
if costNum>BagManager.GetItemCountById(UpViewRechargeType.YunYouVle) then
|
||||||
PopupTipPanel.ShowTip("云游值不足,休息一会吧!")
|
PopupTipPanel.ShowTip("云游值不足,休息一会吧!")
|
||||||
|
this.btnBack:GetComponent("Button").enabled = true
|
||||||
this.youliTag:SetActive(false)
|
this.youliTag:SetActive(false)
|
||||||
this.isStart:SetActive(false)
|
this.isStart:SetActive(false)
|
||||||
this.startBtn:SetActive(true)
|
this.startBtn:SetActive(true)
|
||||||
|
|
@ -288,6 +290,7 @@ function this.MoveTT(targetIndex,_data)
|
||||||
this.youliTag:SetActive(false)
|
this.youliTag:SetActive(false)
|
||||||
this.isStart:SetActive(false)
|
this.isStart:SetActive(false)
|
||||||
this.startBtn:SetActive(true)
|
this.startBtn:SetActive(true)
|
||||||
|
this.btnBack:GetComponent("Button").enabled = true
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
this.MoveTT(targetIndex,_data)
|
this.MoveTT(targetIndex,_data)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue