root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【限时活动】调整

dev_chengFeng
ZhangBiao 2021-04-27 17:05:53 +08:00
parent 5937fc3493
commit 39f2f06563
7 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab
View File

@ -38851,7 +38851,7 @@ MonoBehaviour:
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 0

2
Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua
View File

@ -116,7 +116,7 @@ function CommonActPage:ShowSingleData(item,sdata,index)
return
end
item.gameObject:SetActive(true)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig)
end
function CommonActPage:RefreshTime()

6
Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
View File

@ -133,6 +133,9 @@ function this.GetExpertData(indexType,actType)
curData.rewards[i].otherData.state = 0
end
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values)
if curData.rewards[i].progress > curData.rewards[i].otherData.Values then
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values)
end
elseif indexType == 2 then
-- LogPink("curData.value:"..tostring(curData.value).." "..tostring(curData.rewards[i].otherData.Values))
if curData.value < curData.rewards[i].otherData.Values then
@ -141,6 +144,9 @@ function this.GetExpertData(indexType,actType)
curData.rewards[i].otherData.state = 0
end
curData.rewards[i].otherData.info = string.format("%s/%s",curData.value,curData.rewards[i].otherData.Values)
if curData.value > curData.rewards[i].otherData.Values then
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values)
end
end
end
end

2
Assets/ManagedResources/~Lua/Modules/NewActivity/ConRechargePage.lua
View File

@ -131,7 +131,7 @@ function ConRechargePage:ShowSingleData(item,sdata,index)
return
end
item.gameObject:SetActive(true)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig)
end
function ConRechargePage:OnClose()

10
Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua
View File

@ -108,8 +108,12 @@ function ExpertPage:OnShow(_sortingOrder)
--拿取数据
self:RefreshData(true,true)
self:RefreshBtns()--刷新上方两个按钮
Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder)
self.sortingOrder = _sortingOrder
self.effect:SetActive(false)
if self.actConfig.ActiveType == ActivityTypeDef.AccumulativeRechargeExper then
self.effect:SetActive(true)
Util.AddParticleSortLayer( self.effect, _sortingOrder - self.sortingOrder)
self.sortingOrder = _sortingOrder
end
end
function ExpertPage:RefreshBtns()
@ -160,7 +164,7 @@ function ExpertPage:ShowSingleData(item,sdata,index)
return
end
item.gameObject:SetActive(true)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId,self.ActData.value,self.actConfig)
self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData,self.actConfig)
end
function ExpertPage:RefreshTime()

21
Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua
View File

@ -11,7 +11,7 @@ end
local BtnState = {
[0] = {Img = "s_slbz_1anniuongse", isRed = true, isGray = false, Text = Language[11948],},
[1] = {Img = "s_slbz_1anniuhuangse", isRed = false, isGray = false, Text = Language[10556]},
[2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[11948]},
[2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[10101]},
}
--初始化组件（用于子类重写）
@ -39,11 +39,12 @@ end
function ExpertPre:OnOpen()
end
function ExpertPre:SetData(_data,_parent,_sortingOrder,_activityId)
function ExpertPre:SetData(_data,_parent,_sortingOrder,_actData,_actConfig)
self.data = _data
self.parent = _parent
self.sortingOrder = _sortingOrder
self.activityId = _activityId
self.actData = _actData
self.actConfig = _actConfig
self:Refresh()
end
@ -71,10 +72,15 @@ function ExpertPre:SetButton()
self.redPoint:SetActive(btnData.isRed)
self.btnText.text = btnData.Text
self.info.text = self.data.otherData.info
if self.actConfig.ActiveType == ActivityTypeDef.ContinuityRecharge then
local bool = self:IsCurrentSortEnable(self.data.otherData.Sort)
self.btnGet:GetComponent("Button").interactable = bool
Util.SetGray(self.btnGet, not bool)
end
Util.AddOnceClick(self.btnGet, function()
if self.data.otherData.state == 0 then
NetManager.GetActivityRewardRequest(self.data.missionId, self.activityId, function(drop)
NetManager.GetActivityRewardRequest(self.data.missionId, self.actData.activityId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
self.parent:RefreshData(true,false)
CheckRedPointStatus(RedPointType.Expert_FastExplore)
@ -95,4 +101,11 @@ function ExpertPre:OnClose()
end
end
--积天豪礼是否轮到当天可充了
function ExpertPre:IsCurrentSortEnable(sort)
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.ContinuityRecharge)
return activityInfo.value + 1 == sort
end
return ExpertPre

7
Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua
View File

@ -39,7 +39,7 @@ function ItemUpstarPre:BindEvent()
return
end
local cost = ConfigManager.GetConfigData(ConfigName.ComposeBook,self.data.otherData.selectId).NeedCost
NetManager.EquipUpLevelRequest(self.activityId,self.data.otherData.selectId,cost[1][1],cost[1][2],function (msg)
NetManager.EquipUpLevelRequest(self.actData.activityId,self.data.otherData.selectId,cost[1][1],cost[1][2],function (msg)
UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1,function()
self.parent:RefreshData(true,true,false)
end)
@ -58,11 +58,12 @@ end
function ItemUpstarPre:OnOpen()
end
function ItemUpstarPre:SetData(_data,_parent,_sortingOrder,_activityId)
function ItemUpstarPre:SetData(_data,_parent,_sortingOrder,_actData,_actConfig)
self.data = _data
self.parent = _parent
self.sortingOrder = _sortingOrder
self.activityId = _activityId
self.actData = _actData
self.actConfig = _actConfig
self:Refresh()
end