diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index c6e158885e..7c2ef69600 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -281,6 +281,7 @@ function this.OnShowLayout3Data() this.chipFrame:SetActive(true) this.chipFrame:GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemData.itemConfig.Quantity)) if itemData.itemConfig.PropertyName and itemData.itemConfig.PropertyName > 0 then + print(itemData.itemConfig.PropertyName,"~~~~~~S") this.propertyIma:SetActive(true) this.propertyIma:GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemData.itemConfig.PropertyName)) else @@ -306,7 +307,7 @@ function this.OnShowLayout3Data() compoundNum=1 this.Slider:GetComponent("Slider").value=1 compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum - Log("compoundNum "..compoundNum) + Log("compoundNum "..compoundNum.." compoundMaxNum "..compoundMaxNum) this.Slider:GetComponent("Slider").minValue=0 this.Slider:GetComponent("Slider").maxValue=compoundMaxNum --this.ShowCompoundNumData(compoundNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 240f5406c9..9eafa50b2a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -61,7 +61,7 @@ function this.InitData(guideData) -- 测试功能引导用 Timer.New(function() - this.OnFunctionOpen(86) + this.OnFunctionOpen(78) end, 1):Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 80ea9c7303..aa3b4725b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -31,9 +31,9 @@ local HongmengUp = ConfigManager.GetConfig(ConfigName.HongmengUp) function this.InitHongMengData(hongmengGuards, hongmengHeroInfos, hongmengTablet, hongmengAdditions) -- body this.hongmengGuards = hongmengGuards - -- LogGreen(#this.hongmengGuards) + LogGreen("hongmengGuards",#this.hongmengGuards) this.hongmengHeroInfos = hongmengHeroInfos - -- LogGreen(#this.hongmengHeroInfos) + LogGreen("hongmengHeroInfos",#this.hongmengHeroInfos) for i = 1, #this.hongmengGuards do this.hongmengGuards[i].time = this.hongmengGuards[i].time + GetTimeStamp() end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua index 7d4cbee928..31257c7ff9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/GongMingResultTips.lua @@ -16,8 +16,8 @@ function GongMingResultTips:InitComponent() this.TextAll = Util.GetGameObject(self.transform,"grid/TextAll") - - + this.contentHunText = Util.GetGameObject(self.transform,"grid/ver/recordPer (1)/name/text (3)") + this.contentLingText = Util.GetGameObject(self.transform,"grid/ver/recordPer (1)/name/text (4)") end @@ -48,6 +48,7 @@ function GongMingResultTips:OnOpen(skinId) -- -- body -- print(key, " ",value) -- end + if HarmonyManager.hongmengTablet >= 330 then -- body --LogGreen(HarmonyManager.hongmengTablet) @@ -70,11 +71,19 @@ function GongMingResultTips:OnOpen(skinId) elseif data[i].additionType == 3 then if data[i].heroTid~=0 then -- body - + this.contentLingText:SetActive(false) Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) else print(" textHun ",data[i].value) - Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value) + if PlayerManager.level<75 then + -- body + this.contentLingText:SetActive(false) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = "" + else + this.contentLingText:SetActive(true) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无") + end + end -- body @@ -82,13 +91,21 @@ function GongMingResultTips:OnOpen(skinId) if data[i].heroTid ~= 0 then -- body -- print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ") - + this.contentHunText:SetActive(true) Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) else - print(" textLing ",data[i].value) - Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("%d",data[i].value) + if PlayerManager.level<75 then + -- body + this.contentHunText:SetActive(false) + Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text ="" + else + this.contentHunText:SetActive(true) + Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无") + end + + end -- body @@ -100,7 +117,6 @@ function GongMingResultTips:OnOpen(skinId) for i = 1, #data do if data[i].additionType == 1 then - Util.GetGameObject(this.TextAll,"textDegree"):GetComponent("Text").text = string.format("%d级(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) elseif data[i].additionType == 2 then @@ -115,10 +131,19 @@ function GongMingResultTips:OnOpen(skinId) elseif data[i].additionType == 3 then if data[i].heroTid~=0 then -- body + this.contentLingText:SetActive(true) Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) else + if PlayerManager.level<75 then + -- body + this.contentLingText:SetActive(false) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = "" + else + this.contentLingText:SetActive(true) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无") + end -- Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("%d",data[i].value) - Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无") + --Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无") end -- body @@ -126,13 +151,20 @@ function GongMingResultTips:OnOpen(skinId) if data[i].heroTid ~= 0 then -- body print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ") - + this.contentHunText:SetActive(true) Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text =string.format("%d(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName) - else + if PlayerManager.level<75 then + -- body + this.contentHunText:SetActive(false) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = "" + else + this.contentHunText:SetActive(true) + Util.GetGameObject(this.TextAll,"textHun"):GetComponent("Text").text = string.format("无") + end -- Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("%d",data[i].value) - Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无") + --Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text = string.format("无") end -- body diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 743b5dfc02..2f6ff5f046 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -50,6 +50,21 @@ function RewardItemSingleShowPopup:BindEvent() UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 3, _itemData, function() func() end) + -- elseif BagManager.GetItemCountById(itemSid) == BagManager.bagDatas[itemSid].itemConfig.UsePerCount then + -- -- body + -- local _itemData = BagManager.bagDatas[itemSid] + -- local item={} + -- item.itemId= _itemData.id + -- item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount + -- Log("sssssssssssssss "..item.itemId.." "..item.itemNum) + -- NetManager.HeroComposeRequest(item,function (drop) + -- this.SendBackCompoundReCallBack(drop) + -- end) + -- if compoundNum>0 then + + -- else + -- PopupTipPanel.ShowTip(Language[10200]) + -- end else PopupTipPanel.ShowTip(Language[11592]) end