qinglong tijiao

dev_chengFeng
jiaoyangna 2020-08-22 17:36:57 +08:00
parent f814a80eb4
commit 04bf990060
4 changed files with 40 additions and 34 deletions

View File

@ -4377,7 +4377,7 @@ 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: 248, y: 644}
m_AnchoredPosition: {x: 0, y: 601}
m_SizeDelta: {x: 584, y: 84}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7091958631644234883
@ -4408,7 +4408,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 26e7b9b885f7a9d4b8681d2e7ccbd265, type: 3}
m_Sprite: {fileID: 21300000, guid: c79ca6ef5a3666c43b6b15a4d3b88f4e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -4843,10 +4843,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 38}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 140, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4351523970267476369
CanvasRenderer:
@ -18517,9 +18517,9 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -25}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &490872853371369416
@ -27994,7 +27994,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -538.24, y: 82}
m_SizeDelta: {x: 0, y: 50}
m_SizeDelta: {x: 467, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4232190997202796534
MonoBehaviour:
@ -29392,10 +29392,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 186, y: 0}
m_SizeDelta: {x: 0, y: 38}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 186, y: -25}
m_SizeDelta: {x: 281, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5421451615274732876
CanvasRenderer:
@ -31190,7 +31190,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6872382260446978439
RectTransform:
m_ObjectHideFlags: 0
@ -35336,10 +35336,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_SizeDelta: {x: 0, y: 46}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -25}
m_SizeDelta: {x: 46, y: 46}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &49029013758658618
CanvasRenderer:

View File

@ -6,18 +6,18 @@ local TabBox = require("Modules/Common/TabBox")
this._CurPageIndex =1
local orginLayer
local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[1] = { --限时召唤
[1] = { --破阵诛仙
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
},
[2] = { --限时召唤
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
rpType = RedPointType.TimeLimited,panelType = PanelType.TimelimitCall,
},
[2] = { --乾坤宝盒
[3] = { --乾坤宝盒
default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
},
[3] = { --破阵诛仙
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.Main,
},
[4] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = "",panelType = PanelType.Main,
@ -47,9 +47,9 @@ function DynamicActivityPanel:InitComponent()
this.content = Util.GetGameObject(self.gameObject, "bg/pageContent")
this.PageList = {
[1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[1] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[2] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")),
[3] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
[5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
[6] = XianShiShangShi.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_6")),

View File

@ -121,13 +121,16 @@ function this:topBar()
local lv = QinglongSerectTreasureManager.GetLevel()
this.lv.text = lv
local rewardData = QinglongSerectTreasureManager.GetRewardData(lv)
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv)
if lv ~= 0 then
lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
local needScore
if lv > 0 then
local lastRewardData = QinglongSerectTreasureManager.GetRewardData(lv - 1)
needScore = lastRewardData.needScore
else
needScore = 0
end
if rewardData.needScore ~= 0 then
this.scoreText.text = curScore .."/"..rewardData.needScore - lastRewardData.needScore
this.progress.fillAmount = curScore/(rewardData.needScore - lastRewardData.needScore)
this.scoreText.text = curScore .."/"..rewardData.needScore - needScore
this.progress.fillAmount = curScore/(rewardData.needScore - needScore)
else
this.scoreText.text = "最大等级"
this.progress.fillAmount = 1
@ -143,7 +146,7 @@ function this:topBar()
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.QinglongSerectTreasureBuyLevel)
end)
local times = PrivilegeManager.GetPrivilegeRemainValue(1007)
this.box :GetComponent("Image").enabled = ((not (treasureState == 0)) and (times > 0))
this.box :GetComponent("Image").enabled = (treasureState == 0)
this.extra:GetComponent("Button").enabled = ((not (treasureState == 0)) and (times > 0))
this.canOpenExtra.gameObject:SetActive((not (treasureState == 0)) and (times > 0))
this.openExtra:GetComponent("Animator").enabled = false
@ -160,6 +163,7 @@ function this:topBar()
Timer.New(function()
NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
this.refresh()
end)
end,1.5):Start()

View File

@ -121,6 +121,7 @@ function this:SetTopBar()
local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
NetManager.GetActivityRewardRequest(-2,id,function(msg)
PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1)
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
this.refresh(curType)
end)
end,1.5):Start()
@ -186,6 +187,7 @@ function this:SingleTask(go, rewardSingleData)
Util.AddOnceClick(lingquButton, function()
if state == 1 then
NetManager.TakeMissionRewardRequest(TaskTypeDef.TreasureOfSomeBody,sConFigData.id, function(msg)
PopupTipPanel.ShowTip("成功领取"..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name)
Timer.New(function()
this.refresh(curType)
end,1):Start()