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 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 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 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 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, } 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 --界面销毁时调用(用于子类重写) 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)