diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index dd04979f50..1048ae29e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -38,6 +38,7 @@ function QianKunBoxBuyOnePanel:InitComponent() this.content3=Util.GetGameObject(self.gameObject,"bottom/openOneAgainButton/Content3") this.detailImage3=Util.GetGameObject(this.content3, "Tip") + this.detailText2 = Util.GetGameObject(this.detailImage3, "contentDetailText"):GetComponent("Text") this.itemIcon3=Util.GetGameObject(this.content3, "icon"):GetComponent("Image") this.itemNum3=Util.GetGameObject(this.content3, "num"):GetComponent("Text") @@ -114,6 +115,20 @@ function QianKunBoxBuyOnePanel:OnSortingOrderChange() end end + +function QianKunBoxBuyOnePanel:GetSendStr() + local str = "" + for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do + if str == "" then + str = str.."赠送" + else + str = str.."和" + end + str = str..v[2].."个"..ItemConfig[v[1]].Name + end + return str +end + --界面打开时调用(用于子类重写) function QianKunBoxBuyOnePanel:OnOpen(...) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) @@ -151,8 +166,10 @@ function QianKunBoxBuyOnePanel:OnOpen(...) itemNum=d[2] this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) this.itemNum3.text= tostring(itemNum) - this.detailText.text = Language[10498] - + local str = this:GetSendStr() + this.detailText.text = str + this.detailText1.text = str + this.detailText2.text = str Util.ClearChild(Util.GetTransform(this.content, "itemContent1")) this.itemDataList={} this.itemDataList=BagManager.GetTableByBackDropData(this.drop) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua index 48a0f3bbc2..a20dc1ce29 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyTenPanel.lua @@ -121,6 +121,19 @@ function QianKunBoxBuyTenPanel:OnSortingOrderChange() end end + +function QianKunBoxBuyTenPanel:GetSendStr() + local str = "" + for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do + if str == "" then + str = str.."赠送" + else + str = str.."和" + end + str = str..v[2].."个"..ItemConfig[v[1]].Name + end + return str +end --界面打开时调用(用于子类重写) function QianKunBoxBuyTenPanel:OnOpen(...) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) @@ -168,9 +181,9 @@ function QianKunBoxBuyTenPanel:OnOpen(...) itemNum=d[2] this.itemIcon3.sprite=this.spLoader:LoadSprite(artResourcesConfig[ItemConfig[itemId].ResourceID].Name) this.itemNum3.text= tostring(itemNum) - - this.detailText.text = Language[10499] - + local str = this:GetSendStr() + this.detailText.text = str + this.detailText1.text = str local itemDataList={} itemDataList=BagManager.GetTableByBackDropData(this.drop) this.openTenAgainButton:GetComponent("Button").enabled=false diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua index a7bbc12600..742b49800f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua @@ -98,7 +98,7 @@ function this:RefreshData() end itemList[i].items[j].go.gameObject:SetActive(true) itemList[i].items[j].item:OnOpen(false,{self.curData[i].trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1) - itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpList[j].id) + itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpList[j].id).."星" itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j])) Util.AddOnceClick(itemList[i].items[j].pos,function() if this:CheckIsSelect(self.curData[i].trumpChipList[j]) then diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua index 0ce1184a21..4b74477816 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua @@ -103,6 +103,19 @@ function SecretBoxBuyOnePanel:OnSortingOrderChange() this.view:OnOpen(true,this.itemDataList[1],1.4,true,false,false,self.sortingOrder) end end + +function SecretBoxBuyOnePanel:GetSendStr() + local str = "" + for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do + if str == "" then + str = str.."赠送" + else + str = str.."和" + end + str = str..v[2].."个"..ItemConfig[v[1]].Name + end + return str +end --界面打开时调用(用于子类重写) function SecretBoxBuyOnePanel:OnOpen(...) self.bg.gameObject:SetActive(false) @@ -121,11 +134,12 @@ function SecretBoxBuyOnePanel:OnOpen(...) this.content2:SetActive(this.recruitType == drawtType.FindFairySingle) this.detailText.enabled=this.recruitType~=drawtType.FindFairySingle this.detailText1.enabled=this.recruitType~=drawtType.FindFairySingle - + local str = this:GetSendStr() + this.detailText.text = str + this.detailText1.text = str if this.recruitType <= RecruitType.LightDarkSingle then --光暗什么...的抽卡 this.itemIcon1.sprite=this.spLoader:LoadSprite("r_RareItem_Specail_0002") - this.detailText.text = "赠送1个元神玉和20个置换玉" - this.detailText1.text = "赠送1个元神玉和20个置换玉" + elseif this.recruitType == drawtType.FindFairySingle then --东海寻仙 this.FindFairyCountDown(FindFairyManager.GetActivityTime()) FindFairyManager.SetFreeExtract(1) diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua index 580d345dfc..fddc09d455 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua @@ -112,7 +112,19 @@ function SecretBoxBuyTenPanel:OnSortingOrderChange() view:OnOpen(true,this.itemDataList[index],1.4,true,false,false,self.sortingOrder) end end +end +function SecretBoxBuyTenPanel:GetSendStr() + local str = "" + for k,v in ipairs(lotterySetting[this.recruitType].TenTimesMustGetItem) do + if str == "" then + str = str.."赠送" + else + str = str.."和" + end + str = str..v[2].."个"..ItemConfig[v[1]].Name + end + return str end --界面打开时调用(用于子类重写) function SecretBoxBuyTenPanel:OnOpen(...) @@ -121,7 +133,7 @@ function SecretBoxBuyTenPanel:OnOpen(...) local args = { ... } this.drop=args[1] this.recruitType=args[2] - + if this.recruitType then this.detailImage:SetActive(this.recruitType <= RecruitType.LightDarkSingle) this.content1:SetActive(this.recruitType <= RecruitType.LightDarkSingle) @@ -129,10 +141,11 @@ function SecretBoxBuyTenPanel:OnOpen(...) this.detailText.enabled=this.recruitType~=drawtType.FindFairySingle this.detailText1.enabled=this.recruitType~=drawtType.FindFairySingle + local str = this:GetSendStr() + this.detailText.text = str + this.detailText1.text = str if this.recruitType <= RecruitType.LightDarkSingle then - this.itemIcon1.sprite=this.spLoader:LoadSprite("r_RareItem_Specail_0002") - this.detailText.text = Language[11843] - this.detailText1.text = Language[11843] + this.itemIcon1.sprite=this.spLoader:LoadSprite("r_RareItem_Specail_0002") elseif this.recruitType == drawtType.FindFairyTen then--东海寻仙 this.FindFairyCountDown(FindFairyManager.GetActivityTime()) FindFairyManager.SetFreeExtract(10)