diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 509d650744..01f492da21 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -94,7 +94,6 @@ ConfigName = { SpecialConfig = "SpecialConfig", EquipSign="EquipSign", EquipTalismana = "EquipTalismana", - EquipTalismanaRankup = "EquipTalismanaRankup", EquipTalismanaLottery="EquipTalismanaLottery", EquipSignSetting="EquipSignSetting", BloodyBattleSetting = "BloodyBattleSetting", diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua index a92bcceb99..3804bc8b58 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/TalismanManager.lua @@ -3,7 +3,6 @@ local this = TalismanManager local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local heroConfig=ConfigManager.GetConfig(ConfigName.HeroConfig) local equipTalismana = ConfigManager.GetConfig(ConfigName.EquipTalismana) -local equipTalismanaRankup = ConfigManager.GetConfig(ConfigName.EquipTalismanaRankup) local propertyConfig=ConfigManager.GetConfig(ConfigName.PropertyConfig) this.lv=0--默认法宝等级 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua deleted file mode 100644 index 27ece00a8d..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua +++ /dev/null @@ -1,171 +0,0 @@ -require("Base/BasePanel") -TalismanUpStarListPanel = Inherit(BasePanel) -local this = TalismanUpStarListPanel -local curSelectHeroList={} -local curSelectHeroList2={} -local curNeedRoleNum -local openThisPanel -local allTalismanList = {} ---初始化组件(用于子类重写) -function TalismanUpStarListPanel:InitComponent() - - screenAdapte(Util.GetGameObject(self.transform, "bg/bg")) - this.BtnBack = Util.GetGameObject(self.transform, "btnBack") - this.BtnSure = Util.GetGameObject(self.transform, "btnSure") - this.btnQuickSure = Util.GetGameObject(self.transform, "btnQuickSure") - this.cardPre = Util.GetGameObject(self.gameObject, "item") - --this.grid = Util.GetGameObject(self.gameObject, "scroll/grid") - this.desText = Util.GetGameObject(self.gameObject, "desText"):GetComponent("Text") - this.numText = Util.GetGameObject(self.gameObject, "numText"):GetComponent("Text") - - this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar") - this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(self.gameObject, "scroll").transform, - this.cardPre, this.Scrollbar, Vector2.New(927.5, 1010), 1, 5, Vector2.New(19.32,15)) - this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(6.78, 27) - this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) - this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) - this.ScrollView.moveTween.MomentumAmount = 1 - this.ScrollView.moveTween.Strength = 1 -end - ---绑定事件(用于子类重写) -function TalismanUpStarListPanel:BindEvent() - - Util.AddClick(this.BtnBack, function() - PlaySoundWithoutClick(SoundConfig.Sound_UICancel) - self:ClosePanel() - end) - Util.AddClick(this.BtnSure, function() - self:ClosePanel() - --Log("curSelectHeroList "..LengthOfTable(curSelectHeroList)) - openThisPanel:UpdateUpStarPosHeroData(curSelectHeroList) - end) - Util.AddClick(this.btnQuickSure, function() - this.QuickSelectTalismans() - end) -end - ---添加事件监听(用于子类重写) -function TalismanUpStarListPanel:AddListener() - -end - ---移除事件监听(用于子类重写) -function TalismanUpStarListPanel:RemoveListener() - -end - ---界面打开时调用(用于子类重写) ---curTalismanData,upStarConFigData,upStarConsumeMaterial,this -function TalismanUpStarListPanel:OnOpen(curTalismanData,upStarConFigData,_curSelectTalismanList,_openThisPanel) - - --Log("当前进阶法宝 "..curTalismanData.did) - openThisPanel= _openThisPanel - curSelectHeroList={} - for i = 1, #_curSelectTalismanList do - --Log("当前已选祭品法宝 ".._curSelectTalismanList[i]) - curSelectHeroList[_curSelectTalismanList[i]]=_curSelectTalismanList[i] - end - --是否同名数据 - local EquipTalismanaRankupConFigData = ConfigManager.GetConfigData(ConfigName.EquipTalismanaRankup,upStarConFigData[2]) - allTalismanList = TalismanManager.GetAllTalismanByCondition(curTalismanData,EquipTalismanaRankupConFigData) - this.HeroSortData(allTalismanList) - this.ScrollView:SetData(allTalismanList, function (index, go) - this.OnShowSingleCardData(go, allTalismanList[index]) - end) - - curNeedRoleNum = upStarConFigData[3] - this.desText.text=string.format("需要%s个%s",curNeedRoleNum,GetLanguageStrById(EquipTalismanaRankupConFigData.Name)) - this.numText.text=string.format("%s/%s",#curSelectHeroList,curNeedRoleNum) -end -function this.OnClickEnterHero(go,heroData,type) - - if type==1 then - if #curSelectHeroList>=curNeedRoleNum then - PopupTipPanel.ShowTip("已达最大选择数量") - return - else - table.insert(curSelectHeroList,heroData) - end - elseif type==2 then - for i = 1, #curSelectHeroList do - if heroData.dynamicId==curSelectHeroList[i].dynamicId then - table.remove(curSelectHeroList,i) - break - end - end - end - this.OnShowSingleCardData(go,heroData,type) - this.numText.text=string.format("%s/%s",#curSelectHeroList,curNeedRoleNum) -end - -function this.OnShowSingleCardData(go,heroData) - - local choosed = Util.GetGameObject(go.transform, "choosed") - choosed:SetActive(false) - if curSelectHeroList[heroData.did] then - curSelectHeroList[heroData.did]=heroData - choosed:SetActive(true) - end - Util.GetGameObject(go.transform, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.itemConfig.Quantity)) - Util.GetGameObject(go.transform, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroData.itemConfig.ResourceID)) - Util.GetGameObject(go.transform, "name"):GetComponent("Text").text = GetLanguageStrById(heroData.itemConfig.Name) - local starGrid = Util.GetGameObject(go.transform, "star") - SetHeroStars(starGrid, heroData.star,1,nil,-15) - local cardBtn = Util.GetGameObject(go.transform, "icon") - Util.AddOnceClick(cardBtn, function() - if curSelectHeroList[heroData.did] then - --Log("单个取消法宝祭品 "..heroData.did) - choosed:SetActive(false) - curSelectHeroList[heroData.did]=nil - this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum) - return - end - if LengthOfTable(curSelectHeroList)>=curNeedRoleNum then - PopupTipPanel.ShowTip("已达最大选择数量") - return - end - --Log("单个勾选法宝祭品 "..heroData.did) - curSelectHeroList[heroData.did]=heroData - choosed:SetActive(true) - this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum) - end) -end -function this.HeroSortData(heroData) - table.sort(heroData, function(a, b) - if a.itemConfig.Quantity == b.itemConfig.Quantity then - if a.star == b.star then - return a.id < b.id - else - return a.star < b.star - end - else - return a.itemConfig.Quantity < b.itemConfig.Quantity - end - end) -end -function this.QuickSelectTalismans() - curSelectHeroList = {} - for k, v in pairs(allTalismanList) do - if LengthOfTable(curSelectHeroList) < curNeedRoleNum then - --Log("快速选择法宝祭品 "..v.did) - curSelectHeroList[v.did]=v - end - end - this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum) - this.ScrollView:SetData(allTalismanList, function (index, go) - this.OnShowSingleCardData(go, allTalismanList[index]) - end) -end ---界面关闭时调用(用于子类重写) -function TalismanUpStarListPanel:OnClose() - -end - ---界面销毁时调用(用于子类重写) -function TalismanUpStarListPanel:OnDestroy() - - this.ScrollView = nil -end - -return TalismanUpStarListPanel \ No newline at end of file