From 4af6f84f031f71642ff7563fc3a00c09d6996309 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 9 Sep 2020 17:25:27 +0800 Subject: [PATCH 1/5] --- .../Modules/Guild/DeathPos/DeathPosInfoPanel.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua index ad385553f3..5bcf557687 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua @@ -303,8 +303,16 @@ function this.SetRankingNum(root,rank,isMy) Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank end if isMy then - Util.GetGameObject(root,"MyRank/SortNum/SortNum ("..rank..")"):SetActive(true) - Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank + for i = 1, 4 do + Util.GetGameObject(root,"MyRank/SortNum/SortNum ("..i..")"):SetActive(false) + end + if rank < 4 then + Util.GetGameObject(root,"MyRank/SortNum/SortNum ("..rank..")"):SetActive(true) + else + Util.GetGameObject(root,"MyRank/SortNum/SortNum (4)"):SetActive(true) + Util.GetGameObject(root,"MyRank/SortNum/SortNum (4)/TitleText"):GetComponent("Text").text = rank + end + end end From e557130da8aa21809018fd2fc5cdf8cc363ac9db Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 9 Sep 2020 17:57:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=81=E7=BB=9D=E9=98=B5=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E5=81=8F=E7=A7=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab index 6d2cf1af61..7132112c1e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/DeathPos/DeathPosRewardPopup.prefab @@ -37,7 +37,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.000012218952, y: -0.000024795532} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 934.4, y: 1353.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &914061735743209654 @@ -310,8 +310,8 @@ 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: -42.83008} - m_SizeDelta: {x: 2014, y: 3037.33} + m_AnchoredPosition: {x: 0, y: -43.47496} + m_SizeDelta: {x: 934.4, y: 1125.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &817148689261127693 CanvasRenderer: From e492dc681326401e1be14bf376f1913e197630b4 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Sep 2020 15:28:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=A0=B4=E9=98=B5=E8=AF=9B=E4=BB=99?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivity/DynamicActivityPanel.lua | 3 +++ .../~Lua/Modules/DynamicActivity/QianKunBox.lua | 12 +++++++++--- .../Modules/DynamicActivity/TimeLimitedCall.lua | 6 ++++-- .../~Lua/Modules/Main/MainPanel.lua | 13 +++++++++++-- .../~Lua/Modules/Operating/OperatingManager.lua | 13 +++++++++++-- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index a9f92d8a40..2acea6b711 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -93,9 +93,12 @@ end --添加事件监听(用于子类重写) function DynamicActivityPanel:AddListener() + end + --移除事件监听(用于子类重写) function DynamicActivityPanel:RemoveListener() + end --界面打开时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 77823298b4..8d18f82b02 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -1,6 +1,6 @@ local QianKunBox = quick_class("QianKunBox") local ActivityDetail = require("Modules/DynamicActivity/ActivityDetail")--活动详情 - +local parent local iconsData = nil local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) @@ -98,8 +98,8 @@ function QianKunBox:BindEvent() end) end -function QianKunBox:OnShow(sortingOrder) - +function QianKunBox:OnShow(sortingOrder,_parent) + parent = _parent Util.AddParticleSortLayer(self.effect, sortingOrder - orginLayer) orginLayer = sortingOrder activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) @@ -251,6 +251,12 @@ function QianKunBox:timeCountDown() self.timer = Timer.New(function() self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime) self.btnTime.text = TimeToHMS(timeDown) + if timeDown < 1 then + self.timer:Stop() + self.timer = nil + parent:ClosePanel() + return + end timeDown = timeDown -1 end, 1, -1, true) self.timer:Start() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index c325105504..4947093319 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -8,7 +8,7 @@ local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) - +local parent local activityId = 0 local singleRecruit = nil local tenRecruit = nil @@ -110,7 +110,8 @@ function TimeLimitedCall:BindEvent() end) end -function TimeLimitedCall:OnShow(_sortingOrder) +function TimeLimitedCall:OnShow(_sortingOrder,_parent) + parent = _parent sortingOrder = _sortingOrder self.gameObject:SetActive(true) @@ -361,6 +362,7 @@ function TimeLimitedCall:TimeCountDown() if timeDown < 1 then self.timer:Stop() self.timer = nil + parent:ClosePanel() return end timeDown = timeDown - 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2d073fe642..6b3137bbaa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -11,7 +11,7 @@ local this = MainPanel -- [GUILD_FIGHT_STAGE.MATCHING] = "r_zjm_zhanpzz", -- [GUILD_FIGHT_STAGE.COUNTING] = "r_zjm_zhanjjz", -- } - +local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity) --示意图轮回放 local imageList = {} -- 主界面需要隐藏的功能 @@ -47,6 +47,12 @@ local lightList = { [2] = { -1367, -950 }, [3] = { -2447, -2397 }, } + +local mainDynamicActivityIcon = { + [1] = "r_zjm_huodongicon-pozhenzhuxian", --破阵诛仙 + [2] = "r_zjm_huodongicon-yongguansanjun", -- 勇冠三军 + [3] = "r_zjm_huodongicon-pozhenzhuxian", --叱咤风云 +} function this:AddFuncItem(btnGO, pos) return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos} end @@ -1374,6 +1380,9 @@ function this.TimeFormat() --轮转活动,乾坤宝盒 local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) if dynamicAct then + this.btnDynamicActivity:SetActive(true) + local curindex = GlobalActConfig[dynamicAct].ShowArt + Util.GetGameObject(this.btnDynamicActivity,"Image"):GetComponent("Image").sprite = Util.LoadSprite(mainDynamicActivityIcon[curindex]) local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) local tempTime = info.endTime - PlayerManager.serverTime if tempTime>= 86400 then @@ -1382,7 +1391,7 @@ function this.TimeFormat() this.DynamicActivityTime.text = TimeToHMS(tempTime) end else - this.btnDynamicActivity.gameObject:SetActive(false) + this.btnDynamicActivity:SetActive(false) end --青龙秘宝 local QingLong = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 7037baa26b..aa59ff01ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -765,12 +765,21 @@ function this.InitDynamicActData() local data = {} data.id = allMissionData[j].missionId data.progress = allMissionData[j].progress - data.state = allMissionData[j].state - data.type = allListData[i].Type local strs = string.split(allListData[i].Show,"#") data.title = strs[1] data.content = strs[2] data.value = allListData[i].TaskValue[2][1] + data.state = allMissionData[j].state + -- if allMissionData[j].state == 2 then + -- data.state = allMissionData[j].state + -- else + -- if data.progress >= data.value then + -- data.state = 1 + -- else + -- data.state = 0 + -- end + -- end + data.type = allListData[i].Type data.reward = {allListData[i].Integral[1][1],allListData[i].Integral[1][2]} data.jump = allListData[i].Jump[1] table.insert(this.allData,data) From fa33af7eea721e839bdc5428874df877c4c56bf8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Sep 2020 16:18:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/MainPanel.lua | 27 +++++++++++-------- .../~Lua/Modules/Net/IndicationManager.lua | 1 + .../~Lua/Modules/Recruit/RecruitManager.lua | 1 + 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 6b3137bbaa..8ebe6afc8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -61,6 +61,7 @@ function this:InsertNewText(btn) local xinText = Util.GetGameObject(btn, "new") return xinText end +local isRefeshIcon = true --初始化组件(用于子类重写) function this:InitComponent() orginLayer = 0 @@ -170,6 +171,7 @@ function this:InitComponent() --东海寻仙 this.findFairyBtn=Util.GetGameObject(self.gameObject,"RightUp/findFairy") this.findFairyRedPoint = Util.GetGameObject(this.findFairyBtn, "redPoint") + this.findFairyBtn:SetActive(false) --幸运转盘 this.luckyTurnBtn=Util.GetGameObject(self.gameObject,"RightUp/luckyTurn") @@ -406,7 +408,6 @@ function this:InitComponent() --this.horseRaceLamp = Util.GetGameObject(self.gameObject, "horseRaceLamp") --this.titleInfo = Util.GetGameObject(self.gameObject, "horseRaceLamp/bgImage/mask/titleInfo") --this.horseMask = Util.GetGameObject(self.gameObject, "horseRaceLamp/bgImage/mask") - this.animRoot = Util.GetGameObject(self.gameObject, "scene") this.btnSupreme = Util.GetGameObject(self.gameObject, "RightUp/supreme") @@ -1013,7 +1014,7 @@ end --界面打开时调用(用于子类重写) function this:OnShow() - + isRefeshIcon = true this.vipLevelText.sprite = VipManager.SetVipLevelImg() timePressStarted = Time.realtimeSinceStartup SoundManager.PlayMusic(SoundConfig.BGM_Main) @@ -1378,12 +1379,14 @@ function this.TimeFormat() end --轮转活动,乾坤宝盒 - local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + local dynamicAct = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) if dynamicAct then - this.btnDynamicActivity:SetActive(true) - local curindex = GlobalActConfig[dynamicAct].ShowArt - Util.GetGameObject(this.btnDynamicActivity,"Image"):GetComponent("Image").sprite = Util.LoadSprite(mainDynamicActivityIcon[curindex]) - local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) + if isRefeshIcon then + local curindex = GlobalActConfig[dynamicAct].ShowArt + Util.GetGameObject(this.btnDynamicActivity,"Image"):GetComponent("Image").sprite = Util.LoadSprite(mainDynamicActivityIcon[curindex]) + isRefeshIcon = false + end + local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DynamicAct) local tempTime = info.endTime - PlayerManager.serverTime if tempTime>= 86400 then this.DynamicActivityTime.text = TimeToDH(tempTime) @@ -1599,14 +1602,16 @@ function this.RefreshActivityBtn(context) if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) then this.btnSupreme:SetActive(ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 and ActivityGiftManager.GetRewardState(42)~=3) end - elseif context.type==ActivityTypeDef.FindFairy then - this.findFairyBtn:SetActive(false)--not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)) + + elseif context.type==ActivityTypeDef.DynamicAct then + isRefeshIcon = true + LogBlue("11111111111111111111111111111111111111111") + this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)) end if ActTimeCtrlManager.IsQualifiled(42) then this.expert:SetActive(ActivityGiftManager.GetExpertActiveisOpen() > 0) end - - + isRefeshIcon = true end --客户端自己Show刷新 function this.RefreshActivityShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index e2aa3f126c..1a06c5c340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -130,6 +130,7 @@ function this.RefreshActivityList(buffer) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.ActivityUpateIndication() msg:ParseFromString(data) + LogYellow("刷新活动的的indication来了") ActivityGiftManager.RefreshActivityData(msg) Game.GlobalEvent:DispatchEvent(GameEvent.FunctionCtrl.OnFunctionOpen) end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index a50db34ac6..26a774f729 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -212,6 +212,7 @@ function this.GetActivityPreviewData(type) end local data = nil if curActivityId ~= nil then --活动招募 + LogGreen("curActivityId:"..curActivityId) data = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",curActivityId,"PerCount",1) else LogRed("活动没开,你不应该看到这儿"..curActivityId) From 89f937e9ac6dfeadb6079931b7933cf71b191f2d Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Sep 2020 18:08:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=A0=B4=E9=98=B5=E8=AF=9B=E4=BB=99?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityPanel.prefab | 40 +++++++++--------- .../UI/SecretBox/SecretBoxBuyOnePanel.prefab | 30 ++++++------- .../~Lua/Common/GlobalDefine.lua | 3 +- .../Modules/DynamicActivity/QianKunBox.lua | 6 +-- .../DynamicActivity/QianKunBoxBuyOnePanel.lua | 14 +++---- .../DynamicActivity/QianKunBoxBuyTenPanel.lua | 17 ++++---- .../DynamicActivity/TimeLimitedCall.lua | 7 ++-- .../Modules/Operating/OperatingManager.lua | 16 ++++++- .../View/GeneralPopup_RecruitConfirm.lua | 42 ++++++++++++------- .../~Lua/Modules/Recruit/RecruitManager.lua | 6 +-- 10 files changed, 102 insertions(+), 79 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 9dfad66ac0..ec2cd54cfe 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -1232,7 +1232,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -49.799988, y: -375.30005} + m_AnchoredPosition: {x: -68.77, y: -375.30005} m_SizeDelta: {x: 70.95, y: 70.95} m_Pivot: {x: 0, y: 1} --- !u!222 &7900347097829686223 @@ -6648,8 +6648,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -569.11} - m_SizeDelta: {x: 138.29, y: 33.05} + m_AnchoredPosition: {x: 8.19, y: -569.11} + m_SizeDelta: {x: 150.46, y: 33.05} m_Pivot: {x: 1, y: 1} --- !u!222 &3738421533255193029 CanvasRenderer: @@ -6681,7 +6681,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -6689,10 +6689,10 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "\u5171\u5DE5" + m_Text: "\u9F99\u5409\u516C\u4E3B" --- !u!1 &2303466906843528108 GameObject: m_ObjectHideFlags: 0 @@ -15918,7 +15918,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 14, y: -548.9} + m_AnchoredPosition: {x: -10.9, y: -548.9} m_SizeDelta: {x: 70.95, y: 70.95} m_Pivot: {x: 0, y: 1} --- !u!222 &503574274284658564 @@ -18137,8 +18137,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 55.809998, y: -395.93} - m_SizeDelta: {x: 112.3, y: 32.63} + m_AnchoredPosition: {x: 57, y: -395.93} + m_SizeDelta: {x: 137.47, y: 32.63} m_Pivot: {x: 1, y: 1} --- !u!222 &8527591333639193042 CanvasRenderer: @@ -18170,7 +18170,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 35 + m_FontSize: 34 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -18178,10 +18178,10 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5B59\u609F\u7A7A" + m_Text: "\u4E1C\u534E\u5E1D\u541B" --- !u!1 &4453678039707639172 GameObject: m_ObjectHideFlags: 0 @@ -26186,7 +26186,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 m_Text: "\u5171\u5DE5" @@ -30095,7 +30095,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 m_Text: "\u54EA\u5412" @@ -32609,7 +32609,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 m_Text: "\u54EA\u5412" @@ -36525,7 +36525,7 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5B59\u609F\u7A7A" @@ -38192,8 +38192,8 @@ 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: -140} - m_SizeDelta: {x: 1080, y: 1468.9} + m_AnchoredPosition: {x: 0, y: 0.0063475} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4779829524019865181 CanvasRenderer: @@ -39052,8 +39052,8 @@ 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: -140} - m_SizeDelta: {x: 1080, y: 1468.9} + m_AnchoredPosition: {x: 0, y: 0.012451} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3799529610245054684 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab index 77ba06805a..bff514bf7e 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyOnePanel.prefab @@ -34,7 +34,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: 395} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1188, y: 2112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222819546245374906 @@ -4828,7 +4828,7 @@ ParticleSystem: --- !u!199 &199130457302089272 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10144,7 +10144,7 @@ ParticleSystem: --- !u!199 &199762737609823424 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14791,7 +14791,7 @@ ParticleSystem: --- !u!199 &199080318784643404 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -19667,7 +19667,7 @@ ParticleSystem: --- !u!199 &199703938132574080 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24561,7 +24561,7 @@ ParticleSystem: --- !u!199 &199260698072189912 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24654,7 +24654,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: -8.6, y: 505.2} + m_AnchoredPosition: {x: -8.6, y: 144.3} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222015448121877664 @@ -29687,7 +29687,7 @@ ParticleSystem: --- !u!199 &199218959580742590 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29853,10 +29853,10 @@ RectTransform: m_Father: {fileID: 224098953711374262} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.3999023, y: 134.2002} - m_SizeDelta: {x: -806.3, y: -1654.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 141.1} + m_SizeDelta: {x: 306, y: 306} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222274942813493782 CanvasRenderer: @@ -34601,7 +34601,7 @@ ParticleSystem: --- !u!199 &199817266957694956 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -34769,7 +34769,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: -5, y: 502} + m_AnchoredPosition: {x: -5, y: 144.3} m_SizeDelta: {x: 512, y: 512} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222505831136018064 @@ -34902,7 +34902,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: -395} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1996686421698954 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8dcce36224..7a36bb040f 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1828,9 +1828,8 @@ RecruitType = { LightDarkSingle=10, --光暗属性但筹备 Ten = 11, --钻石招募十连(神将召唤) Single = 12, --钻石招募单抽(神将召唤) - TimeLimitSingle=13, --限时招募单抽 + TimeLimitTen=14, --限时招募十连 - QianKunBoxSingle=15, --乾坤宝囊单抽 QianKunBoxTen=16, --乾坤宝囊十连 FriendTen=23, --友情招募 多次 FriendSingle=24, --友情招募 单次 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 8d18f82b02..ca705085d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -176,7 +176,7 @@ function QianKunBox:refreshBtnShow() return end end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..tenRecruit.Id) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) @@ -185,7 +185,7 @@ function QianKunBox:refreshBtnShow() local recruitOne = function() RecruitManager.RecruitRequest(singleRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop) + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel, msg.drop,singleRecruit.Id) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end @@ -202,7 +202,7 @@ function QianKunBox:refreshBtnShow() local recruitTen = function() RecruitManager.RecruitRequest(tenRecruit.Id, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop) + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel, msg.drop,tenRecruit.Id) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index 18d4f834b6..a9ba89cf87 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -8,8 +8,6 @@ local iconsData = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotteryRewardC local artConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -local maxtimesId=lotterySetting[RecruitType.QianKunBoxSingle].MaxTimes -local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes --活动抽卡类型(动态的数据) local drawtType={ @@ -56,11 +54,13 @@ function QianKunBoxBuyOnePanel:BindEvent() self:ClosePanel() end) Util.AddClick(this.openOneAgainButton, function () + local maxtimesId=lotterySetting[this.recruitType].MaxTimes + local freeTimesId=lotterySetting[this.recruitType].FreeTimes if(BagManager.GetItemCountById(1002)>=1 or BagManager.GetItemCountById(16)>=200) then self:ClosePanel() - RecruitManager.RecruitRequest(RecruitType.QianKunBoxSingle, function(msg) + RecruitManager.RecruitRequest(this.recruitType, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,1)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop) + UIManager.OpenPanel(UIName.QianKunBoxBuyOnePanel,msg.drop,this.recruitType) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) else @@ -94,8 +94,8 @@ function QianKunBoxBuyOnePanel:OnOpen(...) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox }) local args = { ... } this.drop=args[1] - - this.detailImage:SetActive(not this.recruitType) + this.recruitType = args[2] + this.detailImage:SetActive(true) this.content1:SetActive(false) this.content2:SetActive(false) this.content3:SetActive(true) @@ -103,7 +103,7 @@ function QianKunBoxBuyOnePanel:OnOpen(...) local itemId=0 local itemNum=0 local d - d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) + d = RecruitManager.GetExpendData(this.recruitType) itemId=d[1] itemNum=d[2] this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index 5214f3c85b..e0e9232b4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -6,8 +6,7 @@ local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local gameSetting=ConfigManager.GetConfig(ConfigName.GameSetting) local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting) local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) -local maxtimesId=lotterySetting[RecruitType.QianKunBoxTen].MaxTimes -local freeTimesId=lotterySetting[RecruitType.QianKunBoxTen].FreeTimes + --活动抽卡类型(动态的数据) local drawtType={ FindFairySingle=0, @@ -59,17 +58,19 @@ end --绑定事件(用于子类重写) function QianKunBoxBuyTenPanel:BindEvent() - + Util.AddClick(this.btnBack, function () PlaySoundWithoutClick(SoundConfig.Sound_UICancel) self:ClosePanel() end) Util.AddClick(this.openTenAgainButton, function () + local maxtimesId=lotterySetting[this.recruitType].MaxTimes + local freeTimesId=lotterySetting[this.recruitType].FreeTimes if(BagManager.GetItemCountById(1003)>=10 or BagManager.GetItemCountById(16>=2000)) then self:ClosePanel() - RecruitManager.RecruitRequest(RecruitType.QianKunBoxTen, function(msg) + RecruitManager.RecruitRequest(this.recruitType, function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(maxtimesId,10)--记录抽卡次数 - UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop) + UIManager.OpenPanel(UIName.QianKunBoxBuyTenPanel,msg.drop,this.recruitType) CheckRedPointStatus(RedPointType.QianKunBox) end,freeTimesId) else @@ -109,9 +110,9 @@ function QianKunBoxBuyTenPanel:OnOpen(...) -- this.itemIcon1.sprite=Util.LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop=args[1] + this.recruitType = args[2] - - this.detailImage:SetActive(not this.recruitType) + this.detailImage:SetActive(true) this.content1:SetActive(false) this.content2:SetActive(false) this.content3:SetActive(true) @@ -120,7 +121,7 @@ function QianKunBoxBuyTenPanel:OnOpen(...) local itemId=0 local itemNum=0 local d - d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) + d=RecruitManager.GetExpendData(this.recruitType) itemId=d[1] itemNum=d[2] this.itemIcon3.sprite=Util.LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 4947093319..37c2bca8cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -131,7 +131,7 @@ function TimeLimitedCall:OnShow(_sortingOrder,_parent) for n,m in ipairs(activityType[activityId].hero) do Util.GetGameObject(self.gameObject,m.name.."/hero"):GetComponent("Image").sprite=Util.LoadSprite(m.hero) local configinfo= ConfigManager.GetConfigDataByKey(ConfigName.HeroConfig, "Id", m.id) - LogGreen("configinfo.PropertyName:"..configinfo.PropertyName) + --LogGreen("configinfo.PropertyName:"..configinfo.PropertyName) Util.GetGameObject(self.gameObject,m.name.."/icon"):GetComponent("Image").sprite=Util.LoadSprite(GetJobSpriteStrByJobNum(configinfo.PropertyName)) Util.GetGameObject(self.gameObject,m.name.."/name"):GetComponent("Text").text=configinfo.ReadingName Util.AddOnceClick(Util.GetGameObject(self.gameObject,m.name), function() @@ -223,7 +223,8 @@ function TimeLimitedCall:RefreshNextLevelReward() local reMaintimes = info.value - LogGreen("singleRecruit.MergePool:"..singleRecruit.MergePool) + --LogBlue("reMaintimes:"..reMaintimes) + --LogGreen("singleRecruit.MergePool:"..singleRecruit.MergePool) local totalTimes = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",singleRecruit.MergePool).Count reMaintimes = totalTimes - reMaintimes if reMaintimes == 0 then @@ -309,7 +310,7 @@ function TimeLimitedCall:RefreshGetHeroTimes() return end end - local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..tenRecruit.Id) + local state = PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen) if n==bType.Btn1 then if PrivilegeManager.GetPrivilegeUsedTimes(maxtimesId)+1>privilegeConfig[maxtimesId].Condition[1][2] then PopupTipPanel.ShowTip(Language[11760]) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index aa59ff01ea..803b5bfb9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -727,7 +727,13 @@ end function this.GetTimeLimitRedPointStatus() local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) - local freeTimesId=lotterySetting[RecruitType.TimeLimitSingle].FreeTimes + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + if not activityId then + return false + end + + local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1) + local freeTimesId=lotterySetting[array.Id].FreeTimes local freeTime= 0 if freeTimesId>0 then freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) @@ -738,7 +744,13 @@ end function this.GetQiankunBoxRedPointStatus() local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) - local freeTimesId=lotterySetting[RecruitType.QianKunBoxSingle].FreeTimes + local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) + if not activityId then + return false + end + + local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1) + local freeTimesId=lotterySetting[array.Id].FreeTimes local freeTime= 0 if freeTimesId>0 then freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index ddaf7e0ef3..2d3b5d2427 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -48,26 +48,36 @@ function this:OnShow(_parent,...) var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Single) this.rootText.text = string.format(Language[12373],d[2]) - elseif _args[1] == RecruitType.QianKunBoxSingle then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxSingle) - this.rootText.text = string.format(Language[12374],d[2]) - elseif _args[1] == RecruitType.TimeLimitSingle then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - local d=RecruitManager.GetExpendData(RecruitType.TimeLimitSingle) - this.rootText.text = string.format(Language[12375],d[2]) elseif _args[1] == RecruitType.Ten then var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten local d=RecruitManager.GetExpendData(RecruitType.Ten) this.rootText.text = string.format(Language[12376],d[2]) - elseif _args[1] == RecruitType.QianKunBoxTen then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen - local d=RecruitManager.GetExpendData(RecruitType.QianKunBoxTen) - this.rootText.text = string.format(Language[12377],d[2]) - elseif _args[1] == RecruitType.TimeLimitTen then - var=PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - local d=RecruitManager.GetExpendData(RecruitType.TimeLimitTen) - this.rootText.text = string.format(Language[12378],d[2]) + else + LogBlue("_args[1]:".._args[1]) + local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1]) + LogBlue("data.PerCount:"..data.PerCount) + LogBlue("data.ActivityId:"..data.ActivityId) + local activityData + if data.LotteryType == 3 then + activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId) + if activityData.Type == ActivityTypeDef.FindFairy then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen + local d = RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format(Language[12375],d[2]) + else + this.rootText.text = string.format(Language[12378],d[2]) + end + elseif activityData.Type == ActivityTypeDef.QianKunBox then + var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen + local d=RecruitManager.GetExpendData(data.Id) + if data.PerCount == 1 then + this.rootText.text = string.format(Language[12374],d[2]) + else + this.rootText.text = string.format(Language[12377],d[2]) + end + end + end end Util.AddOnceClick(this.btn,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 26a774f729..325f6e6027 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -32,8 +32,8 @@ function this.RecruitRequest(recruitType, func, privilegeId) --Log(tostring(this.freeUseTimeList[privilegeId])) if BagManager.GetItemCountById(itemId) >= itemNum or (this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1) or isFindFairyFree then NetManager.RecruitRequest(recruitType, function(msg) - local lotteryType=ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType).LotteryType --若是活动招募,目前活动招募是东海寻仙,分多期 - if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or RecruitType.QianKunBoxSingle==recruitType) then --若某抽卡类型有免费次数 + local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType) + if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or (data.LotteryType == 3 and data.PerCount == 1)) then --若某抽卡类型有免费次数 if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1) this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId) @@ -212,7 +212,7 @@ function this.GetActivityPreviewData(type) end local data = nil if curActivityId ~= nil then --活动招募 - LogGreen("curActivityId:"..curActivityId) + --LogGreen("curActivityId:"..curActivityId) data = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",curActivityId,"PerCount",1) else LogRed("活动没开,你不应该看到这儿"..curActivityId)