From ad9bcaa2fa7af8f588d8b41c2b1996d9919a7a8d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 15 Sep 2021 14:02:39 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/JumpServer/JumpServerPanel.prefab | 22 +++++++++---------- .../~Lua/Common/GlobalDefine.lua | 2 +- .../Modules/Formation/FormationPanelV2.lua | 4 ---- .../Modules/Formation/View/QiJieFormation.lua | 6 ++--- .../Modules/JumpServer/JumpServerPanel.lua | 22 +++++++++++++++++++ .../~Lua/Modules/Net/NetManager.lua | 1 - .../QiJieShiLian/QiJieShiLianManager.lua | 12 +++++----- 7 files changed, 43 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab index 3793bb11c9..57037132e9 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerPanel.prefab @@ -5433,7 +5433,7 @@ ParticleSystem: --- !u!199 &5104331235060178184 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10438,7 +10438,7 @@ ParticleSystem: --- !u!199 &8643527419215915995 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15709,7 +15709,7 @@ ParticleSystem: --- !u!199 &4987984508322184416 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -17755,7 +17755,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -526.50006, y: 0.000061035156} + m_AnchoredPosition: {x: 107, y: 0.000061035156} m_SizeDelta: {x: 160, y: 18.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7399630041674626655 @@ -22582,7 +22582,7 @@ ParticleSystem: --- !u!199 &3262653027282754651 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27551,7 +27551,7 @@ ParticleSystem: --- !u!199 &253417761310031868 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32986,7 +32986,7 @@ ParticleSystem: --- !u!199 &2319293122981156966 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38264,7 +38264,7 @@ ParticleSystem: --- !u!199 &7771438493932148345 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43288,7 +43288,7 @@ ParticleSystem: --- !u!199 &1758218800894468996 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -48309,7 +48309,7 @@ ParticleSystem: --- !u!199 &7978786288442372732 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53436,7 +53436,7 @@ ParticleSystem: --- !u!199 &2554868232433594259 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 35c1bcf07d..045d140287 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1488,7 +1488,7 @@ FUNCTION_OPEN_TYPE = { FIGHTLEVEL = 107,--山河社稷图 PRACTICE = 108,--修行 JumpServer_YuXu = 111, -- 玉虚论道 - + QIJIESHILIAN = 112,--七界试炼 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 0fedb78f1a..7beb82124b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -506,13 +506,9 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) yuanImage:SetActive(heroData.createtype == 1) if HarmonyManager.IsChangeColor(heroData.dynamicId) then - -- body lv.text=""..heroData.lv.."" elseif HarmonyManager:IsEnvoy(heroData.dynamicId) and HarmonyManager:HongMengTowerUpLimit() >= HarmonyManager.TowerStartLimit then - -- bod - print(HarmonyManager.TowerStartLimit) lv.text=""..heroData.lv.."" - else lv.text=heroData.lv end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua index 3d44fbb336..b6e84f7bac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/QiJieFormation.lua @@ -27,9 +27,9 @@ end function this.On_Btn2_Click() if not hadClick then hadClick = true - if this.root.order>=1 then + if #this.root.choosedList>=1 then --保存编队 - FormationManager.RefreshFormation(this.root.curFormationIndex, this.root.choosedList, + FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList, FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) else PopupTipPanel.ShowTip(string.format(Language[10699], 1)) @@ -79,7 +79,7 @@ end function this.StartFight() this.spLoader:Destroy() - if this.root.order>=1 then + if #this.root.choosedList>=1 then --保存编队 FormationManager.SaveFormation(this.root.curFormationIndex, this.root.choosedList, FormationManager.formationList[this.root.curFormationIndex].teamPokemonInfos) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 4067513467..0bd9fa8f5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -241,6 +241,28 @@ function JumpServerPanel:SystemState(id,fun) end func() end) + elseif id== JumpServer_Type.QiJieShiLian then + -- 判断功能是否开启 + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.QIJIESHILIAN) then + type[id].state = -1 + type[id].tipStr = ActTimeCtrlManager.GetFuncTip( FUNCTION_OPEN_TYPE.QIJIESHILIAN) + func() + return + end + -- 跨服相关判断 + JumpServerManager.GetWorldArenaInfoRequest(function() + if not JumpServerManager.GetHightLadderDataIsStart() then + type[id].state = -4 + type[id].tipStr = string.format("开服第%s周开放!",ConfigManager.GetConfigData(ConfigName.MServerArenaSetting,3).OpenWeek) + elseif not JumpServerManager.GetHightLadderDataIsGroup() then + type[id].state = -5 + type[id].tipStr = "未划分跨服分组,无法参与!" + else + type[id].state = 1 + type[id].tipStr = "" + end + func() + end) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index d334ded99c..a5bbed6eb3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -833,7 +833,6 @@ function this.TeamInfoSaveRequest(curFormation, func) local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.TEAM_POS_SAVE_REQUEST, MessageTypeProto_pb.TEAM_POS_SAVE_RESPONSE, msg, function(buffer) local data = buffer:DataByte() - LogError(" success /////") if func then func(msg.pokemonInfo) end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index 193634deed..a764f55548 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -47,15 +47,13 @@ end --界面获取信息 function this.GetQiJieData(targetLevel) --上阵列表赋值 - -- local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) - -- if FormationManager.GetFormationByID(FormationTypeDef.FORMATION_QIJIESHILIAN) then + local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL) + if FormationManager.GetFormationByID(FormationTypeDef.FORMATION_QIJIESHILIAN) then curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_QIJIESHILIAN) - -- end + end this.formationList ={} for j = 1, #curFormation.teamHeroInfos do - if curFormation.teamHeroInfos[j] then - table.insert(this.formationList,HeroManager.GetSingleHeroData(curFormation.teamHeroInfos[j].heroId).heroConfig) - end + this.formationList[j] = curFormation.teamHeroInfos[j] end --界面信息 local data = {} @@ -104,7 +102,9 @@ function this.CheckGoalIsFinish(_dataId,_obj,_formationList) -- LogYellow("final = false0") final = false end + LogRed("##heroList:"..tostring(#heroList)) for i = 1, #heroList do + LogGreen("heroList[i].heroId:"..tostring(heroList[i].heroId)) table.insert(tempList,HeroConfig[HeroManager.GetSingleHeroData(heroList[i].heroId).id]) end if #tempList > 0 and final and goalData.PropertyName and goalData.PropertyName > 0 then