xiyou_sanguo
zhangjiannan 2025-10-23 15:43:46 +08:00
parent 28faa2e907
commit fb2b3fcc5b
4 changed files with 56 additions and 39 deletions

View File

@ -11,27 +11,26 @@ local expeditionLevel = {
}
local carbonData = {
--[FUNCTION_OPEN_TYPE.EXPEDITION] = {
-- id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
-- objName = "expedition",
-- nameImg = "f_fuben_fubenming_03",
-- btnPos = Vector2(39,-67),
-- redPointType = RedPointType.OrdinaryExplore,
-- effect1 = "Fx_DaNaoTianGong",
-- effect2 = "Fx_DaNaoTianGong_S",
--},
--[[
--[[
[FUNCTION_OPEN_TYPE.EXPEDITION] = {
id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫
objName = "danaotiangong",
nameImg = "f_fuben_fubenming_03",
btnPos = Vector2(69, -67),
redPointType = RedPointType.OrdinaryExplore,
effect1 = "Fx_DaNaoTianGong",
effect2 = "Fx_DaNaoTianGong_S",
},
]]
[FUNCTION_OPEN_TYPE.QIJIESHILIAN] = {
id = FUNCTION_OPEN_TYPE.QIJIESHILIAN, --七界试炼
objName = "expedition",
nameImg = "f_fuben_fubenming_10",
btnPos = Vector2(39, -67),
redPointType = RedPointType.QiJieShiLian,
effect1 = "Fx_DaNaoTianGong",
effect2 = "Fx_DaNaoTianGong_S",
},
[FUNCTION_OPEN_TYPE.QIJIESHILIAN] = {
id = FUNCTION_OPEN_TYPE.QIJIESHILIAN, --七界试炼
objName = "expedition",
nameImg = "f_fuben_fubenming_10",
btnPos = Vector2(39, -67),
redPointType = RedPointType.QiJieShiLian,
effect1 = "Fx_DaNaoTianGong",
effect2 = "Fx_DaNaoTianGong_S",
},
[FUNCTION_OPEN_TYPE.PEOPLE_MIRROR] = {
id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕
objName = "xuanyuan",
@ -86,15 +85,15 @@ local carbonData = {
-- effect1 = "Fx_SenLuoHuanJjing",
-- effect2 = "Fx_SenLuoHuanJjing_S",
-- },
[FUNCTION_OPEN_TYPE.LINGMAIMIJING] = {
id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境
objName = "lingmai",
nameImg = "f_fuben_fubenming_09",
btnPos = Vector2(-17,28),
redPointType = RedPointType.LingMaiMiJing,
effect1 = "Fx_SenLuoHuanJjing",
effect2 = "Fx_SenLuoHuanJjing_S",
},
[FUNCTION_OPEN_TYPE.LINGMAIMIJING] = {
id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境
objName = "lingmai",
nameImg = "f_fuben_fubenming_09",
btnPos = Vector2(-17, 28),
redPointType = RedPointType.LingMaiMiJing,
effect1 = "Fx_SenLuoHuanJjing",
effect2 = "Fx_SenLuoHuanJjing_S",
},
[FUNCTION_OPEN_TYPE.GodsWayTower_1] = {
id = FUNCTION_OPEN_TYPE.GodsWayTower_1, --多队塔
objName = "other",

View File

@ -143,7 +143,8 @@ function this:InitComponent()
--鸿蒙
this.btnHongMeng = Util.GetGameObject(self.gameObject, "RightDown/btnHongMeng")
this.btnDiaoyan = Util.GetGameObject(self.gameObject, "RightDown/btnDiaoyan")
Util.GetGameObject(self.gameObject, "RightDown/btnDiaoyan/Image/name"):GetComponent("Text").text = GetLanguageStrById("调研问卷")
Util.GetGameObject(self.gameObject, "RightDown/btnDiaoyan/Image/name"):GetComponent("Text").text = GetLanguageStrById(
"调研问卷")
--this.btnHongMeng:SetActive(false)
this.HongMengRedPoint = Util.GetGameObject(this.btnHongMeng, "redPoint")
@ -1072,6 +1073,7 @@ end
function this.CreatActivity()
for k, v in ipairs(activitys) do
--LogError("===========活动id:"..tostring(v.Id))
if not activityTabs[k] then
activityTabs[k] = {}
local root = this.RightUp
@ -1516,7 +1518,7 @@ function this.OnUpdate()
--主城人物层级处理
this.OnMainPlayerNPCRefresh()
this.CheckScreenRightRedPoint()
if tenmini == false and ((PlayerManager.serverTime - initTime)>600) then
if tenmini == false and ((PlayerManager.serverTime - initTime) > 600) then
tenmini = true
SubmitExtraData({ type = SDKSubMitType.TYPE_CUSTOM, roleLevelUpTime = "ten_minutes" })
end

View File

@ -236,8 +236,12 @@ function RecruitEquipPanelNew:UpdataWishPanel()
self.wishNoOpen.gameObject:SetActive(true)
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn, true)
self.wishText.text = string.format("%s/%s", wishLv, data)
self.wishTipIma.text = Language[12581] .. data .. Language[12582]
--self.wishText.text = string.format("%s/%s", wishLv, data)
--self.wishTipIma.text = Language[12581] .. data .. Language[12582]
local wishData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig, "Level", data,
"LotteryType", 4)
self.wishText.text = string.format("%s/%s", RecruitManager.drawTimes[4] or 0, wishData.DrawCardNumber)
self.wishTipIma.text = "召唤次数达到" .. wishData.DrawCardNumber .. "次后开启心愿功能,\n将有更高概率获得心愿法宝~"
else
self.wishNoOpen.gameObject:SetActive(false)
self.wishOpen.gameObject:SetActive(true)
@ -278,8 +282,12 @@ function RecruitEquipPanelNew:UpdataWishPanel()
self.wishNoOpen.gameObject:SetActive(true)
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn, true)
self.wishText.text = string.format("%s/%s", 0, data)
self.wishTipIma.text = Language[12581] .. data .. Language[12582]
--self.wishText.text = string.format("%s/%s", 0, data)
--self.wishTipIma.text = Language[12581] .. data .. Language[12582]
local wishData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig, "Level", data,
"LotteryType", 4)
self.wishText.text = string.format("%s/%s", RecruitManager.drawTimes[4] or 0, wishData.DrawCardNumber)
self.wishTipIma.text = "召唤次数达到" .. wishData.DrawCardNumber .. "次后开启心愿功能,\n将有更高概率获得心愿法宝~"
end
--self:CheckNewWishHero()
end)

View File

@ -234,8 +234,12 @@ function RecruitPanelNew:UpdataWishPanel()
self.wishNoOpen.gameObject:SetActive(true)
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn, true)
self.wishText.text = string.format("%s/%s", wishLv, data)
self.wishTipIma.text = Language[12581] .. data .. Language[12587]
--self.wishText.text = string.format("%s/%s", wishLv, data)
--self.wishTipIma.text = Language[12581] .. data .. Language[12587]
local wishData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig, "Level", data,
"LotteryType", 1)
self.wishText.text = string.format("%s/%s", RecruitManager.drawTimes[1] or 0, wishData.DrawCardNumber)
self.wishTipIma.text = "召唤次数达到" .. wishData.DrawCardNumber .. "次后开启心愿功能,\n将有更高概率获得心愿英雄~"
else
self.wishNoOpen.gameObject:SetActive(false)
self.wishOpen.gameObject:SetActive(true)
@ -277,8 +281,12 @@ function RecruitPanelNew:UpdataWishPanel()
self.wishNoOpen.gameObject:SetActive(true)
self.wishOpen.gameObject:SetActive(false)
Util.SetGray(self.wishBtn, true)
self.wishText.text = string.format("%s/%s", 0, data)
self.wishTipIma.text = Language[12588]
--self.wishText.text = string.format("%s/%s", 0, data)
--self.wishTipIma.text = Language[12588]
local wishData = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig, "Level", data,
"LotteryType", 1)
self.wishText.text = string.format("%s/%s", RecruitManager.drawTimes[1] or 0, wishData.DrawCardNumber)
self.wishTipIma.text = "召唤次数达到" .. wishData.DrawCardNumber .. "次后开启心愿功能,\n将有更高概率获得心愿英雄~"
end
--self:CheckNewWishHero()
end)