TCX_LongZhu
DESKTOP-RH64908\Administrator 2025-12-29 16:40:35 +08:00
parent 03579e1c48
commit eceabf4ae8
4 changed files with 239 additions and 235 deletions

View File

@ -208,6 +208,7 @@ function FirstRechargePanel:OnShow()
local money = activityRewardConfig[missInfo.missionId].Values[1][1] local money = activityRewardConfig[missInfo.missionId].Values[1][1]
--LogError("money===="..money) --LogError("money===="..money)
--local index = FirstRechargeManager.GetFirstRechargeIndexByMoney(money) --local index = FirstRechargeManager.GetFirstRechargeIndexByMoney(money)
LogError("ddddddddddddddddddddddddddddddddd"..tostring(money))
local index = FirstRechargeManager.GetFirstRechargeIndexByMoney(money) local index = FirstRechargeManager.GetFirstRechargeIndexByMoney(money)
if not _MoneyDataNum[index] then if not _MoneyDataNum[index] then
_MoneyDataNum[index] = {} _MoneyDataNum[index] = {}
@ -309,7 +310,7 @@ function FirstRechargePanel:OnTabChanged(index)
for _, missInfo in ipairs(tempData) do for _, missInfo in ipairs(tempData) do
if missInfo and missInfo.progress and activityRewardConfig[missInfo.missionId].Values[1][1] == money then if missInfo and missInfo.progress and activityRewardConfig[missInfo.missionId].Values[1][1] == money then
AccumRecharge = missInfo.progress AccumRecharge = missInfo.progress
LogError("missionInfo.state==" .. missInfo.state) LogError("missionInfo.state==" ..tostring(missInfo.missionId).."/".. missInfo.state..""..tostring(money))
-- if AccumRecharge >= activityRewardConfig[missInfo.missionId].Values[1][1] then -- if AccumRecharge >= activityRewardConfig[missInfo.missionId].Values[1][1] then
-- local day = GetTimePass(FirstRechargeManager.GetRechargeTime())--FirstRechargeManager.GetRechargeTime() -- local day = GetTimePass(FirstRechargeManager.GetRechargeTime())--FirstRechargeManager.GetRechargeTime()
-- if missInfo.state ~= 1 and activityRewardConfig[missInfo.missionId].Values[1][2] <= day then -- if missInfo.state ~= 1 and activityRewardConfig[missInfo.missionId].Values[1][2] <= day then
@ -350,7 +351,7 @@ end
function FirstRechargePanel:ShowContent(index) function FirstRechargePanel:ShowContent(index)
local tempData = {} local tempData = {}
LogError("sssssssssssssssssssssssssssss" .. tostring(index)) --LogError("sssssssssssssssssssssssssssss" .. tostring(index))
for _, missionInfo in ipairs(_MoneyDataNum[index]) do for _, missionInfo in ipairs(_MoneyDataNum[index]) do
table.insert(tempData, activityRewardConfig[missionInfo.missionId]) table.insert(tempData, activityRewardConfig[missionInfo.missionId])
end end

View File

@ -122,6 +122,7 @@ end
local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据 local ActTypeConfigList = {} -- 做一个缓存避免重复遍历表数据
function this.GetTableDataByTypeId(typeId) function this.GetTableDataByTypeId(typeId)
if not ActTypeConfigList[typeId] then if not ActTypeConfigList[typeId] then
LogError("ffffffffffffffffffffffffff"..tostring(typeId))
ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId) ActTypeConfigList[typeId] = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalSystemConfig, "IsIDdSame", typeId)
end end
return ActTypeConfigList[typeId] return ActTypeConfigList[typeId]

View File

@ -703,8 +703,10 @@ function this.ExecuteLoading()
--[[[26] =]] function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助 --[[[26] =]] function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助
--[[[27] =]] function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵 --[[[27] =]] function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵
--[[[28] =]] function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分 --[[[28] =]] function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分
--[[[29] =]] function() NetManager.RankFirstRequest({ 3, 22, 20, 4, 21 }, { 0, 0, 0, 0, 20 }, LoadingPanel --[[[29] =]] function()
.OnStep) end, -- 排行榜数据 NetManager.RankFirstRequest({ 3, 22, 20, 4, 21 }, { 0, 0, 0, 0, 20 }, LoadingPanel
.OnStep)
end, -- 排行榜数据
--[[[30] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜 --[[[30] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜
--[[[31] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时 --[[[31] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时
--[[[32] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下 --[[[32] =]] function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下
@ -749,7 +751,8 @@ function this.ExecuteLoading()
-- 登录时初始化主界面竖条显示为打开状态 -- 登录时初始化主界面竖条显示为打开状态
PlayerPrefs.SetInt(PlayerManager.uid .. "MainRightBarSetting", 1) PlayerPrefs.SetInt(PlayerManager.uid .. "MainRightBarSetting", 1)
if AppConst.isGuide then if AppConst.isGuide then
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) and PlayerManager.level == 1 then local data = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig, 161)
if data.IsOpen == 1 and GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) and PlayerManager.level == 1 then
-- 新的引导 -- 新的引导
-- StoryManager.EventTrigger(300001) -- StoryManager.EventTrigger(300001)
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面 --创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面

View File

@ -50,7 +50,6 @@ function WeekCardPanel:InitComponent()
table.insert(self.cardPres[i].rewards, self.cardPres[i].rewardGrid.transform:GetChild(j - 1).gameObject) table.insert(self.cardPres[i].rewards, self.cardPres[i].rewardGrid.transform:GetChild(j - 1).gameObject)
self.cardPres[i].rewardGrid.transform:GetChild(j - 1).gameObject:SetActive(false) self.cardPres[i].rewardGrid.transform:GetChild(j - 1).gameObject:SetActive(false)
end end
end end
self.btnBack = Util.GetGameObject(self.gameObject, "btnClose") self.btnBack = Util.GetGameObject(self.gameObject, "btnClose")
self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn") self.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
@ -154,7 +153,6 @@ function WeekCardPanel:OnShow()
end end
local kk = key local kk = key
Util.AddClick(self.tabs[i], function() Util.AddClick(self.tabs[i], function()
curKey = kk curKey = kk
curIndex = i curIndex = i
self:SetCardWind(curKey) self:SetCardWind(curKey)
@ -181,11 +179,9 @@ function WeekCardPanel:CheckTabRed()
Util.GetGameObject(self.tabs[num], "redpoint"):SetActive(isTrue) Util.GetGameObject(self.tabs[num], "redpoint"):SetActive(isTrue)
end end
end end
end end
end end
-- 钻石数量显示 -- 钻石数量显示
function WeekCardPanel:RefreshShow() function WeekCardPanel:RefreshShow()
-- local allData = WeekCardManager.GetWeekCardDataArray() -- local allData = WeekCardManager.GetWeekCardDataArray()
@ -199,7 +195,6 @@ function WeekCardPanel:RefreshShow()
self:SetCardWind(curKey) self:SetCardWind(curKey)
end end
--设置周卡界面 --设置周卡界面
function WeekCardPanel:SetCardWind(key) function WeekCardPanel:SetCardWind(key)
curkey = key curkey = key
@ -215,14 +210,22 @@ function WeekCardPanel:SetCardWind(key)
self.selectObj.transform.localScale = Vector3.one self.selectObj.transform.localScale = Vector3.one
self.selectObj.transform.localPosition = Vector3.zero self.selectObj.transform.localPosition = Vector3.zero
self.selectTxt:GetComponent("Text").text = Util.GetGameObject(self.tabs[aaa], "Text"):GetComponent("Text").text self.selectTxt:GetComponent("Text").text = Util.GetGameObject(self.tabs[aaa], "Text"):GetComponent("Text").text
--[[
if aaa == 1 then
self.selectTxt:GetComponent("Text").text = "精英周卡"
Util.GetGameObject(self.tabs[aaa], "Text"):GetComponent("Text").text = "精英周卡"
elseif aaa == 2 then
self.selectTxt:GetComponent("Text").text = "传奇周卡"
Util.GetGameObject(self.tabs[aaa], "Text"):GetComponent("Text").text = "传奇周卡"
end
]]
for i = 1, #allcards[curkey] do for i = 1, #allcards[curkey] do
self:ShowCardInfo(i, allcards[curkey][i]) self:ShowCardInfo(i, allcards[curkey][i])
end end
end end
end end
--显示周卡信息 --显示周卡信息
function WeekCardPanel:ShowCardInfo(index, config) function WeekCardPanel:ShowCardInfo(index, config)
local pre = self.cardPres[index] local pre = self.cardPres[index]
@ -240,7 +243,6 @@ function WeekCardPanel:ShowCardInfo(index,config)
pre.bg.sprite = self.spLoader:LoadSprite("X1_chongzhi_zuanshidiban") pre.bg.sprite = self.spLoader:LoadSprite("X1_chongzhi_zuanshidiban")
pre.btnImg.sprite = self.spLoader:LoadSprite("X1_shouzha_yeqianxuanzhong_01") pre.btnImg.sprite = self.spLoader:LoadSprite("X1_shouzha_yeqianxuanzhong_01")
pre.nameBg.sprite = self.spLoader:LoadSprite("UI_hz_zhonghe01_64") pre.nameBg.sprite = self.spLoader:LoadSprite("UI_hz_zhonghe01_64")
else else
pre.name.text = config.Name --"豪华" pre.name.text = config.Name --"豪华"
pre.bg.sprite = self.spLoader:LoadSprite("X1_chongzhi_zuanshidiban") pre.bg.sprite = self.spLoader:LoadSprite("X1_chongzhi_zuanshidiban")
@ -270,7 +272,8 @@ function WeekCardPanel:ShowCardInfo(index,config)
oneNum = num oneNum = num
icon = GetResourcePath(_ItemConfig[id].ResourceID) icon = GetResourcePath(_ItemConfig[id].ResourceID)
itemId = id itemId = id
pre.rewards[i]:GetComponent("Image").sprite=self.spLoader:LoadSprite(GetQuantityImageByquality(_ItemConfig[id].Quantity)) pre.rewards[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(GetQuantityImageByquality(
_ItemConfig[id].Quantity))
local icon1 = Util.GetGameObject(pre.rewards[i], "Image"):GetComponent("Image") local icon1 = Util.GetGameObject(pre.rewards[i], "Image"):GetComponent("Image")
icon1.sprite = self.spLoader:LoadSprite(icon) icon1.sprite = self.spLoader:LoadSprite(icon)
local stateTxt = Util.GetGameObject(pre.rewards[i], "Text"):GetComponent("Text") local stateTxt = Util.GetGameObject(pre.rewards[i], "Text"):GetComponent("Text")
@ -354,13 +357,8 @@ function WeekCardPanel:ShowCardInfo(index,config)
end) end)
end) end)
end end
end end
function WeekCardPanel:SetCardShow(index, data) function WeekCardPanel:SetCardShow(index, data)
local pre = self.cardPres[index] local pre = self.cardPres[index]
if not pre then if not pre then
@ -448,10 +446,11 @@ function WeekCardPanel:OnClose()
CheckRedPointStatus(RedPointType.WeekCardOpen) CheckRedPointStatus(RedPointType.WeekCardOpen)
CheckRedPointStatus(RedPointType.WeekCardReward) CheckRedPointStatus(RedPointType.WeekCardReward)
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)
function WeekCardPanel:OnDestroy() function WeekCardPanel:OnDestroy()
self.spLoader:Destroy() self.spLoader:Destroy()
self.cardPres = {} self.cardPres = {}
end end
return WeekCardPanel
return WeekCardPanel