【缥缈之旅】提交4

dev_chengFeng
zhangqiang 2021-07-03 17:46:44 +08:00
parent c082a3c3d6
commit 6d5d480543
3 changed files with 43 additions and 8 deletions

View File

@ -5187,9 +5187,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 79.74001, y: 62.900047}
m_AnchoredPosition: {x: 118.7, y: 103.1}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
m_Pivot: {x: 1.1134684, y: 1.1801116}
--- !u!222 &603848451
CanvasRenderer:
m_ObjectHideFlags: 0

View File

@ -1290,7 +1290,7 @@ end
function this.SingleJourneyWithWindRewardNoGet(curRewardTaskData)
if curRewardTaskData then
local dayNumConFig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,curRewardTaskData.missionId)
LogYellow(curRewardTaskData.missionId .. " curRewardTaskData.state "..curRewardTaskData.state.." curRewardTaskData.progress "..curRewardTaskData.progress.." JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] "..JourneyWithWindDayAmount[dayNumConFig.Values[1][2]])
-- LogYellow(curRewardTaskData.missionId .. " curRewardTaskData.state "..curRewardTaskData.state.." curRewardTaskData.progress "..curRewardTaskData.progress.." JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] "..JourneyWithWindDayAmount[dayNumConFig.Values[1][2]])
if curRewardTaskData.state == 0 and dayNumConFig and curRewardTaskData.progress >= JourneyWithWindDayAmount[dayNumConFig.Values[1][2]] then
return true
end
@ -1339,19 +1339,20 @@ function this.GetJourneyWithWindPlayerPrefs(dayNum)
if dayNum then
return PlayerPrefs.GetString(PlayerManager.uid..PlayerManager.serverInfo.server_id.."JourneyWithWind"..dayNum, 0)
end
return false
return 1
end
function this.JourneyWithWindCurDayNoOpen()
local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - PlayerManager.userCreateTime)/86400)
local curJourneyWithWindAllDayConFigData = this.GetJourneyWithWindAllDayConFigData()
for i = 1, #curJourneyWithWindAllDayConFigData do
if curJourneyWithWindAllDayConFigData[i].Values[1][2] <= curDay then
if curDay >= curJourneyWithWindAllDayConFigData[i].Values[1][2] then
local curRedPointState = this.GetJourneyWithWindPlayerPrefs(curJourneyWithWindAllDayConFigData[i].Values[1][2])
if curRedPointState then
if curRedPointState == 0 then
return true
end
end
end
return false
end
return this

View File

@ -127,7 +127,7 @@ function this.SingleDayBtnDataShow(_go,data,index)
end
end
if not redState then
-- redState = ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2])
redState = ActivityGiftManager.GetJourneyWithWindPlayerPrefs(data.Values[1][2]) == 0
end
redPoint:SetActive(redState)
@ -136,6 +136,10 @@ function this.SingleDayBtnDataShow(_go,data,index)
else
go.transform.anchoredPosition = Vector3.New(3.05,176.09,0)
end
if data.Values[1][2] == curDayIndex then
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
this.selected.transform.anchoredPosition = Vector3.New(4.3,9.4,0)
end
Util.AddOnceClick(go, function()
this.ShowDayData(data.Values[1][2])
this.selected.transform:SetParent(Util.GetGameObject(go, "selectedParent").transform)
@ -204,7 +208,36 @@ function this.ShowDayData(_curDayIndex)
buyInfo.text = string.format("%s/%s",progress,curDayAllTaskConFigData[i].TaskValue[2][1])
end
Util.AddOnceClick(btnJump, function()
JumpManager.GoJump(curDayAllTaskConFigData[i].Jump[1])
if curDayAllTaskConFigData[i].SystemId == FUNCTION_OPEN_TYPE.EXPEDITION then
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then
if #ExpeditionManager.nodeInfo <= 0 then
if ExpeditionManager.expeditionLeve == -1 then
NetManager.GetExpeditionRequest(2,function()
JumpManager.GoJump(curDayAllTaskConFigData[i].Jump[1])
end)
else
NetManager.GetExpeditionRequest(
ExpeditionManager.expeditionLeve,function()
JumpManager.GoJump(curDayAllTaskConFigData[i].Jump[1])
end)
end
else
JumpManager.GoJump(curDayAllTaskConFigData[i].Jump[1])
end
NetManager.TreasureOfHeavenScoreRequest()
PlayerPrefs.SetInt(PlayerManager.uid.."ExpeditionRed",ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.EXPEDITION).endTime)
CheckRedPointStatus(RedPointType.OrdinaryExplore)
else
if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.EXPEDITION) then
PopupTipPanel.ShowTip(Language[12183])
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
end
end
else
JumpManager.GoJump(curDayAllTaskConFigData[i].Jump[1])
end
end)
end
else
@ -285,6 +318,7 @@ function this.ShowDayDataActivityReward()
Util.SetGray(getBtn,true)
redPoint:SetActive(false)
CheckRedPointStatus(RedPointType.JourneyWithWind)
this.ShowDayBtnsData()
end)
end)
else