【家园】特权完成,2021最后的提交!!

dev_chengFeng
ZhangBiao 2021-12-31 18:58:04 +08:00
parent 2b3afae7ea
commit 39244f8ce5
5 changed files with 6363 additions and 4687 deletions

File diff suppressed because it is too large Load Diff

View File

@ -24,6 +24,7 @@ function this:BindEvent()
Util.AddClick(this.btn,function()
PayManager.Pay(1120, function()
HomeLandManager.CheckPrivilege(function ()
HomeLandManager.CheckPrivilege()
this:Refresh()
end)
end)

View File

@ -28,6 +28,7 @@ function this.Initialize()
this.curEquip = 1--当前停留的装备
this.activePrivilege = false
this.priviLeftTime = 0
end
--获取家园和装备强化信息
@ -212,7 +213,14 @@ function this.LevelToValue(ids,position)
end
function this.CheckPrivilege(func)
local data = PrivilegeManager.GetSerData(4022)
if data and data.endTime - GetTimeStamp() > 0 then
this.activePrivilege = true
this.priviLeftTime = PrivilegeManager.GetPrivilegeRemainValue(4021)
else
this.activePrivilege = false
this.priviLeftTime = 0
end
if func then
func()
end

View File

@ -20,6 +20,9 @@ function HomeLand:InitComponent()
self.RightUp = Util.GetGameObject(self.map,"RightUp")
self.RightDown = Util.GetGameObject(self.map,"RightDown")
--privi
self.priviDi = Util.GetGameObject(self.Privi,"di")
self.priviText = Util.GetGameObject(self.Privi,"di/Text"):GetComponent("Text")
--btns
self.taskBtn = Util.GetGameObject(self.RightUp,"Task")
self.yunYouBtn = Util.GetGameObject(self.RightUp,"YunYou")
@ -64,6 +67,7 @@ function HomeLand:InitComponent()
self.mapData[i].btnUpgrade = Util.GetGameObject(self.mapData[i].Btns,"Upgrade")
self.mapData[i].btnCancel = Util.GetGameObject(self.mapData[i].Btns,"Cancel")
self.mapData[i].btnSpeedUp = Util.GetGameObject(self.mapData[i].Btns,"Speed")
self.mapData[i].btnUsePri = Util.GetGameObject(self.mapData[i].Btns,"UsePri")
self.mapData[i].leftTime = -1
self.mapData[i].showTime = -1
end
@ -117,7 +121,7 @@ function HomeLand:BindEvent()
LogGreen("需要16"..tostring(value).." 现有:"..tostring(BagManager.GetTotalItemNum(16)))
if BagManager.GetTotalItemNum(16) >= value then
MsgPanel.ShowTwo(string.format("是否花费%s妖晶立即升级",value),function() end,function()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},4,0,function ()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},2,0,function ()
self.mapData[i].leftTime = -1
self:OnShow()
end)
@ -126,6 +130,14 @@ function HomeLand:BindEvent()
PopupTipPanel.ShowTip("妖晶不足!")
end
end)
--特权加速
Util.AddOnceClick(self.mapData[i].btnUsePri,function ()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},2,4021,function ()
PrivilegeManager.RefreshPrivilegeUsedTimes(4021,1)
self.mapData[i].leftTime = -1
self:OnShow()
end)
end)
--取消
Util.AddOnceClick(self.mapData[i].btnCancel,function ()
NetManager.ArchitectureOperateRequest({HomeLandManager.BuildData[i].dataMain.Id},3,0,function ()
@ -191,6 +203,7 @@ end
--待功能扩展(试图打开某个状态)
function HomeLand:OnOpen()
HomeLandManager.CheckPrivilege()
self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.XiuXing })
end
@ -247,7 +260,8 @@ function HomeLand:InitDetailBar()
local num = Util.GetGameObject(go2,"Num"):GetComponent("Text")
icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.dataSingle.Gain[1]))
num.text = string.format("%s产量%s",ItemConfig[data.dataSingle.Gain[1]].Name,data.dataSingle.Gain[2])
local priValue = HomeLandManager.activePrivilege and string.format("<color=#00FF00>+%s</color>",math.ceil(data.dataSingle.Gain[2]*1.2)) or ""
num.text = string.format("%s产量%s %s/分钟",ItemConfig[data.dataSingle.Gain[1]].Name,data.dataSingle.Gain[2],priValue)
end
end
@ -270,6 +284,7 @@ function HomeLand:SetBuildsState()
curObj.btnUpgrade:SetActive(false)
curObj.btnCancel:SetActive(false)
curObj.btnSpeedUp:SetActive(false)
curObj.btnUsePri:SetActive(false)
curObj.NameImg:SetActive(true)
curObj.upgradeImg:SetActive(false)
curObj.updateTime:SetActive(false)
@ -298,6 +313,7 @@ function HomeLand:SetBuildsState()
if data.endTime > GetTimeStamp() then--如果有结束时间说明在升级,可以取消,可以加速
curObj.btnCancel:SetActive(true)
curObj.btnSpeedUp:SetActive(true)
curObj.btnUsePri:SetActive(PrivilegeManager.GetPrivilegeRemainValue(4021)>0)
curObj.upgradeImg:SetActive(true)
curObj.updateTime:SetActive(true)
curObj.leftTime = data.endTime - GetTimeStamp() >= 0 and data.endTime - GetTimeStamp() or -1
@ -359,6 +375,8 @@ function HomeLand:SetTime()
curObj.CanGet:GetComponent("Image").sprite = self.spLoader:LoadSprite(img)
end
end
self.priviDi:SetActive(HomeLandManager.activePrivilege)
self.priviText.text = string.format("剩余:%s",HomeLandManager.priviLeftTime)
end, 1, -1, true)
self.timer:Start()
end

View File

@ -263,22 +263,26 @@ function RewardEquipSingleShowPopup2:OnShow()
for index, prop in ipairs(equipConfigData.Property) do
local proConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, prop[1])
if proConfigData then
--基础属性
if not _BaseProList[index] then
_BaseProList[index] = newObjToParent(self.baseProPre, self.baseProGrid)
end
_BaseProList[index]:SetActive(true)
_BaseProList[index]:GetComponent("Text").text = GetLanguageStrById(proConfigData.Info)
local vText = Util.GetGameObject(_BaseProList[index], "curProVale"):GetComponent("Text")
if prop[2] > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, prop[2])
else
vText.text = GetPropertyFormatStr(proConfigData.Style, prop[2])
end
--摘星阁加持
local power = prop[2]
local hText = Util.GetGameObject(vText.gameObject, "homeValue"):GetComponent("Text")
hText.text = ""
if self.equipData.homeEquipLv and self.equipData.homeEquipLv[1] > 0 and proConfigData.Style == 1 then
hText.text = string.format("(摘星阁加持:%s",HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)).."%)"
local num = HomeLandManager.LevelToValue(self.equipData.homeEquipLv,self.equipData.position)
hText.text = string.format("(摘星阁加持:%s",num).."%)"
power = math.ceil(power*(1 + num/100))
end
if power > 0 then
vText.text = "+"..GetPropertyFormatStr(proConfigData.Style, power)
else
vText.text = GetPropertyFormatStr(proConfigData.Style, power)
end
end
end