zhangjiannan 2025-04-03 20:07:22 +08:00
parent ad7f3dd098
commit 2200de75fc
6 changed files with 876 additions and 762 deletions

View File

@ -16,12 +16,13 @@ local isChooseOne = false
local costHourGlass = 0
local costDemonCrystal = 0
local costDemonCrystalNum = 0
local sayInfo = { GetLanguageStrById(10046), GetLanguageStrById(10047), GetLanguageStrById(10048), GetLanguageStrById(10049), GetLanguageStrById(10050) }
local sayInfo = { GetLanguageStrById(10046), GetLanguageStrById(10047), GetLanguageStrById(10048), GetLanguageStrById(10049),
GetLanguageStrById(10050) }
--初始化组件(用于子类重写)
function AdventureMainPanel:InitComponent()
this.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
this.helpBtn = Util.GetGameObject(self.gameObject, "helpBtn")
this.helpPosition=this.helpBtn:GetComponent("RectTransform").localPosition
this.helpPosition = this.helpBtn:GetComponent("RectTransform").localPosition
this.alienInvasionBtn = Util.GetGameObject(self.gameObject, "right/alienInvasionBtn")
this.alienInvasionRedPoint = Util.GetGameObject(self.gameObject, "right/alienInvasionBtn/redPoint")
this.grid = Util.GetGameObject(self.gameObject, "ScrollRect/grid")
@ -35,24 +36,29 @@ function AdventureMainPanel:InitComponent()
this.reward2NumberText = Util.GetGameObject(self.gameObject, "top/reward2bg/reward2NumberText"):GetComponent("Text")
this.expeditionsBtn = Util.GetGameObject(self.gameObject, "right/expeditionsBtn")
this.costItemImage = Util.GetGameObject(self.gameObject, "right/costItem"):GetComponent("Image")
this.costItem= Util.GetGameObject(self.gameObject, "right/costItem")
this.costItem = Util.GetGameObject(self.gameObject, "right/costItem")
this.costNumerText = Util.GetGameObject(self.gameObject, "right/costItem/costNumerText"):GetComponent("Text")
this.BtView = SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform)
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft })
this.adventureFastBattle = Util.GetGameObject(self.gameObject, "right/Text"):GetComponent("Text")
this.sayInfoImageBg = Util.GetGameObject(self.gameObject, "ScrollRect/grid/head/sayInfoImageBg")
this.sayInfoText = Util.GetGameObject(self.gameObject, "ScrollRect/grid/head/sayInfoImageBg/Text"):GetComponent("Text")
this.sayInfoText = Util.GetGameObject(self.gameObject, "ScrollRect/grid/head/sayInfoImageBg/Text"):GetComponent(
"Text")
this.monsterBtn = Util.GetGameObject(self.gameObject, "ScrollRect/grid/head/live2d/monsterBtn")
this.GetAllRewardEffect = Util.GetGameObject(self.transform, "effect_yijianlingqu")
this.hourGlassText = Util.GetGameObject(self.gameObject, "right/expeditionsBtn/hourGlassImage/hourGlassText"):GetComponent("Text")
this.hourGlassText = Util.GetGameObject(self.gameObject, "right/expeditionsBtn/hourGlassImage/hourGlassText")
:GetComponent("Text")
this.popUpView1 = Util.GetGameObject(self.gameObject, "PopUpViewTip")
this.popUpViewBtn1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/fastBattleBtn")
this.popUpViewItem1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item1")
this.popUpViewItemNumber1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item1/numberText"):GetComponent("Text")
this.popUpViewItemNumber1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item1/numberText"):GetComponent(
"Text")
this.popUpViewItem2 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item2")
this.popUpViewItemNumber2 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item2/numberText"):GetComponent("Text")
this.popUpViewItemNumber2 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item2/numberText"):GetComponent(
"Text")
this.popUpViewBtnBack1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/btnBack")
this.remainNumber = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item1/numberText (1)"):GetComponent("Text")
this.remainNumber = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/item1/numberText (1)"):GetComponent(
"Text")
this.chooseImage1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/chooseImage1")
this.chooseImage2 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/chooseImage2")
this.btn1 = Util.GetGameObject(self.gameObject, "PopUpViewTip/Image/btn1")
@ -60,18 +66,22 @@ function AdventureMainPanel:InitComponent()
this.popUpView2 = Util.GetGameObject(self.gameObject, "PopUpViewTip2")
this.popUpViewBtnBack2 = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/btnBack")
this.costItemIcon = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/costItemIcon"):GetComponent("Image")
this.costItemNumber = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/costItemIcon/costNumber"):GetComponent("Text")
this.costItemNumber = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/costItemIcon/costNumber")
:GetComponent("Text")
this.Toggle = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/Toggle"):GetComponent("Toggle")
this.btnSureCost = Util.GetGameObject(self.gameObject, "PopUpViewTip2/Image/sureBtn")
this.callMonsterBtn = Util.GetGameObject(self.gameObject, "right/callMonsterBtn")
this.callMonsterText = Util.GetGameObject(self.gameObject, "right/callMonsterBtn/callMonsterImage/callMonsterText"):GetComponent("Text")
this.remaindTimeText= Util.GetGameObject(self.gameObject, "right/callMonsterBtn/remaindTimeText"):GetComponent("Text")
this.freeText=Util.GetGameObject(self.gameObject, "right/freeText"):GetComponent("Text")
this.callMonsterRedPoint=Util.GetGameObject(self.gameObject, "right/callMonsterBtn/redPoint")
this.expeditionRedPoint=Util.GetGameObject(self.gameObject, "right/expeditionsBtn/redPoint")
this.callMonsterText = Util.GetGameObject(self.gameObject, "right/callMonsterBtn/callMonsterImage/callMonsterText")
:GetComponent("Text")
this.remaindTimeText = Util.GetGameObject(self.gameObject, "right/callMonsterBtn/remaindTimeText"):GetComponent(
"Text")
this.freeText = Util.GetGameObject(self.gameObject, "right/freeText"):GetComponent("Text")
this.callMonsterRedPoint = Util.GetGameObject(self.gameObject, "right/callMonsterBtn/redPoint")
this.expeditionRedPoint = Util.GetGameObject(self.gameObject, "right/expeditionsBtn/redPoint")
--花费时光沙漏的次数
this.adventureFastBattle.text = GetLanguageStrById(10051) .. AdventureManager.adventureFastBattle / 3600 .. GetLanguageStrById(10052)
this.adventureFastBattle.text = GetLanguageStrById(10051) ..
AdventureManager.adventureFastBattle / 3600 .. GetLanguageStrById(10052)
local count = AdventureManager.GetStoneFastBattleCount()
local hasCostNumber = count + 1
costDemonCrystal = StoreConfig[10015].Cost[2]
@ -82,11 +92,12 @@ function AdventureMainPanel:InitComponent()
else
cost = costDemonCrystal[costDemonCrystalNum]
end
this.costNumerText.text = "×" .. cost .. GetLanguageStrById(10053) .. AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10054)
this.costNumerText.text = "×" ..
cost .. GetLanguageStrById(10053) .. AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10054)
for i = #AdventureManager.Data, 1, -1 do
local go1 = newObject(self.item)
go1.name = "itemPro" .. i
go1.transform:SetParent(this.grid.transform)
go1.transform.localScale = Vector3.one
go1.transform.localPosition = Vector3.zero
@ -105,7 +116,7 @@ function AdventureMainPanel:InitComponent()
-- 创建循环列表
local rootHight = this.scrollRoot.transform.rect.height
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollRoot.transform,
this.chatItem, nil, Vector2.New(1080, rootHight), 1, 1, Vector2.New(0, 8))
this.chatItem, nil, Vector2.New(1080, rootHight), 1, 1, Vector2.New(0, 8))
this.ScrollView.moveTween.MomentumAmount = 1
this.ScrollView.moveTween.Strength = 2
-- 刷新聊天信息
@ -152,15 +163,19 @@ function AdventureMainPanel:OnRefreshPopUpData()
if (this.hourGlassNumber < costHourGlass or BagManager.GetItemCountById(StoreConfig[10015].Cost[1][1]) < cost) then
this.popUpView1:SetActive(false)
end
this.popUpViewItemNumber1.text = PrintWanNum(BagManager.GetItemCountById(StoreConfig[10015].Cost[1][1])) .. "/" .. cost
this.remainNumber.text = GetLanguageStrById(10055) .. AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10056)
this.popUpViewItemNumber2.text = PrintWanNum(BagManager.GetItemCountById(StoreConfig[10008].Cost[1][1])) .. "/" .. costHourGlass
this.popUpViewItemNumber1.text = PrintWanNum(BagManager.GetItemCountById(StoreConfig[10015].Cost[1][1])) ..
"/" .. cost
this.remainNumber.text = GetLanguageStrById(10055) ..
AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10056)
this.popUpViewItemNumber2.text = PrintWanNum(BagManager.GetItemCountById(StoreConfig[10008].Cost[1][1])) ..
"/" .. costHourGlass
end
function AdventureMainPanel:ShowTestLiveGO()
--TODO:动态加载立绘
self.preList = poolManager:LoadLive("live2d_m_syjm_0026", Util.GetTransform(self.transform, "ScrollRect/grid/head/live2d"),
Vector3.New(0.36, 0.36, 1), Vector3.New(8, -311, 0))
self.preList = poolManager:LoadLive("live2d_m_syjm_0026",
Util.GetTransform(self.transform, "ScrollRect/grid/head/live2d"),
Vector3.New(0.36, 0.36, 1), Vector3.New(8, -311, 0))
end
--绑定事件(用于子类重写)
@ -171,7 +186,7 @@ function AdventureMainPanel:BindEvent()
end)
--帮助按钮
Util.AddClick(this.helpBtn, function()
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.Adventure,this.helpPosition.x,this.helpPosition.y)
UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Adventure, this.helpPosition.x, this.helpPosition.y)
end)
--点击塔顶怪物
Util.AddClick(this.monsterBtn, function()
@ -189,10 +204,11 @@ function AdventureMainPanel:BindEvent()
--点击召唤首领按钮
Util.AddClick(this.callMonsterBtn, function()
if(AdventureManager.callAlianInvasionTime>=1) then
if (AdventureManager.callAlianInvasionTime >= 1) then
AdventureManager.CallAlianInvasionRequest(function()
this:OnRefreshRedPoint()
this.callMonsterText.text = AdventureManager.callAlianInvasionTime.."/"..AdventureManager.callAlianInvasionTotalTime
this.callMonsterText.text = AdventureManager.callAlianInvasionTime ..
"/" .. AdventureManager.callAlianInvasionTotalTime
end)
else
PopupTipPanel.ShowTipByLanguageId(10057)
@ -329,7 +345,6 @@ function AdventureMainPanel:BindEvent()
end
end)
Util.AddClick(this.btnSureCost, function()
--探险次数不充足或妖晶不充足
local isShow = this.Toggle.isOn
if (isShow == true) then
@ -342,13 +357,9 @@ function AdventureMainPanel:BindEvent()
end)
Util.AddClick(this.popUpViewBtnBack1, function()
this.popUpView1:SetActive(false)
end)
Util.AddClick(this.popUpViewBtnBack2, function()
this.popUpView2:SetActive(false)
end)
Util.AddClick(this.btn1, function()
this.chooseImage1:SetActive(true)
@ -366,7 +377,7 @@ function AdventureMainPanel:BindEvent()
end
-- 绑定红点
BindRedPointObject(RedPointType.SecretTer_Boss, this.alienInvasionRedPoint) -- 外敌boss红点服务器红点
BindRedPointObject(RedPointType.SecretTer_Boss, this.alienInvasionRedPoint) -- 外敌boss红点服务器红点
end
function AdventureMainPanel:RefreshBoxRedState()
@ -418,13 +429,14 @@ function AdventureMainPanel:RefreshExpeditionsData()
else
cost = costDemonCrystal[costDemonCrystalNum]
end
this.costNumerText.text = "×" .. cost .. GetLanguageStrById(10053) .. AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10054)
this.costNumerText.text = "×" ..
cost .. GetLanguageStrById(10053) .. AdventureManager.fastBattlePrivilegeNumber .. GetLanguageStrById(10054)
AdventureManager.isSuccess = false
if (AdventureManager.GetSandFastBattleCount() ~= 0) then
this.freeText.text=GetLanguageStrById(10061)
this.freeText.text = GetLanguageStrById(10061)
this.costItem:SetActive(false)
else
this.freeText.text=""
this.freeText.text = ""
this.costItem:SetActive(true)
end
end
@ -439,7 +451,6 @@ function AdventureMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Adventure.MonsterSayInfo, this.MonsterSayInfo)
Game.GlobalEvent:AddEvent(GameEvent.Guide.GuidePanelScrollViewPos, this.GuideResult)
Game.GlobalEvent:AddEvent(GameEvent.Adventure.CallAlianInvasionTime, this.CallAlianInvasionTimeCountDown)
end
--移除事件监听(用于子类重写)
@ -453,6 +464,7 @@ function AdventureMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Guide.GuidePanelScrollViewPos, this.GuideResult)
Game.GlobalEvent:RemoveEvent(GameEvent.Adventure.CallAlianInvasionTime, this.CallAlianInvasionTimeCountDown)
end
--界面打开时调用(用于子类重写)
function AdventureMainPanel:OnOpen(...)
-- 音效
@ -475,7 +487,7 @@ function AdventureMainPanel:OnSortingOrderChange()
end
function AdventureMainPanel:OnShow()
AdventureManager.isEnterAdventure=true
AdventureManager.isEnterAdventure = true
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.AdventureTimes })
this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.SecretTerritoryPanel })
this:OnRefreshData()
@ -486,10 +498,10 @@ function AdventureMainPanel:OnShow()
this.chooseImage2:SetActive(not isChooseOne)
--AdventureManager.OnFlushShowData()
if (AdventureManager.GetSandFastBattleCount() ~= 0) then
this.freeText.text=GetLanguageStrById(10061)
this.freeText.text = GetLanguageStrById(10061)
this.costItem:SetActive(false)
else
this.freeText.text=""
this.freeText.text = ""
this.costItem:SetActive(true)
end
this.ChatMsgUpdate()
@ -502,25 +514,24 @@ function AdventureMainPanel:OnShow()
end
--刷新红点
function AdventureMainPanel:OnRefreshRedPoint()
if(AdventureManager.callAlianInvasionTime>=1) then
this.callMonsterRedPoint:SetActive(true)
else
this.callMonsterRedPoint:SetActive(false)
end
this.hourGlassNumber = BagManager.GetItemCountById(StoreConfig[10008].Cost[1][1])
if(AdventureManager.GetSandFastBattleCount() ~= 0 or this.hourGlassNumber>=1) then
this.expeditionRedPoint:SetActive(true)
else
this.expeditionRedPoint:SetActive(false)
end
end
function AdventureMainPanel:OnRefreshRedPoint()
if (AdventureManager.callAlianInvasionTime >= 1) then
this.callMonsterRedPoint:SetActive(true)
else
this.callMonsterRedPoint:SetActive(false)
end
this.hourGlassNumber = BagManager.GetItemCountById(StoreConfig[10008].Cost[1][1])
if (AdventureManager.GetSandFastBattleCount() ~= 0 or this.hourGlassNumber >= 1) then
this.expeditionRedPoint:SetActive(true)
else
this.expeditionRedPoint:SetActive(false)
end
end
--刷新主页数据
function AdventureMainPanel:OnRefreshData()
this.callMonsterText.text = AdventureManager.callAlianInvasionTime.."/"..AdventureManager.callAlianInvasionTotalTime
this.callMonsterText.text = AdventureManager.callAlianInvasionTime ..
"/" .. AdventureManager.callAlianInvasionTotalTime
this.grid:GetComponent("RectTransform").localPosition = Vector2.New(0, 4631.2)
this.attackTimesText:GetComponent("Text").text = AdventureManager.canAttackBossTimes
this.hourGlassNumber = BagManager.GetItemCountById(StoreConfig[10008].Cost[1][1])
@ -540,8 +551,10 @@ function AdventureMainPanel:OnRefreshData()
local data = AdventureManager.Data[i]
viewList[i]:OnRefreshData()
if (PlayerManager.level >= data.OpenLevel[1] and data.isAttackBoosSuccess == 1) then
this.reward1NumberAll = RewardGroup[data.baseRewardGroup[1][data.areaLevel]].ShowItem[2][2] + this.reward1NumberAll
this.reward2NumberAll = RewardGroup[data.baseRewardGroup[1][data.areaLevel]].ShowItem[1][2] + this.reward2NumberAll
this.reward1NumberAll = RewardGroup[data.baseRewardGroup[1][data.areaLevel]].ShowItem[2][2] +
this.reward1NumberAll
this.reward2NumberAll = RewardGroup[data.baseRewardGroup[1][data.areaLevel]].ShowItem[1][2] +
this.reward2NumberAll
end
end
this.reward1NumberAll = this.reward1NumberAll + math.floor(AdventureManager.vipAddBaseGift * this.reward1NumberAll)
@ -549,13 +562,20 @@ function AdventureMainPanel:OnRefreshData()
for i = #AdventureManager.Data, 1, -1 do
local j = #AdventureManager.Data + 1 - i
if (PlayerManager.level < AdventureManager.Data[j].OpenLevel[1]) then
Util.GetGameObject(goList[j], "lock/unLockLevelText"):GetComponent("Text").text = AdventureManager.Data[j].OpenLevel[1] .. GetLanguageStrById(10062)
Util.GetGameObject(goList[j], "lock/unLockLevelText"):GetComponent("Text").text = string.format(
GetLanguageStrById(10062), AdventureManager.Data[j].OpenLevel[1])
break
end
end
if (AdventureManager.vipAddBaseGift * 100 ~= 0) then
this.reward1NumberText.text = " ×" .. this.reward1NumberAll .. string.format("<color=#F5C66BFF>(+%s</color>", AdventureManager.vipAddBaseGift * 100) .. "<color=#F5C66BFF>%)</color>" .. GetLanguageStrById(10063)
this.reward2NumberText.text = " ×" .. this.reward2NumberAll .. string.format("<color=#F5C66BFF>(+%s</color>", AdventureManager.vipAddBaseGift * 100) .. "<color=#F5C66BFF>%)</color>" .. GetLanguageStrById(10063)
this.reward1NumberText.text = " ×" ..
this.reward1NumberAll ..
string.format("<color=#F5C66BFF>(+%s</color>", AdventureManager.vipAddBaseGift * 100) ..
"<color=#F5C66BFF>%)</color>" .. GetLanguageStrById(10063)
this.reward2NumberText.text = " ×" ..
this.reward2NumberAll ..
string.format("<color=#F5C66BFF>(+%s</color>", AdventureManager.vipAddBaseGift * 100) ..
"<color=#F5C66BFF>%)</color>" .. GetLanguageStrById(10063)
else
this.reward1NumberText.text = " ×" .. this.reward1NumberAll .. GetLanguageStrById(10063)
this.reward2NumberText.text = " ×" .. this.reward2NumberAll .. GetLanguageStrById(10063)
@ -579,7 +599,8 @@ function this.TimeFormat(time, k)
AdventureManager.Data[k].bossRemainTime = -1
this:OnRefreshData()
end
Util.GetGameObject(goList[k], "haveAttackunLock/bossAppear/bossAppearCountDown"):GetComponent("Text").text = string.format("%02d:%02d:%02d",hour, min, sec)
Util.GetGameObject(goList[k], "haveAttackunLock/bossAppear/bossAppearCountDown"):GetComponent("Text").text = string
.format("%02d:%02d:%02d", hour, min, sec)
end
--更新宝箱状态
@ -629,25 +650,25 @@ function this.ChatNodeAdapter(node, data)
local monsterId = monsterGroup[data.bossGroupId].Contents[1][1]
local monsterInfo = monsterConfig[monsterId]
local bossName = GetLanguageStrById(monsterInfo.ReadingName)
local isCanClick=true
for i,v in ipairs(AdventureManager.hasKilledId) do
if(data.bossId==v) then
content:GetComponent("Text").text =string.format(GetLanguageStrById(10064), areaName, bossName)
isCanClick=false
local isCanClick = true
for i, v in ipairs(AdventureManager.hasKilledId) do
if (data.bossId == v) then
content:GetComponent("Text").text = string.format(GetLanguageStrById(10064), areaName, bossName)
isCanClick = false
end
end
if(isCanClick) then
if (isCanClick) then
content:GetComponent("Text").text = string.format(GetLanguageStrById(10065), areaName, bossName)
-- 点击事件监听
Util.AddOnceClick(content, function()
local isCanClick=true
for i,v in ipairs(AdventureManager.hasKilledId) do
if(data.bossId==v) then
content:GetComponent("Text").text =string.format(GetLanguageStrById(10064), areaName, bossName)
isCanClick=false
local isCanClick = true
for i, v in ipairs(AdventureManager.hasKilledId) do
if (data.bossId == v) then
content:GetComponent("Text").text = string.format(GetLanguageStrById(10064), areaName, bossName)
isCanClick = false
end
end
if(isCanClick) then
if (isCanClick) then
UIManager.OpenPanel(UIName.FormationPanel, FORMATION_TYPE.ADVENTURE_BOSS, data)
end
end)
@ -673,25 +694,31 @@ function AdventureMainPanel:OnDestroy()
-- 清除红点绑定的物体
ClearRedPointObject(RedPointType.SecretTer_Boss)
end
--怪物进行说话
function this.MonsterSayInfo(arenaId)
this.grid:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 1082.807)
local bosssName = GetLanguageStrById(monsterConfig[monsterGroup[AdventureManager.Data[arenaId].systemBoss].Contents[1][1]].ReadingName)
local bosssName = GetLanguageStrById(monsterConfig
[monsterGroup[AdventureManager.Data[arenaId].systemBoss].Contents[1][1]].ReadingName)
this.sayInfoImageBg:SetActive(true)
this.sayInfoText.text = GetLanguageStrById(10066) .. string.format("<color=#F5C66CFF>%s</color>", bosssName) .. GetLanguageStrById(10067) .. string.format(GetLanguageStrById(10068), AdventureManager.Data[arenaId].areaName .. AdventureManager.Data[arenaId].areaLevel)
this.sayInfoText.text = GetLanguageStrById(10066) ..
string.format("<color=#F5C66CFF>%s</color>", bosssName) ..
GetLanguageStrById(10067) ..
string.format(GetLanguageStrById(10068),
AdventureManager.Data[arenaId].areaName .. AdventureManager.Data[arenaId].areaLevel)
end
function this.GuideResult()
this.grid.transform:DOLocalMoveY(4631.2, 0.6, false):OnComplete(function()
AdventureManager.Data[1].stateTime = AdventureManager.adventureRefresh
end)
end
--跳转显示新手提示圈
function this.ShowGuideGo()
JumpManager.ShowGuide(UIName.AdventureMainPanel, this.expeditionsBtn)
end
--外敌次数恢复时间倒计时
function this.CallAlianInvasionTimeCountDown(remainTime)
local hour = 0
@ -709,11 +736,12 @@ function this.CallAlianInvasionTimeCountDown(remainTime)
if (remainTime == 0) then
this.remaindTimeText.text = "00:00:00"
end
if(remainTime==AdventureManager.callAlianInvasionCountDownTime) then
if (remainTime == AdventureManager.callAlianInvasionCountDownTime) then
this:OnRefreshRedPoint()
CheckRedPointStatus(RedPointType.SecretTer_CallAlianInvasionTime)
end
this.callMonsterText.text = AdventureManager.callAlianInvasionTime.."/"..AdventureManager.callAlianInvasionTotalTime
this.callMonsterText.text = AdventureManager.callAlianInvasionTime ..
"/" .. AdventureManager.callAlianInvasionTotalTime
end
return AdventureMainPanel
return AdventureMainPanel

View File

@ -1,13 +1,13 @@
TalismanManager = {};
local this = TalismanManager
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig)
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
local equipTalismana = ConfigManager.GetConfig(ConfigName.EquipTalismana)
local equipTalismanaRankup = ConfigManager.GetConfig(ConfigName.EquipTalismanaRankup)
local propertyConfig=ConfigManager.GetConfig(ConfigName.PropertyConfig)
local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig)
this.lv=0--默认法宝等级
this.talismanDatas={}
this.lv = 0 --默认法宝等级
this.talismanDatas = {}
this.talismanTabs = {}
this.AllTalismanStartStar = {}
@ -18,6 +18,7 @@ local GameSettingTalismanOpenVal = 0
function this.Initialize()
end
--初始化更新法宝数据
-- function this.InitUpdateTalismanData(msg)
-- if msg and #msg > 0 then
@ -46,32 +47,35 @@ end
-- end
-- end
--获取全部
function this.GetAllTalismanData(isAddUpHero,heroDid)
function this.GetAllTalismanData(isAddUpHero, heroDid)
local talismans = {}
for i, v in pairs(this.talismanTabs) do
if isAddUpHero then
table.insert(talismans,v)
table.insert(talismans, v)
else
if v.upHeroDid == "0" and heroDid and v.upHeroDid == heroDid then
table.insert(talismans,v)
table.insert(talismans, v)
end
end
end
table.sort(talismans, function(a,b) return a.backData.equipId < b.backData.equipId end)
table.sort(talismans, function(a, b) return a.backData.equipId < b.backData.equipId end)
return talismans
end
--设置法宝穿戴的英雄
function this.SetTalismanUpHeroDid(talismanDid,heroDid)
function this.SetTalismanUpHeroDid(talismanDid, heroDid)
if this.talismanTabs[talismanDid] then
this.talismanTabs[talismanDid].upHeroDid=heroDid
this.talismanTabs[talismanDid].upHeroDid = heroDid
end
end
--设置法宝穿戴的星级
function this.SetLv(lv,did)
function this.SetLv(lv, did)
-- if not this.talismanDatas[did] then
this.talismanDatas[did]=lv
this.talismanDatas[did] = lv
-- end
end
--获取单个法宝信息
function this.GetSingleTalismanData(talismanDid)
if this.talismanTabs[talismanDid] then
@ -79,37 +83,41 @@ function this.GetSingleTalismanData(talismanDid)
end
return nil
end
--删除单个法宝信息
function this.DeleteSingleTalismanData(talismanDids)
for i = 1, #talismanDids do
if this.talismanTabs[talismanDids[i]] then
this.talismanTabs[talismanDids[i]] = nil
end
end
end
--计算战斗力
function this.CalculateWarForceBySid(sId,star,heroPos)
local curTalismanConFigData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId", sId, "Level", star)
return this.CalculateWarForceBase(curTalismanConFigData,heroPos)
function this.CalculateWarForceBySid(sId, star, heroPos)
local curTalismanConFigData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId", sId,
"Level", star)
return this.CalculateWarForceBase(curTalismanConFigData, heroPos)
end
--计算战斗力
function this.CalculateWarForce(talismanDid,heroPos)
local curTalisman = this.talismanTabs[talismanDid]
function this.CalculateWarForce(talismanDid, heroPos)
local curTalisman = this.talismanTabs[talismanDid]
if curTalisman then
local curTalismanConFigData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId", curTalisman.id, "Level", curTalisman.star)
return this.CalculateWarForceBase(curTalismanConFigData,heroPos)
local curTalismanConFigData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId",
curTalisman.id, "Level", curTalisman.star)
return this.CalculateWarForceBase(curTalismanConFigData, heroPos)
end
end
function this.CalculateWarForceBase(curTalismanConFigData,heroPos)
function this.CalculateWarForceBase(curTalismanConFigData, heroPos)
if curTalismanConFigData then
local addAllProVal = {}
--主属性
for i = 1, #curTalismanConFigData.Property do
if addAllProVal[curTalismanConFigData.Property[i][1]] then
addAllProVal[curTalismanConFigData.Property[i][1]] = addAllProVal[curTalismanConFigData.Property[i][1]] +
curTalismanConFigData.Property[i][2]
curTalismanConFigData.Property[i][2]
else
addAllProVal[curTalismanConFigData.Property[i][1]] = curTalismanConFigData.Property[i][2]
end
@ -117,31 +125,33 @@ function this.CalculateWarForceBase(curTalismanConFigData,heroPos)
--副属性
if curTalismanConFigData.SpecialProperty and #curTalismanConFigData.SpecialProperty > 0 then
for i = 1, #curTalismanConFigData.SpecialProperty do
if curTalismanConFigData.SpecialProperty[i][1] == 1 then--是属性
if curTalismanConFigData.SpecialProperty[i][1] == 1 then --是属性
if heroPos == 0 or heroPos == curTalismanConFigData.SpecialProperty[i][2] then
if addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] then
addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] = addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] +
curTalismanConFigData.SpecialProperty[i][4]
addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] = addAllProVal
[curTalismanConFigData.SpecialProperty[i][3]] +
curTalismanConFigData.SpecialProperty[i][4]
else
addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] = curTalismanConFigData.SpecialProperty[i][4]
addAllProVal[curTalismanConFigData.SpecialProperty[i][3]] = curTalismanConFigData
.SpecialProperty[i][4]
end
end
end
end
end
local heroPropertyScore={}
local heroPropertyScore = {}
for i, v in ConfigPairs(propertyConfig) do
heroPropertyScore[i]=v.Score
heroPropertyScore[i] = v.Score
end
local powerEndVal=0
local powerEndVal = 0
for i, v in pairs(addAllProVal) do
if v > 0 then
local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig,i)
local curProConfigData = ConfigManager.GetConfigData(ConfigName.PropertyConfig, i)
if curProConfigData then
if curProConfigData.Style == 1 then
powerEndVal=powerEndVal+v*heroPropertyScore[i]
powerEndVal = powerEndVal + v * heroPropertyScore[i]
else
powerEndVal=powerEndVal+v/100*heroPropertyScore[i]
powerEndVal = powerEndVal + v / 100 * heroPropertyScore[i]
end
end
end
@ -149,21 +159,22 @@ function this.CalculateWarForceBase(curTalismanConFigData,heroPos)
return math.floor(powerEndVal)
end
end
function this.GetAllTalismanByCondition(curTalismanData,upStarConFigData)
function this.GetAllTalismanByCondition(curTalismanData, upStarConFigData)
local GetAllTalismanByConditionList = {}
for i, v in pairs(this.talismanTabs) do
if v.upHeroDid == "0" and v.did ~= curTalismanData.did then
if v.upHeroDid == "0" and v.did ~= curTalismanData.did then
if v.star == upStarConFigData.StarLimit then
if upStarConFigData.Issame == 1 then--同名
if upStarConFigData.Issame == 1 then --同名
if v.id == curTalismanData.id then
table.insert(GetAllTalismanByConditionList,v)
table.insert(GetAllTalismanByConditionList, v)
end
elseif upStarConFigData.IsId ~= 0 then--指定id
elseif upStarConFigData.IsId ~= 0 then --指定id
if v.id == upStarConFigData.IsId then
table.insert(GetAllTalismanByConditionList,v)
table.insert(GetAllTalismanByConditionList, v)
end
else
table.insert(GetAllTalismanByConditionList,v)
table.insert(GetAllTalismanByConditionList, v)
end
end
end
@ -194,19 +205,19 @@ function this.GetStartAndEndStar()
end
--地图临时背包数据
this.mapShotTimeItemData={}
this.mapShotTimeItemData = {}
--地图临时英雄数据存储
function this.InitMapShotTimeTalismanBagData(_mapHero)
this.mapShotTimeItemData[#this.mapShotTimeItemData+1]=_mapHero
this.mapShotTimeItemData[#this.mapShotTimeItemData + 1] = _mapHero
end
--检查HeroConfig里英雄是否配了法宝
function this.CheckTalismanIsInConfig(curHeroData)
local isOpen = true
if heroConfig[curHeroData.id].EquipTalismana~=nil then
isOpen=true
if heroConfig[curHeroData.id].EquipTalismana ~= nil then
isOpen = true
else
isOpen=false
isOpen = false
end
return isOpen
end
@ -214,26 +225,28 @@ end
--获取当前英雄是否开启法宝
function this.GetCurHeroIsOpenTalisman(curHeroData)
local isOpen = false
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting,1)
local gameSettingConFig = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
GameSettingTalismanOpenType = gameSettingConFig.EquipTalismanaUnlock[1][1]
if heroConfig[curHeroData.id].EquipTalismana~=nil then
GameSettingTalismanOpenVal = heroConfig[curHeroData.id].EquipTalismana[1]
if heroConfig[curHeroData.id].EquipTalismana ~= nil then
GameSettingTalismanOpenVal = heroConfig[curHeroData.id].EquipTalismana[1]
end
if GameSettingTalismanOpenType == 1 then
if PlayerManager.level >= GameSettingTalismanOpenVal and heroConfig[curHeroData.id].EquipTalismana~=nil then
if PlayerManager.level >= GameSettingTalismanOpenVal and heroConfig[curHeroData.id].EquipTalismana ~= nil then
isOpen = true
end
elseif GameSettingTalismanOpenType == 2 and heroConfig[curHeroData.id].EquipTalismana~=nil then
if curHeroData.star >= heroConfig[curHeroData.id].EquipTalismana[1] then--如果走的英雄星级 判断heroconfig里的法宝星级
elseif GameSettingTalismanOpenType == 2 and heroConfig[curHeroData.id].EquipTalismana ~= nil then
if curHeroData.star >= heroConfig[curHeroData.id].EquipTalismana[1] then --如果走的英雄星级 判断heroconfig里的法宝星级
isOpen = true
end
end
return isOpen
end
function this.GetCurHeroIsOpenTalismanStr()
if GameSettingTalismanOpenType == 1 then
return GameSettingTalismanOpenVal .. GetLanguageStrById(10062)
return string.format(
GetLanguageStrById(10062), GameSettingTalismanOpenVal)
elseif GameSettingTalismanOpenType == 2 then
return NumToSimplenessFont[GameSettingTalismanOpenVal] .. GetLanguageStrById(10488)
end
@ -241,9 +254,11 @@ end
function this.GetCurHeroIsOpenTalismanTip()
if GameSettingTalismanOpenType == 1 then
return GameSettingTalismanOpenVal .. GetLanguageStrById(10062)
return string.format(
GetLanguageStrById(10062), GameSettingTalismanOpenVal)
elseif GameSettingTalismanOpenType == 2 then
return GetLanguageStrById(10489)..NumToSimplenessFont[GameSettingTalismanOpenVal] .. GetLanguageStrById(10490)
return GetLanguageStrById(10489) .. NumToSimplenessFont[GameSettingTalismanOpenVal] .. GetLanguageStrById(10490)
end
end
return this
return this

View File

@ -20,26 +20,25 @@ local CHATER_STATE = "CHATER_STATE"
local OLD_ID = "OLD_ID"
local isOpenRewardUpTip = false
function this.Initialize()
this.curOpenFight = 1011 -- 当前开启的关卡
this.lastPassFightId = 1011 -- 上一关的ID
this.curOpenFight = 1011 -- 当前开启的关卡
this.lastPassFightId = 1011 -- 上一关的ID
this.isBattleBack = false
this.HangOnTime = 0 -- 关卡挂机时长
this.HangOnTime = 0 -- 关卡挂机时长
this.curFightState = 0
this.oldLevel = 0 -- 玩家关卡战斗之前的等级
this.curFightMapId = 1011 -- 当前关卡对应的地图背景ID
this.oldLevel = 0 -- 玩家关卡战斗之前的等级
this.curFightMapId = 1011 -- 当前关卡对应的地图背景ID
this.isOutFight = false
this.isOpenNewChapter = false -- 是否开启新章节
this.isMaxChapter = false --是否最大章节
this.maxChapterNum = 15 --最大章节数
this.isOpenNewChapter = false -- 是否开启新章节
this.isMaxChapter = false --是否最大章节
this.maxChapterNum = 15 --最大章节数
this.isBeginFight = false
this.enterFightBattle = false -- 进入关卡战斗
this.ShowBtnJumpTime = ConfigManager.GetConfig(ConfigName.GameSetting)[1].JumpLevelTime
this.boxState = 0 -- 当前需要显示的宝箱
this.boxState = 0 -- 当前需要显示的宝箱
Game.GlobalEvent:AddEvent(GameEvent.Player.OnLevelChange, this.CheckFightRP)
-- Game.GlobalEvent:AddEvent(GameEvent.Mission.OnOpenEnableFight, this.CheckFightRP)
Game.GlobalEvent:AddEvent(GameEvent.Mission.OnOpenFight, this.CheckFightRP)
end
function this.CheckFightRP()
@ -48,7 +47,7 @@ end
-- 初始化关卡状态, state , 1 已开启未通过 2 :已通过 -1 已开启等级未解锁
function this.InitAllFightPointState(msg)
if msg.duration < 0 then
if msg.duration < 0 then
end
this.HangOnTime = msg.duration
@ -56,8 +55,9 @@ function this.InitAllFightPointState(msg)
this.curFightState = msg.state
this.adventrueEnemyList = msg.adventureBossInfo
this.HangOnReward = msg.reward
this.maxChapterNum = LengthOfTable(GameDataBase.SheetBase.GetKeys(ConfigManager.GetConfig(ConfigName.MainLevelSettingConfig)))
this.maxChapterNum = LengthOfTable(GameDataBase.SheetBase.GetKeys(ConfigManager.GetConfig(ConfigName
.MainLevelSettingConfig)))
end
-- 获取某一关卡的状态, 小于当前关卡必定已通关,大于必定未解锁
@ -171,8 +171,8 @@ function this.RefreshFightId(msg)
Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnOpenFight, oldFight)
--判断是否需要弹估计奖励提升界面
local oldLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.lastPassFightId)
local cirLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.curOpenFight)
local oldLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.lastPassFightId)
local cirLevelConFig = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.curOpenFight)
for i = 1, #cirLevelConFig.RewardShowMin do
local oldsinglePro = oldLevelConFig.RewardShowMin[i]
local cursinglePro = cirLevelConFig.RewardShowMin[i]
@ -198,20 +198,23 @@ function this.RefreshFightId(msg)
--if isOpen then
-- this.SetChapterOpenState(true)
--end
-- 发送关卡通关事件
--[[ Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnOpenFight, oldFight)]]
--[[ Game.GlobalEvent:DispatchEvent(GameEvent.Mission.OnOpenFight, oldFight)]]
--else
-- this.curFightState = 2
--end
--end
end
function this.GetIsOpenRewardUpTip()
return isOpenRewardUpTip
end
function this.SetIsOpenRewardUpTip(_isOpenRewardUpTip)
isOpenRewardUpTip = _isOpenRewardUpTip
end
function this.SetChapterOpenState(state)
this.isOpenNewChapter = state
local value = state and CHATER_OPEN or CHATER_CLOSE
@ -257,7 +260,7 @@ function this.IsCanFight(fightId)
if this.IsChapterClossState() then
-- 以防后端不校验,再来一次
if PlayerManager.level < mainLevelConfig[this.curOpenFight].LevelLimit then
return false, tostring(mainLevelConfig[this.curOpenFight].LevelLimit .. GetLanguageStrById(10062))
return false, string.format(GetLanguageStrById(10062), mainLevelConfig[this.curOpenFight].LevelLimit)
else -- 等级不足未通关时设置一下
if this.curFightState == -1 then
this.curFightState = 1
@ -268,8 +271,8 @@ function this.IsCanFight(fightId)
if state == FIGHT_POINT_STATE.OPEN_NOT_PASS then
return true, GetLanguageStrById(10599)
elseif state == FIGHT_POINT_STATE.OPEN_LOW_LEVEL then
return false, tostring(mainLevelConfig[this.curOpenFight].LevelLimit .. GetLanguageStrById(10062))
elseif state == FIGHT_POINT_STATE.PASS then -- 最后一关
return false, string.format(GetLanguageStrById(10062), mainLevelConfig[this.curOpenFight].LevelLimit)
elseif state == FIGHT_POINT_STATE.PASS then -- 最后一关
return false, GetLanguageStrById(10601)
end
else
@ -289,7 +292,7 @@ function this.GetBtnText()
-- 先判断等级
local limitLevel = mainLevelConfig[this.curOpenFight].LevelLimit
if PlayerManager.level < limitLevel then
return limitLevel .. GetLanguageStrById(10062)
return string.format(GetLanguageStrById(10062), limitLevel)
end
local offset = 1
@ -300,7 +303,7 @@ function this.GetBtnText()
-- 最后一关
local state = this.GetFightStateById(this.curOpenFight)
if state == FIGHT_POINT_STATE.PASS then -- 最后一关
if state == FIGHT_POINT_STATE.PASS then -- 最后一关
str = GetLanguageStrById(10604)
end
return str
@ -334,9 +337,9 @@ end
--- ===================== 战力相关的 =============================
---- 请求战斗
function this.ExecuteFightBattle(monsterGroupId, fightId, callBack)
NetManager.LevelStarFightDataRequest(monsterGroupId, fightId, function (msg)
NetManager.LevelStarFightDataRequest(monsterGroupId, fightId, function(msg)
hadUpdate = false
UIManager.OpenPanel(UIName.BattleStartPopup, function ()
UIManager.OpenPanel(UIName.BattleStartPopup, function()
local fightData = BattleManager.GetBattleServerData(msg, nil, fightId)
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.STORY_FIGHT, callBack)
end)
@ -370,7 +373,7 @@ end
function this.GetCurChapterIndex()
local curChapterId = math.floor(this.curOpenFight / 1000)
if not FightPointPassManager.isOpenNewChapter then
curChapterId = curChapterId-1
curChapterId = curChapterId - 1
if curChapterId == 0 then
curChapterId = 1
end
@ -399,13 +402,14 @@ end
function this.GetBattleMonsterGroup()
return mainLevelConfig[this.curOpenFight].MonsterGroup
end
--通过难度和章节获取该章节是否通过
function this.GetDifficultAndChapter(Difficult,Chapter)
function this.GetDifficultAndChapter(Difficult, Chapter)
-- 当前关卡难度
local curFightDiff = mainLevelConfig[this.curOpenFight].Difficulty
-- 当前章节难度
local curChapterId = math.floor(this.curOpenFight / 1000)
local state = 0--1 未开启 2 已开启 3 未通关 4 已通关
local state = 0 --1 未开启 2 已开启 3 未通关 4 已通关
if Difficult > curFightDiff then
state = 1
elseif Difficult == curFightDiff then
@ -422,14 +426,13 @@ function this.GetDifficultAndChapter(Difficult,Chapter)
return state
end
--获取立绘角色奔跑方向
function this.GetRoleDirection()
local data = {}
if not FightPointPassManager.IsChapterClossState() then
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.lastPassFightId)
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.lastPassFightId)
else
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.curOpenFight)
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.curOpenFight)
end
return data.RoleDirection
end
@ -438,21 +441,21 @@ end
function this.GetLevelPointPosition()
local data = {}
if not FightPointPassManager.IsChapterClossState() then
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.lastPassFightId)
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.lastPassFightId)
else
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,this.curOpenFight)
data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, this.curOpenFight)
end
return data.LevelPointPosition
end
--计算小地图节点坐标
function this.CalculateMapPointPos(parentPoint,sonPoint)
function this.CalculateMapPointPos(parentPoint, sonPoint)
local scaleValueX = parentPoint.localScale.x
local scaleValueY = parentPoint.localScale.y
local x = math.floor(sonPoint[1]*(-1)*scaleValueX)
local y = math.floor(sonPoint[2]*(-1)*scaleValueY)
return x,y
local x = math.floor(sonPoint[1] * (-1) * scaleValueX)
local y = math.floor(sonPoint[2] * (-1) * scaleValueY)
return x, y
end
-- 活动期间关卡的总奖励预览
@ -489,7 +492,7 @@ function this.GetExtralReward()
rewardShow[#rewardShow + 1] = shows[j]
end
else
end
end
return 1, rewardShow
@ -513,7 +516,7 @@ function this.GetStopBtnState()
return true
else
if this.curOpenFight == 1011 or this.curOpenFight == 1021 or this.curOpenFight == 1031
or this.curOpenFight == 1041 or this.curOpenFight == 1051 then
or this.curOpenFight == 1041 or this.curOpenFight == 1051 then
isShow = false
else
isShow = true
@ -528,7 +531,8 @@ end
function this:RefreshQuickTrain()
if AdventureManager.GetTrainStageLevel() > 0 and ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QuickTrain) then
local taskConfig = ConfigManager.GetConfigDataByKey(ConfigName.TrainTask, "Level", AdventureManager.GetTrainStageLevel())
local taskConfig = ConfigManager.GetConfigDataByKey(ConfigName.TrainTask, "Level",
AdventureManager.GetTrainStageLevel())
for i = 1, #taskConfig.TaskID do
local taskData = TaskConfig[taskConfig.TaskID[i]]
local severData = TaskManager.GetTypeTaskInfo(TaskTypeDef.Train, taskData.Id)
@ -542,4 +546,4 @@ function this:RefreshQuickTrain()
return freeTimes > 0
end
return this
return this

View File

@ -844,7 +844,7 @@ function this.OnConnect(network)
.."getUserInfo?openId="..LoginManager.openId
.."&serverId="..LoginManager.ServerId
.."&token="..LoginManager.token
.."&platform=4"
.."&platform=1"
.."&sub_channel="..LoginRoot_SubChannel
.."&version="..LoginRoot_PackageVersion
.."&area="..LoginManager.area

View File

@ -255,6 +255,7 @@ function RewardItemPopup:OnOpen(...)
this.nextStageTime.text = PrivilegeManager.GetPrivilegeOpenTip(PRIVILEGE_TYPE.AutoNextFight)
end
else
LogError("ddddddddddddddddddddddddddddd")
this.automatic:SetActive(false)
end
if fightType == BATTLE_TYPE.GUILD_CAR_DELAY or fightType == BATTLE_TYPE.DEATH_POS then

File diff suppressed because it is too large Load Diff