From b9bb2cf5440d815879c84527018371dc67c0f019 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 21 Dec 2021 13:23:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E6=98=9F=E6=95=B0=E5=88=B0=E8=BE=BE=E5=9B=9B=E4=BD=8D=E5=90=8E?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=B8=89=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Practice/PracticePanel.prefab | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 416b18d7c2..06c067decf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -4810,10 +4810,10 @@ RectTransform: m_Father: {fileID: 8503549196898394800} m_RootOrder: 2 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &535413429869230351 GameObject: @@ -20000,9 +20000,9 @@ RectTransform: m_Father: {fileID: 3759887136319108211} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 39.5, y: 635} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 39.5, y: -377} m_SizeDelta: {x: 129.5, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &4961706857348061968 @@ -37369,9 +37369,9 @@ RectTransform: m_Father: {fileID: 3759887136319108211} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -171.5, y: 635} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -171.5, y: -377} m_SizeDelta: {x: 129.5, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1358751446755459863 From 0b5ca2a4609e297b26f73907728ea156cbe4e37f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Dec 2021 14:31:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90=E5=BC=95=E5=AF=BC=E3=80=91?= =?UTF-8?q?=E5=BC=95=E5=AF=BC=E8=A7=A6=E5=8F=91=E6=96=B9=E5=BC=8F=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=BC=80=E6=94=BE=E7=BB=99=E5=8A=9F=E8=83=BD=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E4=BD=BF=E7=94=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=B1=BB=E5=9E=8B37=20=20=E5=8D=81=E8=BF=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=95=8C=E9=9D=A2=E6=89=93=E5=BC=80=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guide/GuideManager.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 87d143bb4a..d4d42e2b7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -262,11 +262,12 @@ end function this.CheckNextGuideListen(nextId) if GuideConfig[nextId] then local type = GuideConfig[nextId].Type - if openDic[type] then + -- 主线引导保存下一步id + if type == GuideType.Force and openDic[type] then openDic[type] = nextId - LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) ) - this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs) end + LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].OpenType) ) + this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs) end end @@ -795,6 +796,16 @@ function this.RefreshTriggerListen(id, openType, openArgs) end end Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) + -- 十连结果界面触发 + elseif openType == 37 then + local trigger + trigger = function(panelType) + if panelType == UIName.TenRecruitPanel then + Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, trigger) + this.ShowGuide(id) + end + end + Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, trigger) end end From 605dd4e111c25b26dec050bab9729df80cfa84ed Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Dec 2021 15:38:42 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E6=8C=89=E9=92=AE=E8=A7=A3=E9=94=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index b57ca1b4c0..cbb6021100 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -857,7 +857,7 @@ end -- 是否解锁跳过功能 function this.IsUnlockBattlePass() -- return false - return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值任意金额后解锁跳过" + return PrivilegeManager.GetPrivilegeOpenStatus(PRIVILEGE_TYPE.SkipFight), "通关简单3-10或充值6元后解锁跳过" end -- 战斗暂停控制 From 58ffbf416ce2443a1d6848497d417cc9d4c39545 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 21 Dec 2021 16:32:59 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90=E5=95=86=E5=9F=8E=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Recharge/View/EveryDayGiftNew.lua | 26 ++++++++++++------- .../Modules/Recharge/View/RechargeViewNew.lua | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 8b7eab3d03..e3f646e1a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -69,14 +69,20 @@ function EveryDayGiftNew:InitComponent() end function EveryDayGiftNew:BindEvent() + Util.AddOnceClick(self.btn2,function () - PayManager.Pay(onKeyPackId, function(id) - FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) - PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) - CheckRedPointStatus(RedPointType.GrowthPackage) - MonthCardManager.CheckMonthCardPatFace() - self:RefreshData(nil,false,false) - end) + local actData = ActivityGiftManager.GetActivityTypeInfo(89) + if actData then + PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用！") + else + PayManager.Pay(onKeyPackId, function(id) + FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) + PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) + CheckRedPointStatus(RedPointType.GrowthPackage) + MonthCardManager.CheckMonthCardPatFace() + self:RefreshData(nil,false,false) + end) + end end) end @@ -263,7 +269,7 @@ function EveryDayGiftNew:RefreshReward(Data) NotEnoughPopup:Show(Data.data.costId) end else - PopupTipPanel.ShowTip(Language[11701]) + PopupTipPanel.ShowTip(string.format("名望等级不足，请升至%s级后才可购买！",DynamicActivityManager.Index-1)) end end end) @@ -397,11 +403,11 @@ function EveryDayGiftNew:RefreshOneKeyShow() local actData = ActivityGiftManager.GetActivityTypeInfo(89) if actData then Util.SetGray(self.btn2,true) - self.btn2:GetComponent("Button").interactable = false + -- self.btn2:GetComponent("Button").interactable = false self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400)) else Util.SetGray(self.btn2,false) - self.btn2:GetComponent("Button").interactable = true + -- self.btn2:GetComponent("Button").interactable = true self.btn2Text.text = string.format("60元七天特惠") end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 6007aabd48..b05b4cb218 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -186,7 +186,7 @@ function RechargeViewNew:RefreshReward(Data) NotEnoughPopup:Show(Data.data.costId) end else - PopupTipPanel.ShowTip(Language[11701]) + PopupTipPanel.ShowTip(string.format("名望等级不足，请升至%s级后才可购买！",DynamicActivityManager.Index-1)) end end end) From 86daa70b9c46a112386491e6d2ac73234e261750 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 21 Dec 2021 16:33:28 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90=E7=89=B9=E6=9D=83=E3=80=91?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=85=E5=80=BC=E9=87=91=E9=A2=9D=E8=A7=A3?= =?UTF-8?q?=E9=94=81=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Player/PrivilegeManager.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index 15d4e64076..77615e3417 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -84,10 +84,17 @@ local function _CompareCondition(type, condition, value) elseif type == 3 then -- vip等级解锁 value = value or VipManager.GetVipLevel() return value >= condition - elseif type == 4 then -- 特殊类型 + elseif type == 4 then -- 充值解锁（无论多少金额） return true elseif type == 5 then -- 特殊类型 return true + elseif type == 6 then -- 总好感度等级解锁 + local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1) + value = value or tlv + return value >= condition + elseif type == 7 then -- 充值金额解锁 + value = value or VipManager.GetChargedNum() + return value >= condition end end From 53f7d29337c8c2d845a2c1939d494fba72a9b79b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 21 Dec 2021 16:51:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E5=95=86=E5=9F=8E=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Recharge/View/EveryDayGiftNew.lua | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index e3f646e1a0..08a28828dd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -71,18 +71,19 @@ end function EveryDayGiftNew:BindEvent() Util.AddOnceClick(self.btn2,function () - local actData = ActivityGiftManager.GetActivityTypeInfo(89) - if actData then - PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用！") - else - PayManager.Pay(onKeyPackId, function(id) - FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) - PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) - CheckRedPointStatus(RedPointType.GrowthPackage) - MonthCardManager.CheckMonthCardPatFace() - self:RefreshData(nil,false,false) - end) + for i = 1, #self.shopData do + if self.shopData[i].data.boughtNum > 0 then + PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用！") + return + end end + PayManager.Pay(onKeyPackId, function(id) + FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) + PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) + CheckRedPointStatus(RedPointType.GrowthPackage) + MonthCardManager.CheckMonthCardPatFace() + self:RefreshData(nil,false,false) + end) end) end @@ -392,23 +393,22 @@ end --刷新一键购买显示 function EveryDayGiftNew:RefreshOneKeyShow() Util.SetGray(self.btn2,false) - for i = 1, #self.shopData do - if self.shopData[i].data.boughtNum > 0 then - Util.SetGray(self.btn2,true) - self.btn2:GetComponent("Button").interactable = false - return - end - end local actData = ActivityGiftManager.GetActivityTypeInfo(89) if actData then Util.SetGray(self.btn2,true) - -- self.btn2:GetComponent("Button").interactable = false + self.btn2:GetComponent("Button").interactable = false self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400)) else Util.SetGray(self.btn2,false) - -- self.btn2:GetComponent("Button").interactable = true + self.btn2:GetComponent("Button").interactable = true self.btn2Text.text = string.format("60元七天特惠") + for i = 1, #self.shopData do + if self.shopData[i].data.boughtNum > 0 then + Util.SetGray(self.btn2,true) + break + end + end end end