From 6c316bf7dea4ec92acb2b4cb28f87c96520a4e82 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 28 Jul 2020 17:25:50 +0800 Subject: [PATCH] --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 2 +- .../~Lua/Modules/Operating/QianKunBox.lua | 4 ++-- .../~Lua/Modules/Operating/TimeLimitedCall.lua | 4 ++-- .../~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua | 10 ---------- .../~Lua/Modules/Recruit/RecruitPanel.lua | 4 ++-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 470dc8d083..afc16a8c1e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -21474,7 +21474,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 55} m_SizeDelta: {x: 800, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &624669742079600518 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua index c4927aedb7..11771f9a7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBox.lua @@ -167,7 +167,7 @@ function QianKunBox:refreshBtnShow() CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxSingle,recruitOne) else recruitOne() @@ -184,7 +184,7 @@ function QianKunBox:refreshBtnShow() CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.QianKunBoxTen,recruitTen) else recruitTen() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index 1827ca0b0a..d6de60b198 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -291,7 +291,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() CheckRedPointStatus(RedPointType.TimeLimited) end,freeTimesId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitSingle,recruitOne) else recruitOne() @@ -309,7 +309,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() CheckRedPointStatus(RedPointType.TimeLimited) end,freeTimesId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.TimeLimitTen,recruitTen) else recruitTen() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua index 6573f0ba9d..ce0db494e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua @@ -4,7 +4,6 @@ local this = {} local parent --传入特效层级 local sortingOrder=0 - local ctrlView = require("Modules/Map/View/MapControllView") local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local trialSetting=ConfigManager.GetConfig(ConfigName.TrialSetting) @@ -14,14 +13,12 @@ local itemId=0 --消耗道具ID local itemNum=0 --消耗道具数量 local usedNum=0 --已使用的数量 - function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.body=Util.GetGameObject(gameObject,"Body") this.item=Util.GetGameObject(this.body,"Item") this.leftTime=Util.GetGameObject(this.body,"leftTime"):GetComponent("Text") this.num=Util.GetGameObject(this.body,"Num"):GetComponent("Text") - -- this.root=Util.GetGameObject(gameObject,"Rot"):GetComponent("Text") this.cancelBtn=Util.GetGameObject(gameObject,"CancelBtn") this.confirmBtn=Util.GetGameObject(gameObject,"ConfirmBtn") @@ -40,11 +37,6 @@ function this:BindEvent() PopupTipPanel.ShowTip(Language[11248]) return else - -- UIManager.OpenPanel(UIName.TrialOpPanel, 2) - -- 停止自动寻路 - -- ctrlView.OnRoleDead() - - --tiralOPpanel里面 --向服务器请求使用炸弹 MapManager.MapUpdateEvent(-1000, function () Log(Language[11270]) @@ -54,7 +46,6 @@ function this:BindEvent() -- 更新背包数量 BagManager.DeleteTempBagCountById(43, 1) this.KillAllBitch() - local showDrop = function() UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 2, function () -- 回复精气值 @@ -103,7 +94,6 @@ function this:OnShow(_parent,...) itemId=trialSetting[1].BombId[1][1] itemNum= BagManager.GetItemCountById(itemId) - -- LogBlue(BagManager.GetItemCountById(itemId)) usedNum=MapTrialManager.bombUsed this.RefreshPanel() end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 246c0f5ba7..e1ec28c72a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -208,7 +208,7 @@ function this.UpdatePanelData() UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],m.type,bType.Btn1) end,v.privilegeId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Single,recruitOne) else recruitOne() @@ -229,7 +229,7 @@ function this.UpdatePanelData() end end,v.privilegeId) end - if state==0 and d[1] ==16 then + if state==0 and d[1] ==16 and not isFree then UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,RecruitType.Ten,recruitTen) else recruitTen()