Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
c5e245fca4
Binary file not shown.
Before Width: | Height: | Size: 770 KiB After Width: | Height: | Size: 770 KiB |
|
@ -4169,7 +4169,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1918779212793027703
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -4777,10 +4777,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7559358737188565728}
|
||||
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: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 120.88501, y: -44.525}
|
||||
m_SizeDelta: {x: 168, y: 58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1918779213686181055
|
||||
CanvasRenderer:
|
||||
|
@ -5224,7 +5224,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -248.69995, y: 41.399933}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_SizeDelta: {x: 135, y: 100}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &462056855713613971
|
||||
MonoBehaviour:
|
||||
|
@ -6842,10 +6842,10 @@ RectTransform:
|
|||
m_Father: {fileID: 7559358737188565728}
|
||||
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: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 358.285, y: -44.525}
|
||||
m_SizeDelta: {x: 168, y: 58}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4580382491728856826
|
||||
CanvasRenderer:
|
||||
|
@ -9549,7 +9549,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 28.300049, y: 41.399933}
|
||||
m_SizeDelta: {x: 0, y: 100}
|
||||
m_SizeDelta: {x: 135, y: 100}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &327137578093138444
|
||||
MonoBehaviour:
|
||||
|
|
|
@ -2386,4 +2386,5 @@
|
|||
[12385] = "五星成长礼",
|
||||
[12386] = "极速排名",
|
||||
[12387] = "军团副本",
|
||||
[12388] = "该神将在巅峰战阵容中已上阵",
|
||||
}
|
||||
|
|
|
@ -117,11 +117,15 @@ function FirstRechargePanel:OnOpen(context,_fun)
|
|||
self.frame:SetActive(false)
|
||||
self.effect:SetActive(false)
|
||||
self.ani.enabled = false
|
||||
self.closeBtn:GetComponent("Button").enabled = false
|
||||
Timer.New(function ()
|
||||
self.frame:SetActive(true)
|
||||
self.effect:SetActive(true)
|
||||
self.ani.enabled = true
|
||||
end, 1.5):Start()
|
||||
Timer.New(function ()
|
||||
self.closeBtn:GetComponent("Button").enabled = true
|
||||
end, 2.5):Start()
|
||||
end
|
||||
|
||||
function FirstRechargePanel:OnShow()
|
||||
|
|
|
@ -19,10 +19,10 @@ end
|
|||
|
||||
function this.OnLevelChange()
|
||||
-- 首充引导特殊处理到十级开放
|
||||
-- if PlayerManager.level == 10 then
|
||||
-- table.insert(_FuncGuideList, 100200)
|
||||
-- this.CheckFuncGuide()
|
||||
-- end
|
||||
if PlayerManager.level == 10 then
|
||||
table.insert(_FuncGuideList, 100200)
|
||||
this.CheckFuncGuide()
|
||||
end
|
||||
end
|
||||
--
|
||||
function this.OnFunctionOpen(funcId)
|
||||
|
|
|
@ -355,7 +355,7 @@ function this.GetHeroFormationStr(teamId)
|
|||
return Language[11108]
|
||||
-- 1001
|
||||
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
||||
return Language[12280]
|
||||
return Language[12388]
|
||||
end
|
||||
end
|
||||
return ""
|
||||
|
|
|
@ -572,7 +572,7 @@ function this:BindEvent()
|
|||
end)
|
||||
--戒灵秘宝
|
||||
Util.AddClick(this.treasureOfSl, function()
|
||||
UIManager.OpenPanel(UIName.MissionDailyPanel,2)
|
||||
UIManager.OpenPanel(UIName.MissionDailyPanel,2,1)
|
||||
end)
|
||||
-- --天宫秘宝
|
||||
-- Util.AddClick(this.treasureOfSl, function()
|
||||
|
|
|
@ -31,6 +31,7 @@ function MissionDailyTipPanel:BindEvent()
|
|||
PopupTipPanel.ShowTip(Language[11347])
|
||||
return
|
||||
end
|
||||
LogGreen("showType:"..showType)
|
||||
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
|
|
@ -21,6 +21,7 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
|||
local contentPrefabs={}
|
||||
--打开弹窗索引
|
||||
local index=0
|
||||
local type = 0 --0 日常 1青龙
|
||||
local redPointList
|
||||
--初始化组件(用于子类重写)
|
||||
function MissionDailyPanel:InitComponent()
|
||||
|
@ -67,21 +68,38 @@ end
|
|||
function MissionDailyPanel:OnOpen(popupType,...)
|
||||
--根据传入类型打开对应面板
|
||||
index = popupType
|
||||
local temp = {...}
|
||||
if temp and temp[1] then
|
||||
type = temp[1]
|
||||
else
|
||||
type = 0
|
||||
end
|
||||
if not index then
|
||||
index = 1
|
||||
if RedPointManager.GetRedPointMissionDaily() then
|
||||
index = 1
|
||||
type = 0
|
||||
elseif QinglongSerectTreasureManager.GetQinglongSerectTreasureRedPot() then
|
||||
index = 2
|
||||
type = 1
|
||||
elseif QinglongSerectTreasureManager.GetSerectTreasureTrailRedPot() then
|
||||
index = 3
|
||||
type = 1
|
||||
elseif TaskManager.GetAchievementState() then
|
||||
index = 4
|
||||
type = 0
|
||||
end
|
||||
end
|
||||
for i=1,#contentPrefabs do
|
||||
contentPrefabs[i].gameObject:SetActive(false)
|
||||
end
|
||||
if index ~=1 and type == 0 then
|
||||
if ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||
index = 4
|
||||
else
|
||||
index = 2
|
||||
end
|
||||
end
|
||||
contentPrefabs[index].gameObject:SetActive(true)
|
||||
contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参
|
||||
end
|
||||
|
@ -89,7 +107,6 @@ end
|
|||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function MissionDailyPanel:OnShow()
|
||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
||||
if (not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody)) and index ~=1 then index = 2 end
|
||||
this.TabCtrl:SetChangeTabCallBack(this.SwitchView)
|
||||
this.TabCtrl:Init(this.tabBox, _TabData, index)
|
||||
redPointList = {}
|
||||
|
|
|
@ -7,7 +7,7 @@ local taskData = {}
|
|||
this.scoreId = 0
|
||||
this.score = 0
|
||||
this.traiWeekTime = 0
|
||||
local level = 0
|
||||
this.level = 0
|
||||
function this.Initialize()
|
||||
this.InitializeData()
|
||||
end
|
||||
|
@ -154,11 +154,11 @@ function this.GetRewardData(lv)
|
|||
end
|
||||
|
||||
function this.SetLevel(_level)
|
||||
level = _level
|
||||
this.level = _level
|
||||
end
|
||||
|
||||
function this.GetLevel()
|
||||
return level
|
||||
return this.level
|
||||
end
|
||||
|
||||
function this.GetQinglongTaskData(_curtype)
|
||||
|
|
Loading…
Reference in New Issue