From f4f505eb6c0114312186a940a0ac83e560e59665 Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 15:16:49 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=BD=A9=E8=BE=95=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index 764512f114..7ec7c775a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -80,6 +80,7 @@ end --- 关闭界面事件 function this.OnCloseBtnClick() + this.root.tip:SetActive(true) this.root:ClosePanel() end From 39105d8de3028b73bc2205df1c1d6e02420a0abb Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 15:20:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=BD=A9=E7=8C=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua index 7ec7c775a1..eaeba1af5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua @@ -80,7 +80,7 @@ end --- 关闭界面事件 function this.OnCloseBtnClick() - this.root.tip:SetActive(true) + this.root.tip:SetActive(false) this.root:ClosePanel() end From ee6563293921280f2677b0983168ba4b675f3f78 Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 15:35:28 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua index d13be76492..89efdcd014 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua @@ -99,7 +99,7 @@ function GrowthGiftPage:RefreshShowData(item, data) local GrowthRewardId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.GrowthReward)--当前礼包奖励的活动类型(6\7\8\9\16)（成长礼包的不同档位奖励ActivityId不同，虽然同为成长基金） local singleRewardData = ActivityGiftManager.GetActivityInfo(GrowthRewardId, data.Id)--获取活动数据 self.context.Id - local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--当前礼包ID(101\102\103\104\105) + local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--当前礼包ID(101\102\103\104\105) local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward) --item local shadow = Util.GetGameObject(item, "shadow") From 0fdac5e7d39526d4a7b7be6ae9c7327a4aa9b960 Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 15:41:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=88=90=E9=95=BF=E5=9F=BA=E9=87=91?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/CumulativeSignInPage.lua | 11 ++++++++--- .../~Lua/Modules/Operating/GrowthGiftTaskItem.lua | 4 ++-- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index dac54e7d8e..283e697385 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -160,11 +160,16 @@ function CumulativeSignInPage:RefreshSignList() for _, signInfo in ConfigPairs(signInConfigs) do i = i + 1 local day = i - Util.AddOnceClick(Util.GetGameObject(self.signInList[i], "receiveBtn"), function() + Util.AddOnceClick(Util.GetGameObject(self.signInList[day], "receiveBtn"), function() self:OnSignInClicked(signInfo.Id, day) end) - self.signInRewardList[i]:OnOpen(false, signInfo.reward,1,false,false,false,sortingOrder) - self.signInList[i]:SetActive(true) + self.signInRewardList[day]:OnOpen(false, signInfo.reward,1,false,false,false,sortingOrder) + if isPlayShow then + self.signInList[day]:SetActive(false) + else + self.signInList[day]:SetActive(true) + end + table.insert(prefab,self.signInList[day]) end local dayIndexEnd diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua index 27cd4f8171..9d78176fab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftTaskItem.lua @@ -43,7 +43,7 @@ function GrowthGiftTaskItem:OnSortingOrderChange(cursortingOrder) end function GrowthGiftTaskItem:SetValue() local activityInfo = ActivityGiftManager.GetActivityInfo(GrowthRewardId, self.context.Id)--获取活动数据 self.context.Id - local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId)--判断当前礼包是否已投资 + local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1])--判断当前礼包是否已投资 if activityInfo then self.state = activityInfo.state @@ -81,7 +81,7 @@ end function GrowthGiftTaskItem:OnBtnDealClicked() local openStatus = ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.GrowthReward) - local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId) + local goods = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[GrowthRewardId].CanBuyRechargeId[1]) if not openStatus or (goods and goods.buyTimes < 1) then PopupTipPanel.ShowTip(Language[11474]) return diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 28dea2b422..376538015e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -1096,6 +1096,7 @@ function RoleInfoPanel:OnClickBtnInfo() --Log("情 报 情 报 情 报") RoleInfoPanel.HideAllLayout() this.roleInfoLayout:SetActive(true) + this.talentTipStrGo:SetActive(false) RoleInfoPanel:SetSelectBtn(self.btnInfo, Language[11836]) end --进阶按钮点击 @@ -1106,6 +1107,7 @@ function RoleInfoPanel:OnClickBtnUpStar() end RoleInfoPanel.HideAllLayout() this.roleUpStarLayout:SetActive(true) + this.talentTipStrGo:SetActive(true) RoleInfoPanel:SetSelectBtn(self.btnUpStar, Language[11845]) end --跳转直接到进阶界面 From 8afa0c96a8416c0abe237e17919bc13e2d12f3f7 Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 28 Sep 2020 15:43:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/CumulativeSignInPage.lua | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua index 283e697385..dac54e7d8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua @@ -160,16 +160,11 @@ function CumulativeSignInPage:RefreshSignList() for _, signInfo in ConfigPairs(signInConfigs) do i = i + 1 local day = i - Util.AddOnceClick(Util.GetGameObject(self.signInList[day], "receiveBtn"), function() + Util.AddOnceClick(Util.GetGameObject(self.signInList[i], "receiveBtn"), function() self:OnSignInClicked(signInfo.Id, day) end) - self.signInRewardList[day]:OnOpen(false, signInfo.reward,1,false,false,false,sortingOrder) - if isPlayShow then - self.signInList[day]:SetActive(false) - else - self.signInList[day]:SetActive(true) - end - table.insert(prefab,self.signInList[day]) + self.signInRewardList[i]:OnOpen(false, signInfo.reward,1,false,false,false,sortingOrder) + self.signInList[i]:SetActive(true) end local dayIndexEnd From 5cef7f561a8afa97dc32c7c269fb66c88cc7b79c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 28 Sep 2020 16:05:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A5=B3=E4=BA=BA=E7=89=A9=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 5320fb52110d16debb34e63c4c1863d70a78ef83) --- .../~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua index f6154e5851..9d61a406fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DemonSlayer/DemonSlayerPanel.lua @@ -135,7 +135,7 @@ function DemonSlayerPanel:SetRank(ActInfo) --加载立绘 npc = allRankData[i].sex == ROLE_SEX.BOY and mapNpc or mapNpc2 - local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.35 + local scale = allRankData[i].sex == ROLE_SEX.BOY and Vector3.one * 0.45 or Vector3.one * 0.25 npcList[i] = poolManager:LoadLive(npc, livePrefab.transform, scale, Vector3.New(0,-158.31,0)) local SkeletonGraphic = npcList[i]:GetComponent("SkeletonGraphic") if SkeletonGraphic then