Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
e1abfa42e5
|
@ -6478,8 +6478,8 @@ MonoBehaviour:
|
||||||
m_Padding:
|
m_Padding:
|
||||||
m_Left: 0
|
m_Left: 0
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 30
|
m_Top: 10
|
||||||
m_Bottom: 30
|
m_Bottom: 10
|
||||||
m_ChildAlignment: 4
|
m_ChildAlignment: 4
|
||||||
m_StartCorner: 0
|
m_StartCorner: 0
|
||||||
m_StartAxis: 0
|
m_StartAxis: 0
|
||||||
|
@ -13020,10 +13020,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 40
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 4
|
m_MinSize: 3
|
||||||
m_MaxSize: 60
|
m_MaxSize: 60
|
||||||
m_Alignment: 3
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
@ -13597,10 +13597,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 40
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 4
|
m_MinSize: 3
|
||||||
m_MaxSize: 60
|
m_MaxSize: 60
|
||||||
m_Alignment: 3
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
@ -13894,10 +13894,10 @@ MonoBehaviour:
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_FontData:
|
m_FontData:
|
||||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||||
m_FontSize: 40
|
m_FontSize: 35
|
||||||
m_FontStyle: 0
|
m_FontStyle: 0
|
||||||
m_BestFit: 0
|
m_BestFit: 0
|
||||||
m_MinSize: 4
|
m_MinSize: 3
|
||||||
m_MaxSize: 60
|
m_MaxSize: 60
|
||||||
m_Alignment: 3
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
|
|
|
@ -162,6 +162,7 @@ function GeneralRankRewardPanel:OnOpen(Type,myRank,activityId)
|
||||||
this.scrollRect.transform.sizeDelta = vec[curRankType]
|
this.scrollRect.transform.sizeDelta = vec[curRankType]
|
||||||
this.ScrollView.transform.sizeDelta = vec[curRankType]
|
this.ScrollView.transform.sizeDelta = vec[curRankType]
|
||||||
this.RefreshMyInfo()
|
this.RefreshMyInfo()
|
||||||
|
this.text.text = "排行奖励将在周日23:30后通过邮件发放"
|
||||||
end
|
end
|
||||||
this.ShowRewardInfo()
|
this.ShowRewardInfo()
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,7 +2,7 @@ require("Base/BasePanel")
|
||||||
local GeneralTreasurePanel = Inherit(BasePanel)
|
local GeneralTreasurePanel = Inherit(BasePanel)
|
||||||
local itemnum = 0
|
local itemnum = 0
|
||||||
local LocalData = {
|
local LocalData = {
|
||||||
[ActivityTypeDef.QiJieTreasure] = {hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝
|
[ActivityTypeDef.QiJieTreasure] = {itemId = 1242,hp = HELP_TYPE.QiJieTreasure,imgName = "q_qjsl_qjmb2",imgBg = "q_qjsl_qjmb",unLockType = 4,Tips = "挑战七界试炼,提升秘宝等级,激活秘宝后还可领取额外奖励"},--七界秘宝
|
||||||
}
|
}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function GeneralTreasurePanel:InitComponent()
|
function GeneralTreasurePanel:InitComponent()
|
||||||
|
@ -93,7 +93,7 @@ end
|
||||||
|
|
||||||
--任务列表
|
--任务列表
|
||||||
function GeneralTreasurePanel:showTaskList(isTop,isAni)
|
function GeneralTreasurePanel:showTaskList(isTop,isAni)
|
||||||
self.scoreText.text = self.treasureData.value
|
self.scoreText.text = BagManager.GetTotalItemNum(LocalData[self.curType].itemId)
|
||||||
if not self.itemsList then
|
if not self.itemsList then
|
||||||
self.itemsList = {}
|
self.itemsList = {}
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
require("Base/BasePanel")
|
require("Base/BasePanel")
|
||||||
JumpServerPanel = Inherit(BasePanel)
|
JumpServerPanel = Inherit(BasePanel)
|
||||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||||
|
local globalSys = ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)
|
||||||
local type = {
|
local type = {
|
||||||
[1] = {
|
[JumpServer_Type.HightLadder] = {
|
||||||
id = JumpServer_Type.HightLadder, --跨服天梯
|
id = JumpServer_Type.HightLadder, --跨服天梯
|
||||||
|
funcId = FUNCTION_OPEN_TYPE.JumpServer_HightLadder,
|
||||||
|
sort = 1,
|
||||||
bg = "r_Dungeon_rendi_01",
|
bg = "r_Dungeon_rendi_01",
|
||||||
name = "k_kuafuwanfa_luofuzhengfeng",
|
name = "k_kuafuwanfa_luofuzhengfeng",
|
||||||
live = "m_chsm_0035_png",
|
live = "m_chsm_0035_png",
|
||||||
|
@ -16,8 +19,10 @@ local type = {
|
||||||
tipStr = "",
|
tipStr = "",
|
||||||
state = 0
|
state = 0
|
||||||
},
|
},
|
||||||
[3] = {
|
[JumpServer_Type.YuXuLunDao] = {
|
||||||
id = -1,
|
id = JumpServer_Type.YuXuLunDao,
|
||||||
|
funcId = FUNCTION_OPEN_TYPE.JumpServer_YuXu,
|
||||||
|
sort = 3,
|
||||||
bg = "r_Dungeon_rendi_01",
|
bg = "r_Dungeon_rendi_01",
|
||||||
name = "y_yuxulundao_yuxurukou_zh",
|
name = "y_yuxulundao_yuxurukou_zh",
|
||||||
live = "m_chsm_0035_png",
|
live = "m_chsm_0035_png",
|
||||||
|
@ -28,10 +33,12 @@ local type = {
|
||||||
tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
tip = string.format("<color=#A5ADD1>%s</color>",specialConfig[127].Value),
|
||||||
redPointType = RedPointType.JumpServer_HightLadder,
|
redPointType = RedPointType.JumpServer_HightLadder,
|
||||||
tipStr = "",
|
tipStr = "",
|
||||||
state = 1
|
state = 0,
|
||||||
},
|
},
|
||||||
[2] = {
|
[JumpServer_Type.QiJieShiLian] = {
|
||||||
id = JumpServer_Type.QiJieShiLian,
|
id = JumpServer_Type.QiJieShiLian,
|
||||||
|
funcId = FUNCTION_OPEN_TYPE.QIJIESHILIAN,
|
||||||
|
sort = 2,
|
||||||
bg = "q_qjsl_rikou_di",
|
bg = "q_qjsl_rikou_di",
|
||||||
name = "q_qjsl_rikou_ysz",
|
name = "q_qjsl_rikou_ysz",
|
||||||
live = "m_chsm_0035_png",
|
live = "m_chsm_0035_png",
|
||||||
|
@ -42,10 +49,11 @@ local type = {
|
||||||
tip = "",
|
tip = "",
|
||||||
redPointType = RedPointType.QiJieShiLian,
|
redPointType = RedPointType.QiJieShiLian,
|
||||||
tipStr = "",
|
tipStr = "",
|
||||||
state = 1
|
state = 0,
|
||||||
},
|
},
|
||||||
[4] = {
|
[4] = {
|
||||||
id = -1,
|
id = -1,
|
||||||
|
sort = 4,
|
||||||
bg = "r_Dungeon_rendi_01"
|
bg = "r_Dungeon_rendi_01"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -59,10 +67,10 @@ function JumpServerPanel:InitComponent()
|
||||||
self.carbons = {}
|
self.carbons = {}
|
||||||
self.carbonsRedPoint = {}
|
self.carbonsRedPoint = {}
|
||||||
|
|
||||||
for i = 1, #type do
|
for k,v in pairs(type) do
|
||||||
local btn = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherBtn"..i)
|
local btn = Util.GetGameObject(self.gameObject, "btnRoot/circle/root/otherBtn"..v.sort)
|
||||||
table.insert(self.carbons, btn)
|
self.carbons[k] = btn
|
||||||
table.insert(self.carbonsRedPoint, Util.GetGameObject(btn, "bg/carbon/redPoint"))
|
self.carbonsRedPoint[k] = Util.GetGameObject(btn, "bg/carbon/redPoint")
|
||||||
end
|
end
|
||||||
|
|
||||||
self.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect")
|
self.effect = Util.GetGameObject(self.gameObject, "CarbonTypePanel_effect")
|
||||||
|
@ -78,9 +86,9 @@ function JumpServerPanel:BindEvent()
|
||||||
Util.AddClick(self.backBtn,function()
|
Util.AddClick(self.backBtn,function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
for i = 1, #type do
|
for k,v in pairs(type) do
|
||||||
if type[i].redPointType and self.carbons[i] then
|
if v.redPointType and self.carbons[k] then
|
||||||
BindRedPointObject(type[i].redPointType, self.carbonsRedPoint[i])
|
BindRedPointObject(v.redPointType, self.carbonsRedPoint[k])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -100,9 +108,9 @@ end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function JumpServerPanel:OnShow(...)
|
function JumpServerPanel:OnShow(...)
|
||||||
for i = 1, #type do
|
for k,v in pairs(type) do
|
||||||
if type[i].redPointType and self.carbons[i] then
|
if v.redPointType and self.carbons[k] then
|
||||||
CheckRedPointStatus(type[i].redPointType)
|
CheckRedPointStatus(v.redPointType)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self:UpdateCarbonContent()
|
self:UpdateCarbonContent()
|
||||||
|
@ -114,7 +122,7 @@ function JumpServerPanel:UpdateCarbonContent()
|
||||||
for k,v in ipairs(self.carbons) do
|
for k,v in ipairs(self.carbons) do
|
||||||
local data = type[k]
|
local data = type[k]
|
||||||
Util.GetGameObject(v, "bg"):GetComponent("Image").sprite = self.spLoader:LoadSprite(data.bg)
|
Util.GetGameObject(v, "bg"):GetComponent("Image").sprite = self.spLoader:LoadSprite(data.bg)
|
||||||
if data.id == -1 then
|
if data.id == -1 or globalSys[data.funcId].IsOpen == 0 then
|
||||||
Util.GetGameObject(v, "bg/carbon"):SetActive(false)
|
Util.GetGameObject(v, "bg/carbon"):SetActive(false)
|
||||||
Util.GetGameObject(v, "bg/InfoBg"):SetActive(false)
|
Util.GetGameObject(v, "bg/InfoBg"):SetActive(false)
|
||||||
Util.GetGameObject(v, "bg/Text").gameObject:SetActive(true)
|
Util.GetGameObject(v, "bg/Text").gameObject:SetActive(true)
|
||||||
|
@ -186,13 +194,14 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
fun()
|
fun()
|
||||||
fun = nil
|
fun = nil
|
||||||
end
|
end
|
||||||
return
|
|
||||||
end
|
end
|
||||||
if id == JumpServer_Type.HightLadder then
|
if id == JumpServer_Type.HightLadder then
|
||||||
--判断功能是否开启
|
--判断功能是否开启
|
||||||
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then
|
if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then
|
||||||
type[id].state = -1
|
type[id].state = -1
|
||||||
type[id].tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder)
|
type[id].tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.JumpServer_HightLadder)
|
||||||
|
func()
|
||||||
|
return
|
||||||
end
|
end
|
||||||
--判断世界等级是否够
|
--判断世界等级是否够
|
||||||
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel
|
local conFigWorldLevel = ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,1).WorldLevel
|
||||||
|
@ -200,12 +209,14 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
type[id].state = -2
|
type[id].state = -2
|
||||||
type[id].tipStr = string.format("世界等级到达%s后开启!",conFigWorldLevel)
|
type[id].tipStr = string.format("世界等级到达%s后开启!",conFigWorldLevel)
|
||||||
func()
|
func()
|
||||||
|
return
|
||||||
end
|
end
|
||||||
--判断是否在赛季中
|
--判断是否在赛季中
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁
|
||||||
type[id].state = -3
|
type[id].state = -3
|
||||||
type[id].tipStr = "赛季过渡中!"
|
type[id].tipStr = "赛季过渡中!"
|
||||||
func()
|
func()
|
||||||
|
return
|
||||||
end
|
end
|
||||||
JumpServerManager.GetWorldArenaInfoRequest(function()
|
JumpServerManager.GetWorldArenaInfoRequest(function()
|
||||||
if not JumpServerManager.GetHightLadderDataIsStart() then
|
if not JumpServerManager.GetHightLadderDataIsStart() then
|
||||||
|
@ -219,6 +230,7 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
type[id].tipStr = ""
|
type[id].tipStr = ""
|
||||||
end
|
end
|
||||||
func()
|
func()
|
||||||
|
return
|
||||||
end)
|
end)
|
||||||
elseif id== JumpServer_Type.YuXuLunDao then
|
elseif id== JumpServer_Type.YuXuLunDao then
|
||||||
-- 判断功能是否开启
|
-- 判断功能是否开启
|
||||||
|
@ -241,6 +253,7 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
type[id].tipStr = ""
|
type[id].tipStr = ""
|
||||||
end
|
end
|
||||||
func()
|
func()
|
||||||
|
return
|
||||||
end)
|
end)
|
||||||
elseif id== JumpServer_Type.QiJieShiLian then
|
elseif id== JumpServer_Type.QiJieShiLian then
|
||||||
-- 判断功能是否开启
|
-- 判断功能是否开启
|
||||||
|
@ -263,6 +276,7 @@ function JumpServerPanel:SystemState(id,fun)
|
||||||
type[id].tipStr = ""
|
type[id].tipStr = ""
|
||||||
end
|
end
|
||||||
func()
|
func()
|
||||||
|
return
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -274,9 +288,9 @@ end
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function JumpServerPanel:OnDestroy()
|
function JumpServerPanel:OnDestroy()
|
||||||
self.carbons = {}
|
self.carbons = {}
|
||||||
for i = 1, #type do
|
for k,v in pairs(type) do
|
||||||
if type[i].redPointType and self.carbons[i] then
|
if v.redPointType and self.carbons[k] then
|
||||||
ClearRedPointObject(type[i].redPointType, self.carbonsRedPoint[i])
|
ClearRedPointObject(v.redPointType, self.carbonsRedPoint[k])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
self.spLoader:Destroy()
|
self.spLoader:Destroy()
|
||||||
|
|
|
@ -570,7 +570,7 @@ function this.RegisterRedCheckFunc()
|
||||||
RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong)
|
RPData:AddCheckFunc(RedPointType.linglongBaojing,LingLongBaoJingManager.CheckRedPointLingLong)
|
||||||
RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu)
|
RPData:AddCheckFunc(RedPointType.TaiChuMiJuan,DynamicActivityManager.CheckRedPointTaiChu)
|
||||||
--七界试炼
|
--七界试炼
|
||||||
RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint)
|
RPData:AddCheckFunc(RedPointType.QiJieShiLian,QiJieShiLianManager.CheckQiJieRedPoint,FUNCTION_OPEN_TYPE.QIJIESHILIAN)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- 向红点绑定物体
|
-- 向红点绑定物体
|
||||||
|
|
|
@ -202,6 +202,8 @@ function this.GetBattleResult()
|
||||||
bonue = config.RoundReward[i][2]
|
bonue = config.RoundReward[i][2]
|
||||||
if config.RoundReward[i+1] then
|
if config.RoundReward[i+1] then
|
||||||
bonue = config.RoundReward[i][2]
|
bonue = config.RoundReward[i][2]
|
||||||
|
else
|
||||||
|
bonue = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue