From 40266d1120d2c4b5dc200322d106e52a68a00ebe Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 Aug 2020 16:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9Blog?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7=E8=B1=AA=E7=A4=BC?= =?UTF-8?q?=E7=BA=A2=E7=82=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua | 9 +-------- .../ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua | 8 ++++---- .../ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Player/PlayerManager.lua | 6 +++--- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index fc1bd4d58f..4cc88bdb4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -639,7 +639,7 @@ function this.ExperyUpLvActivityIsShowRedPoint() if activeData and activeData.mission then for i = 1, #activeData.mission do local curConfigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,activeData.mission[i].missionId) - if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] then + if curConfigData and activeData.mission[i].state == 0 and activeData.value >= curConfigData.Values[2][1] and activeData.mission[i].progress>0 then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua index 5ad84c7ce7..6bd3c82627 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/Expert.lua @@ -219,14 +219,7 @@ function Expert:ActivityRewardSingleShow(index,rewardData) qianwangButton:SetActive(state == 10) getFinishText:SetActive(state == 20) getRewardProgress:SetActive(state == 10) - - --活动特殊处理 - if numExChange[activeIndext] == ActivityTypeDef.UpLvAct then - Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive((state == 0) and rewardData.progress>0) - else - Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0) - end - + Util.GetGameObject(lingquButton.gameObject, "redPoint"):SetActive(state == 0) if numExChange[activeIndext] == ActivityTypeDef.UpStarExper or numExChange[activeIndext] == ActivityTypeDef.Talisman or numExChange[activeIndext] == ActivityTypeDef.SoulPrint or numExChange[activeIndext] == ActivityTypeDef.EquipExper or numExChange[activeIndext] == ActivityTypeDef.FindTreasureExper then --进阶因为每个都不一样 特殊判断 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 2ea86fc489..6568e75abc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -193,16 +193,16 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function ExpertPanel:OnShow() - LogGreen("defaultIndex 1 "..defaultIndex) + -- LogGreen("defaultIndex 1 "..defaultIndex) if defaultIndex > 0 then self:SetOpenActiveBtn() else defaultIndex = self:SetOpenActiveBtn() - LogGreen("defaultIndex 2 "..defaultIndex) + -- LogGreen("defaultIndex 2 "..defaultIndex) defaultIndex = self:GetPriorityIndex(defaultIndex) - LogGreen("defaultIndex 3 "..defaultIndex) + -- LogGreen("defaultIndex 3 "..defaultIndex) end self:RefreshActivityShow() if defaultIndex > 0 then @@ -571,7 +571,7 @@ function ExpertPanel:SetOpenActiveBtn() --end --所有达人 for i, v in pairs(numExChange) do - LogGreen("v "..v) + -- LogGreen("v "..v) local curActiveData = ActivityGiftManager.GetActivityTypeInfo(v) if curActiveData then if defaultIndex == 0 or defaultIndex > i then diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index b456eda1e8..9571c38774 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -164,9 +164,9 @@ end function this.SetHeroFormationList(heroDid,teamId,isAddOrDel) if heroDatas[heroDid] then - LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId])) + -- LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId])) if isAddOrDel and this.heroResolveLicence[teamId] then - LogRed("添加了") + -- LogRed("添加了") heroDatas[heroDid].formationList[teamId] = teamId else heroDatas[heroDid].formationList[teamId] = nil diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index b51fd7fdb7..55b8750df9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -205,7 +205,7 @@ function this.PlayerInfoRequest(func) Log(Language[11425]..type) end LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) - LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel) + -- LogGreen("GetPlayerInfoResponse.treasureLevel:"..msg.treasureLevel) QinglongSerectTreasureManager.SetLevel(msg.treasureLevel) if func then func(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 4a98d2818f..71d677f3ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -62,13 +62,13 @@ function this.ResetLocalData() func() PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)) end - LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) + -- LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) if PlayerPrefs.GetInt(text) < curTime then func() PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400) end - LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) - LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial")) + -- LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) + -- LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial")) end function this.OnGoldChange()