From 396193571687934cea49177f14dbb1219fb7c427 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 20:45:27 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E3=80=90=E7=A5=9E=E5=B0=86=E7=BD=AE?= =?UTF-8?q?=E6=8D=A2=E3=80=91=E5=9C=A8=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E7=BC=96=E9=98=9F=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=B7=B2=E4=B8=8A=E9=98=B5=EF=BC=8C=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=93=8D=E4=BD=9C=E7=BD=AE=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/CompoundHero_Replace.lua | 4 +++- .../~Lua/Modules/Hero/HeroManager.lua | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 553c572627..180cd3f3f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -202,6 +202,7 @@ function this.GetHeroDataByPosition(_position) end return heros end + local oldChoose --数据显示 function this.SingleHeroDataShow(_go,_heroData) @@ -216,7 +217,8 @@ function this.SingleHeroDataShow(_go,_heroData) local formationMask = Util.GetGameObject(go.transform, "formationMask") local formationImage = Util.GetGameObject(go.transform, "formationMask/formationImage/upImage"):GetComponent("Image") - if LengthOfTable(heroData.formationList) ~= 0 then + if LengthOfTable(heroData.isFormations) ~= 0 then + --if LengthOfTable(heroData.formationList) ~= 0 then formationMask:SetActive(true) formationImage.sprite = Util.LoadSprite("t_tongyong-yishangzheng") elseif heroData.lockState == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 534b2e8035..65b5a04377 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2959,6 +2959,25 @@ function this.ByReplaceHeroGetAllHeros() table.insert(sortHeroList,v) end end + + for k,v in ipairs(sortHeroList) do + local isFormations = {} + for n, w in ipairs(v.formationList) do + if w ~= 1301 then + local isFormationStr = HeroManager.GetHeroFormationStr(w) + if isFormationStr and isFormationStr ~= "" then + table.insert(isFormations, w) + if v.isFormation and v.isFormation ~= "" then + v.isFormation = v.isFormation .. "、".. isFormationStr + else + v.isFormation = isFormationStr + end + end + end + end + v.isFormations = isFormations + end + table.sort(sortHeroList, function(a,b) if a.star == b.star then if a.lv == b.lv then From b2ed38aaacb15c677cdcc4b843e290cf7924a687 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 20:52:58 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E6=9C=8D=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AssetBundles/version_hw_release.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 AssetBundles/version_hw_release.txt diff --git a/AssetBundles/version_hw_release.txt b/AssetBundles/version_hw_release.txt new file mode 100644 index 0000000000..1bd0773d9e --- /dev/null +++ b/AssetBundles/version_hw_release.txt @@ -0,0 +1 @@ +{"subChannel":"2000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_release/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file From dc0c3940aa8b1713d729e7be7b8d25cbd9b65952 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 20:53:42 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D=E7=83=AD=E6=9B=B4=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AssetBundles/version_hw_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AssetBundles/version_hw_test.txt b/AssetBundles/version_hw_test.txt index cd5c00c3f2..a554cd863f 100644 --- a/AssetBundles/version_hw_test.txt +++ b/AssetBundles/version_hw_test.txt @@ -1 +1 @@ -{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.4", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file +{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_test/", "packageVersion":"0.4", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file From 283ffca27501d5bf20beca94fc03c8a16a188140 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:01:05 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E7=BD=AE=E6=8D=A2?= =?UTF-8?q?=E4=B8=8D=E6=A3=80=E6=B5=8B=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 65b5a04377..5aa33eed5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2963,7 +2963,7 @@ function this.ByReplaceHeroGetAllHeros() for k,v in ipairs(sortHeroList) do local isFormations = {} for n, w in ipairs(v.formationList) do - if w ~= 1301 then + if w ~= 1301 and w ~= 401 then local isFormationStr = HeroManager.GetHeroFormationStr(w) if isFormationStr and isFormationStr ~= "" then table.insert(isFormations, w) From f25bdb2d170cb5d6d2cf3b2dcb1def4ce8b066e6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:17:47 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E7=A5=9E=E5=B0=86=E7=BD=AE=E6=8D=A2?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A3=80=E6=B5=8B=E7=BC=96=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua | 4 ++-- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 180cd3f3f7..68c00b4a63 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -326,9 +326,9 @@ function this.SingleHeroDataShow(_go,_heroData) end) Util.AddOnceClick(formationMask, function() - if LengthOfTable(heroData.formationList) ~= 0 then + if LengthOfTable(hheroData.isFormations) ~= 0 then local text = "" - for key, value in pairs(heroData.formationList) do + for key, value in pairs(heroData.isFormations) do text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318] end PopupTipPanel.ShowTip(text) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 5aa33eed5e..83b1b58c2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2967,11 +2967,6 @@ function this.ByReplaceHeroGetAllHeros() local isFormationStr = HeroManager.GetHeroFormationStr(w) if isFormationStr and isFormationStr ~= "" then table.insert(isFormations, w) - if v.isFormation and v.isFormation ~= "" then - v.isFormation = v.isFormation .. "、".. isFormationStr - else - v.isFormation = isFormationStr - end end end end From f2f3b7726028f6739b487335c86ef519eb13bf65 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:29:03 +0800 Subject: [PATCH 06/19] biandui update --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 83b1b58c2e..9fe4966e8a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2963,12 +2963,10 @@ function this.ByReplaceHeroGetAllHeros() for k,v in ipairs(sortHeroList) do local isFormations = {} for n, w in ipairs(v.formationList) do - if w ~= 1301 and w ~= 401 then local isFormationStr = HeroManager.GetHeroFormationStr(w) if isFormationStr and isFormationStr ~= "" then table.insert(isFormations, w) end - end end v.isFormations = isFormations end From b78d3e667e006d9d25a5d9a652baf51926d2852b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 21:34:38 +0800 Subject: [PATCH 07/19] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=9C=A8=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=B7=AE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DailyRecharge/DailyRechargePanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index e32d6ed0df..f82c06bbe7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -96,9 +96,9 @@ function DailyRechargePanel:RefreshPanel() else self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.dollar:SetActive(true) - local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() - remainValue = remainValue < 0 and 0 or remainValue - self.desc.text = remainValue + -- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() + -- remainValue = remainValue < 0 and 0 or remainValue + self.desc.text = actRewardConfig.Values[1][1]--remainValue self.dealText.text = Language[10436] end end From a7fea145f63cddc2e7a1d70ad9aab75625d2f8b2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 21:40:01 +0800 Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=91=A8?= =?UTF-8?q?=E6=9C=88=E7=A4=BC=E5=8C=85=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/OperatingManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 15def303f9..13d7d84879 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -101,7 +101,7 @@ end -- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动 function this.HasGoodsByShowType(showType) - local list = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType) + local list = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType) if not list then return false end for _, goods in ipairs(list) do if this.GetGiftGoodsInfo(goods.Type, goods.Id) then From 010f44b1b00549e2bf76b13f01244c51f19f43e8 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 21:41:30 +0800 Subject: [PATCH 09/19] commit zhihuan --- .../~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 68c00b4a63..8a6a28b71a 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -326,7 +326,7 @@ function this.SingleHeroDataShow(_go,_heroData) end) Util.AddOnceClick(formationMask, function() - if LengthOfTable(hheroData.isFormations) ~= 0 then + if LengthOfTable(heroData.isFormations) ~= 0 then local text = "" for key, value in pairs(heroData.isFormations) do text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318] From 4a452addd1cf80b8f4fd0f3befdc4f8f591861a2 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 27 Aug 2020 22:10:08 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E7=A7=98=E5=AE=9D?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Expedition/ExpeditionMainPanel.lua | 4 +- .../~Lua/Modules/Net/IndicationManager.lua | 8 +- .../~Lua/Modules/Net/NetManager.lua | 4 +- ...eralPopup_HeavenUnlockExtraRewardPanel.lua | 6 +- .../TreasureOfHeavenManager.lua | 95 ++++++++++--------- .../TreasureOfHeavenPanel.lua | 86 ++++++++--------- 6 files changed, 99 insertions(+), 104 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 3f96b237fc..bfa4a3af20 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -189,8 +189,8 @@ end --大闹天宫入口是否开启 function ExpeditionMainPanel:IsTreasureOpen() - self.Btn4:SetActive(TreasureOfHeavenManger.GetLimitTime() ~= -1) - Util.GetGameObject(self.parent, "upLeftGo/Image"):SetActive(TreasureOfHeavenManger.GetLimitTime() ~= -1) + self.Btn4:SetActive(TreasureOfHeavenManger.resetTime ~= -1) + Util.GetGameObject(self.parent, "upLeftGo/Image"):SetActive(TreasureOfHeavenManger.resetTime ~= -1) end --实例化层数信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index 28564f7d92..1b266d9821 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -765,11 +765,9 @@ function this.TreasureStateIndicaion(buffer) local msg = Expedition_pb.TreasureStateIndicaion()--ExpeditionResetIndication() msg:ParseFromString(data) -- LogGreen("msg.score :"..msg.score.." msg.resetTime:"..msg.resetTime) - TreasureOfHeavenManger.SetScore(msg.score) - TreasureOfHeavenManger.SetLimitTime(msg.resetTime) - for i = 1, #msg.treasureRewardState do - TreasureOfHeavenManger. SetSingleRewardState(msg.treasureRewardState[i].id,msg.treasureRewardState[i].state) - end + TreasureOfHeavenManger.UpdateData(msg) + LogPink("推回来的数据长度"..#msg.treasureRewardState) + end function this.GuildTranscriptIndication(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index abe3318a22..12a930213f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4189,9 +4189,7 @@ function NetManager.TreasureOfHeavenScoreRequest(func) local data = buffer:DataByte() local msg = Expedition_pb.ExpeditionTreasureInfoResponse() msg:ParseFromString(data) - TreasureOfHeavenManger.SetScore(msg.score) - TreasureOfHeavenManger.SetLimitTime(msg.resetTime) - TreasureOfHeavenManger.SetState(msg.treasureRewardState) + TreasureOfHeavenManger.UpdateData(msg) if func then func(msg) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index b26b87386f..bb9d13979e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -54,7 +54,7 @@ function this:OnShow(_parent,...) local temp = {...} curType = temp[1] if curType == 1 then - rewardStateData = TreasureOfHeavenManger.GetState() + rewardStateData = TreasureOfHeavenManger.rewardStateData rewardData = TreasureOfHeavenManger.GetAllRewardData() this:showRewardTianGong() this.tip.text = Language[12366] @@ -84,8 +84,10 @@ function this:showRewardTianGong() local direct = {} local indirect ={} - local curScore = TreasureOfHeavenManger.GetScore()--当前分数 + local curScore = TreasureOfHeavenManger.curScore--当前分数 + LogPink("sssss"..#rewardData) + LogBlue("aaaaaa"..#rewardStateData) for i = 1, #rewardData do if curScore >= rewardData[i].Integral then if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的 diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index f6a5be6a3c..470fb29766 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -1,23 +1,36 @@ TreasureOfHeavenManger = {} local this = TreasureOfHeavenManger -local WorldBossTreasureConfig = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) +local ConfigData = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) -local curScore--当前分数 -local limitTime--倒计时 -local rewardStateData = {}--各个任务状态数据 -local rewardData = {}--表内活动任务数据 +this.curScore = 0--当前分数 +this.resetTime = 0--倒计时 +this.rewardStateData = {}--各个任务状态数据 +-- local rewardData = {}--表内活动任务数据 this.TreasrueState = nil--礼包购买状态 -function this.Initialize() - rewardData = {} - for i, v in ConfigPairs(WorldBossTreasureConfig) do - table.insert(rewardData, v) +function this.UpdateData(msg) + -- rewardData = {} + -- for i, v in ConfigPairs(ConfigData) do + -- table.insert(rewardData, v) + -- end + if msg.score then + this.curScore = msg.score + end + if msg.resetTime then + this.resetTime = msg.resetTime + end + if msg.treasureRewardState then + if #msg.treasureRewardState == 1 then + for i = 1, #this.rewardStateData do + if this.rewardStateData[i].id == msg.treasureRewardState.id then + this.rewardStateData[i].state = msg.treasureRewardState.state + end + end + elseif #msg.treasureRewardState > 1 then + this.rewardStateData = msg.treasureRewardState + end end -end - -function this.GetTreasureState() this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) - return this.TreasrueState end function this.SetTreasureState() @@ -25,45 +38,29 @@ function this.SetTreasureState() return this.TreasrueState end -function this.SetScore(score) - curScore = score -end -function this.GetScore() - return curScore -end - -function this.SetLimitTime(time) - limitTime = time -end -function this.GetLimitTime() - return limitTime -end - -function this.SetState(treasureRewardState) - rewardStateData = {} - for i, v in ipairs(treasureRewardState) do - table.insert(rewardStateData, v) - end -end -function this.GetState() - return rewardStateData -end - function this.SetSingleRewardState(id,state) - for i = 1, #rewardStateData do - if(rewardStateData[i].id == id)then - rewardStateData[i].state = state + for i = 1, #this.rewardStateData do + if(this.rewardStateData[i].id == id)then + this.rewardStateData[i].state = state end end CheckRedPointStatus(RedPointType.Expedition_Treasure) end function this.GetAllRewardData() - return rewardData + local data={} + for i = 1, #this.rewardStateData do + for k, v in ConfigPairs(ConfigData) do + if this.rewardStateData[i].id == v.Id then + table.insert(data, v) + end + end + end + return data end --红点检测 function this.RedPointState(singleRewardData,TreasrueState) - if curScore >= rewardData[singleRewardData.id].Integral then + if this.curScore >= ConfigData[singleRewardData.id].Integral then if singleRewardData.state==0 and this.TreasrueState==1 or singleRewardData.state==1 and this.TreasrueState==1 or singleRewardData.state==0 and this.TreasrueState==0 then @@ -75,12 +72,16 @@ function this.RedPointState(singleRewardData,TreasrueState) end function this.RedPoint() - for i =1, #rewardStateData do + local data={} + for i, v in ConfigPairs(ConfigData) do + table.insert(data, v) + end + for i =1, #this.rewardStateData do local curTreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) - if curScore >= rewardData[rewardStateData[i].id].Integral then - if rewardStateData[i].state==0 and curTreasrueState==1 or - rewardStateData[i].state==1 and curTreasrueState==1 or - rewardStateData[i].state==0 and curTreasrueState==0 then + if this.curScore >= ConfigData[this.rewardStateData[i].id].Integral then + if this.rewardStateData[i].state==0 and curTreasrueState==1 or + this.rewardStateData[i].state==1 and curTreasrueState==1 or + this.rewardStateData[i].state==0 and curTreasrueState==0 then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index 68b314e9d3..f8e75b3c7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -1,10 +1,11 @@ require("Base/BasePanel") local TreasureOfHeavenPanel = Inherit(BasePanel) local this = TreasureOfHeavenPanel -local curScore = 0--当前分数 -local rewardStateData = {} +-- local curScore = 0--当前分数 +-- local rewardStateData = {} local treasureState = nil -local rewardData--表内活动数据 +local rewardData--后端活动数据 +local ConfigData = ConfigManager.GetConfig(ConfigName.WorldBossTreasureConfig) --初始化组件(用于子类重写) function TreasureOfHeavenPanel:InitComponent() @@ -67,23 +68,19 @@ end -- 打开,重新打开时回调 function TreasureOfHeavenPanel:OnShow() this.tips.text = Language[11988] - this.time.text=TimeToDHMS(TreasureOfHeavenManger.GetLimitTime()-GetTimeStamp()) + this.time.text=TimeToDHMS(TreasureOfHeavenManger.resetTime - GetTimeStamp()) TreasureOfHeavenPanel:ShowTime() TreasureOfHeavenPanel:refresh() end function TreasureOfHeavenPanel:refresh() - rewardData = TreasureOfHeavenManger.GetAllRewardData() - treasureState = TreasureOfHeavenManger.GetTreasureState()--秘宝礼包状态 0:可购买 1:已购买 - rewardStateData = TreasureOfHeavenManger.GetState()--任务状态 - if #rewardStateData <= 0 then - curScore = TreasureOfHeavenManger.GetScore()--当前分数 - rewardStateData = TreasureOfHeavenManger.GetState()--任务状态 - + treasureState = TreasureOfHeavenManger.TreasrueState + rewardData = TreasureOfHeavenManger.rewardStateData + LogGreen("#rewardData长度:"..#rewardData) + if #TreasureOfHeavenManger.rewardStateData <= 0 then TreasureOfHeavenPanel:topBar() TreasureOfHeavenPanel:showTaskList() else - curScore = TreasureOfHeavenManger.GetScore()--当前分数 TreasureOfHeavenPanel:topBar() TreasureOfHeavenPanel:showTaskList() end @@ -101,8 +98,7 @@ function TreasureOfHeavenPanel:topBar() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,1) end) end - - this.scoreText.text = curScore + this.scoreText.text = TreasureOfHeavenManger.curScore end @@ -114,16 +110,16 @@ function TreasureOfHeavenPanel:showTaskList() --定位打开界面时位置 local t = 0 - if treasureState == 0 then - for i = 1, #rewardStateData do - if rewardStateData[i].state == 0 then + if TreasureOfHeavenManger.TreasrueState == 0 then + for i = 1, #rewardData do + if rewardData[i].state == 0 then t = i break end end - elseif treasureState == 1 then - for i = 1, #rewardStateData do - if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then + elseif TreasureOfHeavenManger.TreasrueState == 1 then + for i = 1, #rewardData do + if rewardData[i].state == 1 or rewardData[i].state == 0 then t = i break end @@ -134,7 +130,7 @@ end local itemsList={} --单个任务 -function TreasureOfHeavenPanel:SingleTask(rewardItem, rewardSingleData) +function TreasureOfHeavenPanel:SingleTask(rewardItem, singleData) local scoreLevel = Util.GetGameObject(rewardItem, "scoreLevel"):GetComponent("Text") local pos1 = Util.GetGameObject(rewardItem, "itemPos_1") local pos3 = Util.GetGameObject(rewardItem, "itemPos_3") @@ -147,16 +143,16 @@ function TreasureOfHeavenPanel:SingleTask(rewardItem, rewardSingleData) itemsList[rewardItem] ={item1,item3,item4} end - scoreLevel.text = rewardSingleData.Integral - itemsList[rewardItem][1]:OnOpen(false, {rewardSingleData.Reward[1][1], rewardSingleData.Reward[1][2]}, 0.8, false) - itemsList[rewardItem][2]:OnOpen(false, {rewardSingleData.TreasureReward[1][1], rewardSingleData.TreasureReward[1][2]}, 0.8, false) - itemsList[rewardItem][3]:OnOpen(false, {rewardSingleData.TreasureReward[2][1], rewardSingleData.TreasureReward[2][2]}, 0.8, false) + scoreLevel.text = ConfigData[singleData.id].Integral + itemsList[rewardItem][1]:OnOpen(false, {ConfigData[singleData.id].Reward[1][1], ConfigData[singleData.id].Reward[1][2]}, 0.8, false) + itemsList[rewardItem][2]:OnOpen(false, {ConfigData[singleData.id].TreasureReward[1][1], ConfigData[singleData.id].TreasureReward[1][2]}, 0.8, false) + itemsList[rewardItem][3]:OnOpen(false, {ConfigData[singleData.id].TreasureReward[2][1], ConfigData[singleData.id].TreasureReward[2][2]}, 0.8, false) --初始化按钮状态 - TreasureOfHeavenPanel:InitButtonState(rewardItem, rewardSingleData) + TreasureOfHeavenPanel:InitButtonState(rewardItem, singleData) end --初始化按钮状态 -function TreasureOfHeavenPanel:InitButtonState(rewardItem, rewardSingleData) +function TreasureOfHeavenPanel:InitButtonState(rewardItem, singleData) local btnDeal = Util.GetGameObject(rewardItem, "btnDeal") local get = Util.GetGameObject(rewardItem, "btnDeal/get") @@ -165,9 +161,9 @@ function TreasureOfHeavenPanel:InitButtonState(rewardItem, rewardSingleData) local finished = Util.GetGameObject(rewardItem, "finished") local redPoint = Util.GetGameObject(rewardItem, "btnDeal/redPoint") --当前任务领取情况 - local state = rewardStateData[rewardSingleData.Id].state + local state = singleData.state --判断 - if curScore >= rewardSingleData.Integral then + if TreasureOfHeavenManger.curScore >= ConfigData[singleData.id].Integral then if (state == -1) then btnDeal.gameObject:SetActive(false) get.gameObject:SetActive(false) @@ -196,17 +192,17 @@ function TreasureOfHeavenPanel:InitButtonState(rewardItem, rewardSingleData) end --添加点击事件 Util.AddOnceClick(btnDeal,function() - TreasureOfHeavenPanel:OnBtnDealClicked(rewardItem,rewardSingleData) + TreasureOfHeavenPanel:OnBtnDealClicked(rewardItem,singleData) end) --红点状态 - redPoint:SetActive(TreasureOfHeavenManger.RedPointState(rewardStateData[rewardSingleData.Id],treasureState)) + redPoint:SetActive(TreasureOfHeavenManger.RedPointState(singleData,treasureState)) end --按钮事件 -function TreasureOfHeavenPanel:OnBtnDealClicked(rewardItem,rewardSingleData) +function TreasureOfHeavenPanel:OnBtnDealClicked(rewardItem,singleData) local btnDeal = Util.GetGameObject(rewardItem, "btnDeal") local get = Util.GetGameObject(rewardItem, "btnDeal/get") @@ -214,21 +210,21 @@ function TreasureOfHeavenPanel:OnBtnDealClicked(rewardItem,rewardSingleData) local unfinished = Util.GetGameObject(rewardItem, "btnDeal/unfinished") local finished = Util.GetGameObject(rewardItem, "btnDeal/finished") - if curScore >= rewardSingleData.Integral then--分数达到要求 - if (rewardStateData[rewardSingleData.Id].state == 0 and treasureState == 0) or--任务未领取+礼包未购买 - (rewardStateData[rewardSingleData.Id].state == 1 and treasureState == 1) or--任务已领取+礼包已购买 - (rewardStateData[rewardSingleData.Id].state == 0 and treasureState == 1)then--任务未领取+礼包已购买 - NetManager.GetTreasureOfHeavenRewardRequest(rewardStateData[rewardSingleData.Id].id,function(msg) + if TreasureOfHeavenManger.curScore >= ConfigData[singleData.id].Integral then--分数达到要求 + if (singleData.state == 0 and treasureState == 0) or--任务未领取+礼包未购买 + (singleData.state == 1 and treasureState == 1) or--任务已领取+礼包已购买 + (singleData.state == 0 and treasureState == 1)then--任务未领取+礼包已购买 + NetManager.GetTreasureOfHeavenRewardRequest(singleData.id,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1) --需要刷新界面 if treasureState == 0 then--判断是否已经购买了礼包 - TreasureOfHeavenManger.SetSingleRewardState(rewardStateData[rewardSingleData.Id].id,1) + TreasureOfHeavenManger.SetSingleRewardState(singleData.id,1) else - TreasureOfHeavenManger.SetSingleRewardState(rewardStateData[rewardSingleData.Id].id,-1) + TreasureOfHeavenManger.SetSingleRewardState(singleData.id,-1) end TreasureOfHeavenPanel:refresh()--刷新界面 end) - elseif rewardStateData[rewardSingleData.Id].state == 1 and treasureState == 0 then----任务已领取+礼包未购买(弹出购买界面) + elseif singleData.state == 1 and treasureState == 0 then----任务已领取+礼包未购买(弹出购买界面) UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,1) end else--分数未达到要求 @@ -241,13 +237,13 @@ function TreasureOfHeavenPanel:ShowTime() self.localTimer:Stop() self.localTimer = nil end - local t = TreasureOfHeavenManger.GetLimitTime() + local t = TreasureOfHeavenManger.resetTime local time self.localTimer = Timer.New(function() - time = t-GetTimeStamp() - if t-GetTimeStamp() <= 0 then + time = t - GetTimeStamp() + if t - GetTimeStamp() <= 0 then time = 0 - t = TreasureOfHeavenManger.GetLimitTime() + t = TreasureOfHeavenManger.resetTime treasureState = nil TreasureOfHeavenPanel:refresh() end @@ -266,7 +262,7 @@ end --界面销毁时调用(用于子类重写) function TreasureOfHeavenPanel:OnDestroy() - rewardStateData = {} + rewardData = {} end return TreasureOfHeavenPanel \ No newline at end of file From 80f59d54f1aaf6d915129f4e1342d9d54da44585 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 22:23:04 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=BD=AE=E6=8D=A2=E7=BC=96=E9=98=9F?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompoundHero/view/CompoundHero_Replace.lua | 8 ++++---- .../~Lua/Modules/Hero/HeroManager.lua | 14 +------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index 8a6a28b71a..46892fc72a 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -217,7 +217,7 @@ function this.SingleHeroDataShow(_go,_heroData) local formationMask = Util.GetGameObject(go.transform, "formationMask") local formationImage = Util.GetGameObject(go.transform, "formationMask/formationImage/upImage"):GetComponent("Image") - if LengthOfTable(heroData.isFormations) ~= 0 then + if LengthOfTable(heroData.formationList) ~= 0 then --if LengthOfTable(heroData.formationList) ~= 0 then formationMask:SetActive(true) formationImage.sprite = Util.LoadSprite("t_tongyong-yishangzheng") @@ -326,10 +326,10 @@ function this.SingleHeroDataShow(_go,_heroData) end) Util.AddOnceClick(formationMask, function() - if LengthOfTable(heroData.isFormations) ~= 0 then + if LengthOfTable(heroData.formationList) ~= 0 then local text = "" - for key, value in pairs(heroData.isFormations) do - text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318] + for key, value in pairs(heroData.formationList) do + text = Language[12317]..HeroManager.GetHeroFormationStr2(value)..Language[12318] end PopupTipPanel.ShowTip(text) return diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 9fe4966e8a..9217617c21 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -164,7 +164,7 @@ end function this.SetHeroFormationList(heroDid,teamId,isAddOrDel) if heroDatas[heroDid] then - if isAddOrDel then + if isAddOrDel and this.heroResolveLicence[teamId] then heroDatas[heroDid].formationList[teamId] = teamId else heroDatas[heroDid].formationList[teamId] = nil @@ -2959,18 +2959,6 @@ function this.ByReplaceHeroGetAllHeros() table.insert(sortHeroList,v) end end - - for k,v in ipairs(sortHeroList) do - local isFormations = {} - for n, w in ipairs(v.formationList) do - local isFormationStr = HeroManager.GetHeroFormationStr(w) - if isFormationStr and isFormationStr ~= "" then - table.insert(isFormations, w) - end - end - v.isFormations = isFormations - end - table.sort(sortHeroList, function(a,b) if a.star == b.star then if a.lv == b.lv then From 013bed75d7be72d0e2d038282f1e379ba006e45f Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 27 Aug 2020 22:25:10 +0800 Subject: [PATCH 12/19] --- .../~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index 470fb29766..4f48242662 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -20,13 +20,13 @@ function this.UpdateData(msg) this.resetTime = msg.resetTime end if msg.treasureRewardState then - if #msg.treasureRewardState == 1 then + if #this.rewardStateData>0 then for i = 1, #this.rewardStateData do if this.rewardStateData[i].id == msg.treasureRewardState.id then this.rewardStateData[i].state = msg.treasureRewardState.state end end - elseif #msg.treasureRewardState > 1 then + else this.rewardStateData = msg.treasureRewardState end end From efd5a46eedb5a44c05e6566da90018ecb189522f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 27 Aug 2020 22:52:51 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E7=BD=AE=E6=8D=A2=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Expedition/ExpeditionHeroListInfoPopup.lua | 3 +++ .../Expedition/ExpeditionHeroListResurgencePopup.lua | 5 ++++- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 9 +++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua index 718937aea7..ade48e1f26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListInfoPopup.lua @@ -112,6 +112,9 @@ function this.SingleHeroDataShow(_go, _heroData) Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1) --剩余血量 无尽副本才显示 local hpExp = Util.GetGameObject(go, "hpExp") + if not ExpeditionManager.heroInfo[heroData.dynamicId] then + ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + end local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp local starGrid = Util.GetGameObject(go, "star") SetHeroStars(starGrid, heroData.star) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua index 269f3d01c2..c8c0054c93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua @@ -158,7 +158,10 @@ function this.SingleHeroDataShow(_go, _heroData) Util.GetGameObject(go, "yuanImage"):SetActive(heroData.createtype == 1) --剩余血量 无尽副本才显示 local hpExp = Util.GetGameObject(go, "info/hpExp") - local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp + if not ExpeditionManager.heroInfo[heroData.dynamicId] then + ExpeditionManager.InitHeroHpValue(heroData.dynamicId) + end + local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp local starGrid = Util.GetGameObject(go, "info/star") SetHeroStars(starGrid, heroData.star) this.SetHeroBlood(hpExp, heroHp, go) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 8390233793..01f7246d19 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -595,11 +595,11 @@ end --获取所有英雄信息 function this.GetAllHeroDatas(heros,_lvLimit) local lvLimit = 0 - local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) + --local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) if _lvLimit then lvLimit = _lvLimit end --local heros = {} for i, v in pairs(heroDatas) do - if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then + if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then table.insert(heros,v) end end @@ -610,7 +610,7 @@ end --通过属性筛选英雄 function this.GetHeroDataByProperty(heros,_property,_lvLimit) local lvLimit = 0 - local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) + --local allUpZhenHeroList = FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_ENDLESS_MAP) if _lvLimit then lvLimit = _lvLimit end local index = 1 if heros and #heros > 0 then @@ -618,7 +618,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit) end for i, v in pairs(heroDatas) do if v.property == _property then - if v.lv >= lvLimit or allUpZhenHeroList[v.dynamicId] then + if v.lv >= lvLimit then--or allUpZhenHeroList[v.dynamicId] then heros[index] = v index = index + 1 end @@ -626,6 +626,7 @@ function this.GetHeroDataByProperty(heros,_property,_lvLimit) end return heros end + --获取单个英雄数据 function this.GetSingleHeroData(heroDId) if heroDatas[heroDId] then From e6c8e81c8287f0cd0dc5c4ec493c9dda1495706e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 23:01:07 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=8F=8D=E5=A4=8D=E6=89=93=E5=BC=80=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua | 6 +++++- Assets/Scripts/GameInit/GameStart.cs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua index b7f7cf5797..3cb2c6e27e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/TrialMiniGamePanel.lua @@ -59,7 +59,11 @@ end --界面销毁时调用(用于子类重写) function BuffChoosePanel:OnDestroy() - this.logic.Destroy() + for i, logic in pairs(_LogicConfig) do + if logic.Destroy then + logic.Destroy() + end + end end return BuffChoosePanel \ No newline at end of file diff --git a/Assets/Scripts/GameInit/GameStart.cs b/Assets/Scripts/GameInit/GameStart.cs index 59e98e0e6e..d359449b56 100644 --- a/Assets/Scripts/GameInit/GameStart.cs +++ b/Assets/Scripts/GameInit/GameStart.cs @@ -62,7 +62,7 @@ public class GameStart : MonoBehaviour Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); image2.DOFade(1, 0).OnComplete(() =>{ - image.DOFade(0, 0).SetDelay(2).OnComplete(() =>{ + image2.DOFade(0, 0).SetDelay(2).OnComplete(() =>{ image.color = new Color(image.color.r, image.color.g, image.color.b, 0); image.DOFade(1, 1).OnComplete(() => { image.DOFade(0, 1).SetDelay(2).OnComplete(() => { From 8e5e508494265789db7cfe23bb2d689f0ca86a5c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 28 Aug 2020 00:09:07 +0800 Subject: [PATCH 15/19] =?UTF-8?q?=E7=BD=AE=E6=8D=A2=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompoundHero/CompoundHeroUpStarListPanel.lua | 10 +++++----- .../~Lua/Modules/Hero/HeroManager.lua | 11 +++++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua index 6a6604b514..9bbb1c8c1b 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua @@ -139,8 +139,8 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local formationMask = Util.GetGameObject(go.transform, "formationMask") -- formationMask:SetActive(false) - formationMask:SetActive( #heroData.formationList ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108]) - Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(#heroData.formationList ~= 0) + formationMask:SetActive( LengthOfTable(heroData.formationList) ~= 0 or heroData.lockState == 1)--(heroData.isFormation ~= "" and heroData.isFormation ~= Language[11108]) + Util.GetGameObject(formationMask.transform, "formationImage"):SetActive(LengthOfTable(heroData.formationList) ~= 0) Util.GetGameObject(formationMask.transform, "lockImage"):SetActive( heroData.lockState == 1) Util.GetGameObject(go.transform, "noumenon"):SetActive( heroData.id == curHeroData.Id ) local starGrid = Util.GetGameObject(go.transform, "star") @@ -163,9 +163,9 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 end) Util.AddOnceClick(formationMask, function() - if #heroData.formationList ~= 0 then + if LengthOfTable(heroData.formationList) ~= 0 then local text = "" - for index, value in ipairs(heroData.formationList) do + for index, value in pairs(heroData.formationList) do text = HeroManager.GetHeroFormationStr(index) end PopupTipPanel.ShowTip(text) @@ -209,7 +209,7 @@ function CompoundHeroUpStarListPanel:AutoSelectHero() LogGreen("sssssssssssssssssssss") curSelectHeroList = {} for i = 1, #heroDataList do - if LengthOfTable(curSelectHeroList) < curNeedRoleNum and #heroDataList[i].formationList == 0 and heroDataList[i].lockState == 0 then-- + if LengthOfTable(curSelectHeroList) < curNeedRoleNum and LengthOfTable(heroDataList[i].formationList) == 0 and heroDataList[i].lockState == 0 then-- LogGreen("heroDataList[i].dynamicId "..heroDataList[i].dynamicId) curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i] end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 9217617c21..cd29f523b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -164,7 +164,9 @@ end function this.SetHeroFormationList(heroDid,teamId,isAddOrDel) if heroDatas[heroDid] then + LogRed("this.heroResolveLicence[teamId]:"..tostring(this.heroResolveLicence[teamId])) if isAddOrDel and this.heroResolveLicence[teamId] then + LogRed("添加了") heroDatas[heroDid].formationList[teamId] = teamId else heroDatas[heroDid].formationList[teamId] = nil @@ -2915,15 +2917,16 @@ function this.ByCompoundHeroGetAllHeros() local downSoryHeroList = {} for i, v in pairs(heroDatas) do if v.star == 4 or v.star == 5 or v.star == 3 then--四星 五星 才能加 3星 是狗粮 - if #v.formationList ~= 0 then + if LengthOfTable(v.formationList) ~= 0 then local text = "" - for index, value in ipairs(v.formationList) do - text = HeroManager.GetHeroFormationStr(index) + for index, value in pairs(v.formationList) do + text = HeroManager.GetHeroFormationStr(value) end + LogRed("text:"..text) v.isFormation = text end table.insert(upSortHeroList,v) - table.insert(downSoryHeroList,v) + table.insert(downSoryHeroList,v) end end table.sort(downSoryHeroList, function(a,b) From 02735594ba629d85f5dda019dba6236a2517f724 Mon Sep 17 00:00:00 2001 From: liujiaqi Date: Fri, 28 Aug 2020 00:10:09 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E8=A1=80=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Icons/r_buff_xue_Up.png | Bin 0 -> 2306 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Assets/ManagedResources/Icons/r_buff_xue_Up.png diff --git a/Assets/ManagedResources/Icons/r_buff_xue_Up.png b/Assets/ManagedResources/Icons/r_buff_xue_Up.png new file mode 100644 index 0000000000000000000000000000000000000000..ee006809523e32e9fc086c5fe41c7ba31a1538f8 GIT binary patch literal 2306 zcmaJ@dpMMN8y=0yp)|>5BiYv|By%3aOs34qBn=sMqqZ0`Q!_F1PBSB8q*4l-GAdf+ zP?AFq>9j)8S40P~VO4CkP9==7Nn5SHcUs!-kG_4c>wSN}=eh3tdG6=%$D6dlmp$La z+5`rJ&G%l*LG;dM zp$7~GcMt~#DT6rcDSS|Z=IJqLl|%-yVK9$1DjAO-E>r?x!tG)y6{)SMLjqy}6}i!s zgXPE=LXmi_S}qJw`v&sW;e4_Hxn?!sp`t(mBtj(*P)Q=B3W|z~{2Z48-Sut^68H>J zhEtJ$iwfdw02rWL2)Lq2C_awh4!DugI9IYep6CMLu{aV2OUB@cC@hYGB~!3CVEREq z+2n$46fVS%m2Q3f_C}ej6 zi$)^jS#+!$4#y%xwigZOMP@SSEH5SjJHz#sDwI4aUpT`R|HH-oE0@BM3wcUV9teUF zGt=830+pab1j+ygLq9Dyz-gmcDgdJtEA;K1Rx6Z?cL@bva!>+%?hi%$6%9-lo{S|j z>5z09q~DG1#>CQyG#mlPA``cEsU19WdBzxi^y*sCsfgIA;Ck?-qZ$a=pKYD}$3Vn@IWf8oSYceER9J zgeIFz#6b6nI~S8EGWdg2PK3nj1ip*T6~{<`-;w1dGLq4>rB(;(0}=k_90%;y*?051 z5(aHV>{k*~R7J@6#M_*hQEJ_u!4G=|YYJzTcFnt%>jA3|4vP!25h2q(OEc{IYMV}e zn-m?U3x!waCjM#K%L55x#qDYNdBOTV*Tq~joq_5lUa>n*aa$3}T zI)KO<(PkCZjuTd|4w=KMFy}5<5uW>_K?Cg1gVs&4wFv9VhSnRSQ=tPibznH?7b1#-3sIN1mYWVs5k-e<04x_oylxq51G0 zSn2rix%ax!)<1MA67J}PPq)>9lUu3MDzNuG;x?0g=5nox>#x@HMu>uQ^krKXzQL0z zLrX*+hUMe85*$-J0So%K&gm{hcf`7WZ249&{zuhBahIsJYRyd-x4F&j!9$nA z+4G99WhO>^wz|B|a^a1n=8WJ4C4tVRn`;^)xIwd1+Q;lx5{_6ooO=eW31{S~-JW^S zoNwPt|8ODX5@IZPfFlUt=K$ZSGYS(%Y%ebwwY{k8XtcSh11#^m)3%xJ?zLWMk;Hsi z)d3Gd)|$q>Z9zBk@bQf+55R|pK&)|)QO);HVQfeCABJ0g*fQ3?F^zOD`T8zh*fnn! zpQ%aT5E*%-sJJ*QN}HAzd!V!KNiy?EJh1sffmDU+4smCQ4%#^WKy^a*0DBZ{FlJk0&88Ru?T>3+!hY)c%5o- zGVxqU)^qQYLGdv{?y_{xLe}|5&+BsnE&9LN#EHk4_-Jluff#Cmjuh|{$J{4RJHMs8 zrE1R=%cUdPU5K|Z5EV4m=J?J<8}Qbdyr_cXYu?fsI_Q3M{>NMW+OFukFNl2k_Hlpi z7 Date: Fri, 28 Aug 2020 00:15:32 +0800 Subject: [PATCH 17/19] hecheng --- .../~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 51c4f05b82..b349a6c67e 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -287,7 +287,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData) -- curSelectUpStarGo = needHeros[i + 1] for j = 1, LengthOfTable(upStarHeroListData) do if #curSelectHeroList < _curUpStarData.upStarData[i][4] then - if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[i].isFormation == "" then + if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[j].isFormation == "" then table.insert(curSelectHeroList,upStarHeroListData[j]) end end From c933276cead0e05aa337e629329b66f8a241d6cd Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 00:24:06 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E8=AF=95=E7=82=BC=E5=A2=9E=E7=9B=8A?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=91=E5=8A=A8=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 512 +++++++++++++++++- .../Popup/View/GeneralPopup_TrialGain.lua | 2 +- 2 files changed, 509 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 485eeeb380..7fbe74f3d4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -4363,7 +4363,7 @@ RectTransform: m_Children: - {fileID: 407214901555688405} m_Father: {fileID: 3877862887809483861} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14669,6 +14669,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3889582380773490144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2113935668306464302} + - component: {fileID: 3089526278750694217} + - component: {fileID: 4466427626236729324} + m_Layer: 5 + m_Name: Tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2113935668306464302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889582380773490144} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3835777603823743098} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 163, y: -45} + m_SizeDelta: {x: 186, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3089526278750694217 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889582380773490144} + m_CullTransparentMesh: 0 +--- !u!114 &4466427626236729324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3889582380773490144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9245283, g: 0.8870058, b: 0.6497864, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB\u52A0\u6210\uFF1A5%" + LanguageIndex: 11278 --- !u!1 &3964356147264308643 GameObject: m_ObjectHideFlags: 0 @@ -15059,6 +15139,7 @@ RectTransform: - {fileID: 4136280709894719495} - {fileID: 8977496321880658324} - {fileID: 3515001552633387242} + - {fileID: 5617606851546670843} - {fileID: 9205216737925071854} - {fileID: 8217351224630860934} m_Father: {fileID: 2925180131101153177} @@ -15625,6 +15706,82 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1 &4428981516403878044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6655237885043181859} + - component: {fileID: 8934551233574494761} + - component: {fileID: 5035563427308077647} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6655237885043181859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428981516403878044} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3835777603823743098} + m_Father: {fileID: 9016829080921391704} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.0000031017296} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &8934551233574494761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428981516403878044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 135 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 300, y: 90} + m_Spacing: {x: 100, y: 0} + m_Constraint: 1 + m_ConstraintCount: 2 +--- !u!114 &5035563427308077647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4428981516403878044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &4499051017089739654 GameObject: m_ObjectHideFlags: 0 @@ -20536,6 +20693,95 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5F53\u524D\u79EF\u5206\uFF1A1000" LanguageIndex: 11262 +--- !u!1 &6488513017032108094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9016829080921391704} + - component: {fileID: 2636180410101004073} + - component: {fileID: 5122127783635863340} + - component: {fileID: 3826782024206621900} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9016829080921391704 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6488513017032108094} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6655237885043181859} + m_Father: {fileID: 5617606851546670843} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: -17} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2636180410101004073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6488513017032108094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &5122127783635863340 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6488513017032108094} + m_CullTransparentMesh: 0 +--- !u!114 &3826782024206621900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6488513017032108094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6491840666562730131 GameObject: m_ObjectHideFlags: 0 @@ -23447,6 +23693,91 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7274631364748649779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3835777603823743098} + - component: {fileID: 2886915251898753452} + - component: {fileID: 2890011534524699828} + - component: {fileID: 7713030028337703806} + m_Layer: 5 + m_Name: Pre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3835777603823743098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274631364748649779} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1120490873898263703} + - {fileID: 2113935668306464302} + m_Father: {fileID: 6655237885043181859} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 285, y: -45} + m_SizeDelta: {x: 300, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2886915251898753452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274631364748649779} + m_CullTransparentMesh: 0 +--- !u!114 &2890011534524699828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274631364748649779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 20 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 20 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &7713030028337703806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7274631364748649779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &7276342537413594774 GameObject: m_ObjectHideFlags: 0 @@ -23994,7 +24325,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3041994081485414640 RectTransform: m_ObjectHideFlags: 0 @@ -24453,7 +24784,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9205216737925071854 RectTransform: m_ObjectHideFlags: 0 @@ -24467,7 +24798,7 @@ RectTransform: m_Children: - {fileID: 8506003241810201444} m_Father: {fileID: 3877862887809483861} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -26412,6 +26743,101 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8576098089461548134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1120490873898263703} + - component: {fileID: 3768361779311586249} + - component: {fileID: 8081604778129953653} + - component: {fileID: 6080262946726203209} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1120490873898263703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576098089461548134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3835777603823743098} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 25, y: -45} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3768361779311586249 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576098089461548134} + m_CullTransparentMesh: 0 +--- !u!114 &8081604778129953653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576098089461548134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &6080262946726203209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8576098089461548134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 50 + m_PreferredHeight: 50 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8585971491395229052 GameObject: m_ObjectHideFlags: 0 @@ -26984,6 +27410,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8846243046883531082} m_CullTransparentMesh: 0 +--- !u!1 &8860201067443762686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5617606851546670843} + - component: {fileID: 6814848901384458385} + - component: {fileID: 8940696677417228165} + m_Layer: 5 + m_Name: ScrollView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5617606851546670843 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8860201067443762686} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 9016829080921391704} + m_Father: {fileID: 3877862887809483861} + m_RootOrder: 3 + 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.000030518, y: 8} + m_SizeDelta: {x: 936.8, y: 502.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6814848901384458385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8860201067443762686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 6655237885043181859} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 9016829080921391704} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &8940696677417228165 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8860201067443762686} + m_CullTransparentMesh: 0 --- !u!1 &8935471697483570858 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua index 397042736b..427900bf9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialGain.lua @@ -20,7 +20,7 @@ function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.upTip=Util.GetGameObject(gameObject,"UpTip"):GetComponent("Text") this.bottomTip=Util.GetGameObject(gameObject,"BottomTip"):GetComponent("Text") - this.root=Util.GetGameObject(gameObject,"Root") + this.root=Util.GetGameObject(gameObject,"ScrollView/Viewport/Content") this.pre=Util.GetGameObject(this.root,"Pre") this.goBtn=Util.GetGameObject(gameObject,"GoBtn") end From 1452da3489b05d884147ce6b1b1bb2c6a752c27f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 28 Aug 2020 00:34:02 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E4=B8=AD=E7=9B=B4=E6=8E=A5=E9=80=80=E5=87=BA=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=EF=BC=8C=E5=86=8D=E8=BF=9B=E5=85=A5=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=97=B6=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E5=9C=B0=E5=9B=BE=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 12a930213f..8aff68d615 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -101,7 +101,7 @@ function this.PlayerInfoRequest(func) PlayerManager.gem = msg.player.gem PlayerManager.chargeGem = msg.player.chargeGem PlayerManager.curMapId = msg.player.curMapId - MapManager.isInMap = PlayerManager.curMapId ~= 0 and PlayerManager.curMapId > 100 + MapManager.isInMap = false --PlayerManager.curMapId ~= 0 and PlayerManager.curMapId > 100 PlayerManager.maxForce = msg.player.maxForce -- RecruitManager.randCount = msg.randCount % 100 --钻石抽卡已招募次数 用不上了 协议没删 RecruitManager.isTenRecruit = msg.firstTenth --首次十连