diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
index 516a1407f3..cc3a3de043 100644
--- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
@@ -91,7 +91,7 @@ function FightPointPassMainPanel:InitComponent()
this.RadarBGText = Util.GetGameObject(self.gameObject, "Bg/btnArea/RadarBGTextBg/RadarBGText"):GetComponent("Text")
this.areaName = Util.GetGameObject(this.btnMap, "areaName"):GetComponent("Text")
this.chapterName = Util.GetGameObject(this.btnMap, "chapterName"):GetComponent("Text")
- this.btnMap:SetActive(false)
+ this.btnMap:SetActive(true)
SetEnglishActive(this.chapterName)
this.map = Util.GetGameObject(self.gameObject, "Bg/btnArea/MapMask/Map"):GetComponent("RectTransform")
@@ -143,9 +143,9 @@ function FightPointPassMainPanel:InitComponent()
this.mainTask = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask")
this.goVipButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout")
this.titleText = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout/titleText"):GetComponent(
- "Text")
+ "Text")
this.progressText = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout/progressText")
- :GetComponent("Text")
+ :GetComponent("Text")
this.getRewardButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton")
this.mainTaskGRewardImage = Util.GetGameObject(self.gameObject,
"Bg/RightDown/mainTask/getRewardButton/getRewardImage")
@@ -226,9 +226,9 @@ function FightPointPassMainPanel:InitComponent()
this.btnFindTreasure = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnFindTreasure/Button")
this.btnFindTreasure:GetComponent("Image").sprite = this.spLoader:LoadSprite("x_xb_quan_01_zh")
this.btnFindTreasureImage = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnFindTreasure/Button/RadarBG")
- :GetComponent("Image")
+ :GetComponent("Image")
this.btnFindTreasureText = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnFindTreasure/Image/num")
- :GetComponent("Text")
+ :GetComponent("Text")
this.btnFindTreasureredPoint = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnFindTreasure/redPoint")
--逍遥游入口
this.btnXiaoYao = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/xiaoyaoBtn")
@@ -244,11 +244,11 @@ function FightPointPassMainPanel:InitComponent()
this.btnXiaobing:SetActive(false)
this.drawTipObj = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnXiaobing/drawOpenTip")
this.drawTipTxt = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/btnXiaobing/drawOpenTip/Text")
- :GetComponent("Text")
+ :GetComponent("Text")
--解锁功能
this.openFun = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun")
this.openFunNeedInfo = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun/needInfo"):GetComponent(
- "Text")
+ "Text")
this.openFunFunInfo = Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/openFun/funInfo"):GetComponent("Text")
--世界等级
Util.GetGameObject(self.gameObject, "Bg/RightUpVertical/worldLv/Text"):GetComponent("Text").text = "世界等级:"
@@ -262,13 +262,13 @@ function FightPointPassMainPanel:InitComponent()
this.firstRedPoint = Util.GetGameObject(this.btnFirstRechar, "redPoint")
this.OpenSeverWelfare = Util.GetGameObject(self.gameObject, "Bg/LeftUp/box/btnOpenSeverWelfare/bg")
this.OpenSeverWelfareicon = Util.GetGameObject(this.UI_Effect_MuBiaoJiangLi, "UI_MuBiaoJiangLi_Import_05")
- :GetComponent("Image")
+ :GetComponent("Image")
this.OpenSeverWelfareiconText = Util.GetGameObject(this.OpenSeverWelfare, "iconText"):GetComponent("Image")
this.OpenSeverWelfareProgressBg = Util.GetGameObject(this.OpenSeverWelfare, "progressBg")
this.OpenSeverWelfareProgressText = Util.GetGameObject(this.OpenSeverWelfare, "progressBg/progress"):GetComponent(
- "Text")
+ "Text")
this.OpenSeverWelfareProgressImage = Util.GetGameObject(this.OpenSeverWelfare, "progressBg/progressImage")
- :GetComponent("Image")
+ :GetComponent("Image")
this.OpenSeverWelfareTimeText = Util.GetGameObject(this.OpenSeverWelfare, "time"):GetComponent("Text")
this.OpenSeverWelfareTimeText.gameObject:SetActive(false)
this.OpenSeverWelfareInfoText = Util.GetGameObject(this.OpenSeverWelfare, "info"):GetComponent("Text")
@@ -386,13 +386,13 @@ function FightPointPassMainPanel:BindEvent()
this:PlayerKillAllSkill()
end)
- Util.AddClick(this.btnMap, function()
- if not FightPointPassManager.IsChapterClossState() then
- UIManager.OpenPanel(UIName.FightSmallChoosePanel, FightPointPassManager.lastPassFightId)
- else
- UIManager.OpenPanel(UIName.FightSmallChoosePanel, FightPointPassManager.curOpenFight)
- end
- end)
+ --Util.AddClick(this.btnMap, function()
+ --if not FightPointPassManager.IsChapterClossState() then
+ --UIManager.OpenPanel(UIName.FightSmallChoosePanel, FightPointPassManager.lastPassFightId)
+ --else
+ --UIManager.OpenPanel(UIName.FightSmallChoosePanel, FightPointPassManager.curOpenFight)
+ --end
+ --end)
--通关豪礼
Util.AddClick(this.pgBtn, function()
@@ -761,7 +761,7 @@ function FightPointPassMainPanel:OnShow()
if openFunConFig then
this.openFun:SetActive(true)
this.openFunNeedInfo.text = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, openFunConFig.OpenRules[2])
- .Name
+ .Name
this.openFunFunInfo.text = Language[12163] .. openFunConFig.Name
else
this.openFun:SetActive(false)
@@ -827,7 +827,7 @@ function this.refreshVipTask()
-- 避免显示的太长
if tonumber(taskConfigInfo.TaskValue[2][1]) < 10000 then
this.titleText.text = this.titleText.text ..
- string.format("(%s/%s)", color, task.progress, taskConfigInfo.TaskValue[2][1])
+ string.format("(%s/%s)", color, task.progress, taskConfigInfo.TaskValue[2][1])
end
this.progressText.text = ""
this.mainTaskGRewardImage:SetActive(task.state ~= VipTaskStatusDef.NotFinished)
@@ -850,9 +850,9 @@ end
--寻宝显示
function this.UpdateFindTreasureMaterialNum()
local mazeTreasureMax = ConfigManager.GetConfigData(ConfigName.PlayerLevelConfig, PlayerManager.level)
- .MazeTreasureMax
+ .MazeTreasureMax
this.btnFindTreasureImage.fillAmount = BagManager.GetItemCountById(FindTreasureManager.materialItemId) /
- mazeTreasureMax
+ mazeTreasureMax
this.btnFindTreasureText.text = BagManager.GetItemCountById(FindTreasureManager.materialItemId)
this.RefreshFindTreasureRedPoint()
end
@@ -1196,7 +1196,7 @@ function this.RefreshLittleMap()
this.integer, this.decimal = math.modf(FightPointPassManager.curOpenFight / 1000)
end
local data = ConfigManager.GetConfigData(ConfigName.MainLevelSettingConfig, this.integer) --获取这一区域所有数据
- local difficulty = FightPointPassManager.curOpenFight % 10 --确定当前区域难度
+ local difficulty = FightPointPassManager.curOpenFight % 10 --确定当前区域难度
local curAllLevelNum = 0
--根据当前难度 检查对应区域数据
if difficulty == 1 then
@@ -1290,7 +1290,7 @@ end
function this.GetNextFightOpenFun()
local nextFightId = 0
local nextFightSortId = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight)
- .SortId - 1
+ .SortId - 1
for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.GlobalSystemConfig)) do
if v.OpenRules then
if v.OpenRules[1] == 1 then --1关卡开启
@@ -1367,7 +1367,7 @@ function this.UpdateOpenSeverWelfare()
-- 奖励图
this.OpenSeverWelfareicon.sprite = this.spLoader:LoadSprite(OpenSeverWelfareRewardShow
- [curMissionConfig.Reward[1][1]].image1)
+ [curMissionConfig.Reward[1][1]].image1)
this.OpenSeverWelfareicon:SetNativeSize()
-- 文字
local imgName2 = OpenSeverWelfareRewardShow[curMissionConfig.Reward[1][1]].image2
@@ -1380,7 +1380,7 @@ function this.UpdateOpenSeverWelfare()
end
LogError("FightPointPassManager.lastPassFightId==" .. FightPointPassManager.lastPassFightId)
local curPassLevelSortId = FightPointPassManager.lastPassFightId ~= FightPointPassManager.curOpenFight and
- mainLevelConfig[FightPointPassManager.lastPassFightId].SortId or 0
+ mainLevelConfig[FightPointPassManager.lastPassFightId].SortId or 0
local getRewardLevelSortId = mainLevelConfig[curMissionConfig.Values[2][1]].SortId
this.OpenSeverWelfareRed:SetActive(isShowRed)
if isAll then