From c795995bf6e6ea8b1da73d16628a92c7c67ec209 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 10 Jan 2022 14:33:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E5=BF=83=E9=AD=94=E8=AF=95?= =?UTF-8?q?=E7=82=BC=E3=80=91=E5=A5=96=E5=8A=B1=E6=8C=89=E9=92=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index c2e7d4b58c..7d58718c84 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -2029,7 +2029,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -102, y: -314.09998} - m_SizeDelta: {x: 127, y: 126} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.49999994, y: 0.5} --- !u!222 &603132567455178056 CanvasRenderer: @@ -2059,7 +2059,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6d28566506ce46b45896a39e6b796471, type: 3} + m_Sprite: {fileID: 21300000, guid: 56e562f2e809ff74f93897fff77286b0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3700,27 +3700,12 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.75 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 20.492996 - objectReference: {fileID: 0} - - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -3.6899986 @@ -3735,32 +3720,32 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -3.6899986 - objectReference: {fileID: 0} - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20.492996 + objectReference: {fileID: 0} + - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y - value: 3.2600002 + value: -3.6899986 objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 @@ -3770,12 +3755,27 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -16.999998 objectReference: {fileID: 0} + - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} + - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -16.999998 + objectReference: {fileID: 0} + - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 3.2600002 + objectReference: {fileID: 0} - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_AnchoredPosition.y value: 3.2600002 From 3e11f70576f6089dbd5e4f5b2fc011045512651a Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 Jan 2022 14:56:50 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E9=80=89=E6=8B=A9=E5=8D=87=E7=BA=A7=E7=9A=84?= =?UTF-8?q?=E8=A3=85=E5=A4=87=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=A8=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua index adb1999224..b63eb527ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YunYouMan.lua @@ -154,8 +154,8 @@ function this:ShowSingleData(item,sdata,index) Util.AddOnceClick(self.maskList[item],function () - for i = 1, #self.maskImageList do - self.maskImageList[i]:SetActive(false) + for key, value in pairs(self.maskImageList) do + value:SetActive(false) end if self.selectId == sdata.Id then self.maskImageList[item]:SetActive(false) From 6ddd4c543fc936bc3524232e6daf653aeb0bb0b5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 10 Jan 2022 15:05:35 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E4=BF=AE=E4=B8=BA=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E4=B8=BA=E7=82=B9=E5=87=BB=E9=97=AE=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E9=AC=BC=E7=95=9C=E5=8A=A8=E7=94=BB=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=98=AF=E5=85=83=E5=A9=B4=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua index 21a2b512e5..3b9bb458bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_Cultivation.lua @@ -44,7 +44,7 @@ function this:Refresh() local data = self:GetData() self.ScrollView:SetData(data, function (index, go) self:SingleDataShow(go, data[index],index) - end) + end, true, true) self.ScrollView:SetIndex(PracticeManager.PracticeBigLevel) end From 7e96ae056f8c647a66dc2253c8b250992f06b163 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 Jan 2022 15:23:02 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E8=BF=9E=E8=B4=AD=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 91620a0deb..0f24aa8f75 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -342,7 +342,8 @@ local TypeUpdateFunc = { tempData.otherData.Price = goodsConfig[configData[j].GoodId].Price tempData.progress = goodsConfig[configData[j].GoodId].Limit - curData.rewards[i].progress end - -- LogPink("missionId:"..tostring(tempData.missionId).." progress:"..tostring(tempData.progress)) + -- LogPink("missionId:"..tostring(tempData.missionId).." GoodId:"..tostring(tempData.otherData.GoodId).." Type(1:礼包、2商品):"..tostring(tempData.otherData.GoodType) + -- .." progress:"..tostring(tempData.progress).." Name:"..tostring(tempData.otherData.Name).." Price:"..tostring(tempData.otherData.Price)) if not tempDataList[configData[j].Type] then tempDataList[configData[j].Type] = {} end @@ -355,7 +356,6 @@ local TypeUpdateFunc = { elseif configData[j].Type ~= 2 then func() end - end end end @@ -365,7 +365,7 @@ local TypeUpdateFunc = { table.remove(curData.rewards,i) end end - for index, value in ipairs(curData.rewards) do + for key, value in pairs(curData.rewards) do for i = #value, 1,-1 do if value[i].state == 5 then table.remove(value,i) @@ -374,6 +374,9 @@ local TypeUpdateFunc = { table.sort(value,function (a,b) return a.missionId < b.missionId end) + -- for i = 1, #value do + -- LogGreen("Id:"..tostring(value[i].missionId)) + -- end end end, } From 2455410a0c95727151187137b8a55e410e30b838 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 Jan 2022 15:29:37 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91?= =?UTF-8?q?=E9=95=B6=E5=B5=8C=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E7=A9=BF?= =?UTF-8?q?=E6=88=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua index 2b85877739..9753d8d253 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_SelectGem.lua @@ -65,7 +65,7 @@ function SelectGem:SingleDataShow(go,data,index) local btn = Util.GetGameObject(go,"Btn") local btnText = Util.GetGameObject(go,"Btn/Text"):GetComponent("Text") - btnText.text = "穿 戴" + btnText.text = "镶 嵌" if GemManager.myGemList[args[1]] and GemManager.myGemList[args[1]][args[2]] and GemManager.myGemList[args[1]][args[2]] > 0 then btnText.text = "更 换" end From 6b2860c5f455bf9a39f29351aa188c2ae66560ab Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 Jan 2022 15:38:20 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=BE=97=E5=91=BD=E7=9F=B3=E5=90=8E=EF=BC=8C=E6=9C=89?= =?UTF-8?q?=E5=8F=AF=E7=A9=BF=E6=88=B4=E5=85=A5=E5=8F=A3=E6=B2=A1=E7=BA=A2?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index e758c317c9..a0de565be5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -575,6 +575,7 @@ function RewardItemPopup:RedCheckFuns() MonthCardManager.CheckMonthCardPatFace() --寻宝迷踪红点检测 CheckRedPointStatus(RedPointType.XunBaoMiZong) + CheckRedPointStatus(RedPointType.Gem) end --界面销毁时调用(用于子类重写) From 5b796d824632348f733a2086916832a948b56d64 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 10 Jan 2022 15:48:38 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E5=91=BD=E6=A0=BC=E3=80=91?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua index e09ea8228f..06494c5a36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/GemManager.lua @@ -280,13 +280,17 @@ function this.RedPointCheck() for i = 1, 8 do local data = this.GetGemsFromBagByType(i) if this.myGemList[i] then--如果有数据 + -- LogYellow("i:"..tostring(i)) for j = 1, #this.myGemList[i] do + -- LogYellow("j:"..tostring(j)) if this.myGemList[i][j] and this.myGemList[i][j] > 0 then--如果有数据切大于零 + -- LogYellow("myGemList[i][j]:"..tostring(this.myGemList[i][j])) for key, value in pairs(data) do local numInBag = BagManager.GetTotalItemNum(this.myGemList[i][j]) + -- LogYellow(value.id.." "..this.myGemList[i][j].." "..(numInBag + 1).." "..gemConfig[this.myGemList[i][j]].UpgradeNum) if value.id > this.myGemList[i][j] then return true - elseif numInBag + 1 > gemConfig[this.myGemList[i][j]].UpgradeNum and gemConfig[this.myGemList[i][j]].NextGem > 0 then + elseif numInBag + 1 >= gemConfig[this.myGemList[i][j]].UpgradeNum and gemConfig[this.myGemList[i][j]].NextGem > 0 then return true end end