From a7bd8323ad0ccc2e7a491b64c0a0acb01e4a2a51 Mon Sep 17 00:00:00 2001 From: JieLing Date: Sat, 20 Feb 2021 21:22:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=B8=BF=E8=92=99=E9=98=B5=E3=80=91?= =?UTF-8?q?=20=E7=BA=A2=E7=82=B9=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Harmony/Manager/HarmonyManager.lua | 7 ++-- .../Harmony/Panel/HongMengEnvoyPanel.lua | 2 +- .../Modules/Harmony/View/HarmonyScrllow.lua | 3 +- .../~Lua/Modules/Main/MainPanel.lua | 36 +------------------ 4 files changed, 7 insertions(+), 41 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 1fbf47ee58..c6303d12c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -550,7 +550,7 @@ function this.RefreshOpenBoxPoint() -- body return false end - if Gold > tab[#this.hongmengHeroInfos].PropPrice[2] and #this.hongmengHeroInfos < #keys then + if tab[#this.hongmengHeroInfos + 1] and Gold > tab[#this.hongmengHeroInfos + 1].PropPrice[2] and #this.hongmengHeroInfos < #keys then return true else return false @@ -580,7 +580,6 @@ function this.RefreshEnvoyPoint() end end - return false end @@ -598,7 +597,6 @@ function this.RefreshUpTowerPoint() print(sum,data.value) if data.value >= sum then -- body - print("false") return false else local prop = this.GetHongMengUpData() @@ -607,7 +605,6 @@ function this.RefreshUpTowerPoint() if prop and BagManager.GetTotalItemNum(UpViewRechargeType.Gold) >= prop.LevelUp[1][2] then -- body if BagManager.GetTotalItemNum(UpViewRechargeType.GrowthAmulet) >= prop.LevelUp[2][2] then - LogGreen("true") return true end @@ -624,6 +621,8 @@ end --检测主城红点 function this.CheckRedPoinStatusUpTowerMainCityRed() CheckRedPointStatus(RedPointType.HongMeng_UpTower) + CheckRedPointStatus(RedPointType.HongMeng_Evory) + CheckRedPointStatus(RedPointType.HongMeng_OpenBox) end --票战力 local oldPowerNum = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua index e3c427323f..d355f6f42c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua @@ -14,6 +14,7 @@ local GrowthAmulet = 0 HongMengEnvoyPanel.timerEffect = nil --初始化组件(用于子类重写) function HongMengEnvoyPanel:InitComponent() + self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, {showType = UpViewOpenType.ShowLeft}) self.btnBack = Util.GetGameObject(self.gameObject, "Back/BackBtn") self.helpBtn = Util.GetGameObject(self.gameObject, "HelpBtn") self.AddBtn = Util.GetGameObject(self.gameObject, "Panel/HarmonyPanel/AddBtn") @@ -311,7 +312,6 @@ end --界面打开时调用(用于子类重写) function HongMengEnvoyPanel:OnOpen(equipSId) --NetManager.PlayerInfoRequest(LoadingPanel.OnStep) - self.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, {showType = UpViewOpenType.ShowLeft}) for i = 1, #self.EnvoyItemList do -- body diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index f47e70d5de..45dc9b9442 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -215,8 +215,9 @@ function this.SingleBoxDataShow(go,boxData,index) tempData = boxData if HarmonyManager.RefreshOpenBoxPoint() then -- body + Gold = BagManager.GetTotalItemNum(UpViewRechargeType.XuanHuangZhiQi) CheckRedPointStatus(RedPointType.HongMeng_OpenBox) - --print(Gold.."!@@@@@@"..boxData.PropPrice[2]) + -- print(Gold.."!@@@@@@"..boxData.PropPrice[2]) if Gold > boxData.PropPrice[2] then -- body redPoint:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2e4bb972a6..a55103e8f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -406,19 +406,7 @@ function this:InitComponent() -- this.mainTaskGRewardImage = Util.GetGameObject(self.gameObject, "RightDown/mainTask/getRewardButton/getRewardImage") -- this.mainTaskJumpImage = Util.GetGameObject(self.gameObject, "RightDown/mainTask/getRewardButton/jumpImage") -- this.mainTask:SetActive(false)-- 删除 - - - this.GuideEffectGo = poolManager:LoadAsset("GuideEffect", PoolManager.AssetType.GameObject) - --this.GuideEffectGo.transform:SetParent(this.mainTaskGRewardImage.transform) - this.GuideEffectGo.transform.localPosition = Vector3.zero - this.GuideEffectGo.transform.localScale = Vector3.one - Util.GetGameObject(this.GuideEffectGo, "GameObject"):SetActive(false) - this.GuideJumpEffectGo = poolManager:LoadAsset("GuideEffect", PoolManager.AssetType.GameObject) - -- this.GuideJumpEffectGo.transform:SetParent(this.mainTaskJumpImage.transform) - this.GuideJumpEffectGo.transform.localPosition = Vector3.zero - this.GuideJumpEffectGo.transform.localScale = Vector3.one - Util.GetGameObject(this.GuideJumpEffectGo, "GameObject"):SetActive(false) - this.GuideJumpEffectGo:SetActive(false) + this.btnFunHide[FUNCTION_OPEN_TYPE.DAILY_TASK] = this.btnDailyMission this.btnFunHide[FUNCTION_OPEN_TYPE.PRAY] = this.paryGift this.btnFunHide[FUNCTION_OPEN_TYPE.SUNLONG] = this.treasureOfSl @@ -1123,13 +1111,6 @@ function this:OnSortingOrderChange() Util.AddParticleSortLayer(this.sgEffect[1], self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.sgEffect[2], self.sortingOrder - orginLayer) Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - orginLayer) - if orginLayer < 100 then - Util.AddParticleSortLayer(self.GuideEffectGo, self.sortingOrder) - Util.AddParticleSortLayer(self.GuideJumpEffectGo, self.sortingOrder) - else - Util.AddParticleSortLayer(self.GuideEffectGo, self.sortingOrder - orginLayer) - Util.AddParticleSortLayer(self.GuideJumpEffectGo, self.sortingOrder - orginLayer) - end orginLayer = self.sortingOrder this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder }) @@ -1262,22 +1243,7 @@ function this.RefreshPlayerInfoShow() end -local isCanShowMainTaskJumpEffect = true function this:Update() - if curMianTaskData and curMianTaskData.state == 0 then - if isCanShowMainTaskJumpEffect then - if Time.realtimeSinceStartup - timePressStarted > 5 then - isCanShowMainTaskJumpEffect = false - this.GuideJumpEffectGo:SetActive(true) - end - end - if Input.GetMouseButtonDown(0) then - timePressStarted = Time.realtimeSinceStartup - isCanShowMainTaskJumpEffect = true - this.GuideJumpEffectGo:SetActive(false) - end - end - -- if Input.GetMouseButtonDown(1) then -- if ActTimeCtrlManager.SingleFuncState(30) then