diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 82df4fbb37..60e4cb96c9 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -69618,6 +69618,114 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 5/5 +--- !u!1 &2325022480007604862 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8700625538220034063} + - component: {fileID: 4617450371115376003} + - component: {fileID: 8990785098197032078} + - component: {fileID: 4524504387776227675} + m_Layer: 5 + m_Name: talentBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8700625538220034063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325022480007604862} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4994100836174162177} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -12.5, y: 14.625} + m_SizeDelta: {x: 502.9, y: 181.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4617450371115376003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325022480007604862} + m_CullTransparentMesh: 0 +--- !u!114 &8990785098197032078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325022480007604862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &4524504387776227675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2325022480007604862} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8990785098197032078} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2345226492402787213 GameObject: m_ObjectHideFlags: 0 @@ -78222,6 +78330,7 @@ RectTransform: - {fileID: 5048542521001261311} - {fileID: 2746024690697445643} - {fileID: 5666794286318729103} + - {fileID: 8700625538220034063} m_Father: {fileID: 4865647892057442948} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index c393617a28..cccfb8d894 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -746,7 +746,7 @@ function GetQuantityImageByquality(quality,star) elseif star >= 6 and star <=10 then return "r_characterbg_gules" elseif star > 10 then - return "r_characterbg_gules" + return "t_tongyong_topkaung" end else if quality == 0 or quality == 1 then @@ -841,7 +841,7 @@ function GetHeroQuantityImageByquality(quality,star) elseif star >= 6 and star <=10 then return "r_characterbg_gules" elseif star > 10 then - return "r_characterbg_gules" + return "t_tongyong_topkaung" end else if quality == 0 or quality == 1 then diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index d08b97e95f..309624f6f5 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -355,6 +355,8 @@ UIName = { PokemonSingleResultPanel=354,--灵兽 GeneralRewardPopup = 355,--通用奖励领取弹窗 GeneralBigPopup = 357,--通用大弹窗界面 + RoleAwakeTalentPopup = 358,--通用大弹窗界面 + RoleAwakeSuccessPanel = 359,--通用大弹窗界面 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua index 69824b3b1e..19d3477b57 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua @@ -199,6 +199,7 @@ end function HandBookHeroAndEquipListPanel:GetHeroData() --得到所有的对应星级的英雄 + local elevenHeroList = {} local tenHeroList = {} local sexHeroList = {} local fiveHeroList = {} @@ -210,6 +211,9 @@ function HandBookHeroAndEquipListPanel:GetHeroData() --5星最高星级是10的要在十星里面显示出来 if v.Star == 5 and v.MaxRank >= 10 and (proId == 0 or v.PropertyName == proId) then table.insert(tenHeroList,v) + if v.MaxRank >= 11 then + table.insert(elevenHeroList,v) + end end --所有的5星都要在六星里面显示出来 if v.Star == 5 and (proId == 0 or v.PropertyName == proId) then @@ -225,6 +229,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData() table.insert(oneHeroList,v) end end + self:SortHeroNatural(elevenHeroList) self:SortHeroNatural(tenHeroList) self:SortHeroNatural(sexHeroList) self:SortHeroNatural(fiveHeroList) @@ -234,6 +239,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData() self:SortHeroNatural(oneHeroList) --设置图鉴的循环列表 local herodatas={} + herodatas[11]=elevenHeroList herodatas[10]=tenHeroList herodatas[6]=sexHeroList herodatas[5]=fiveHeroList @@ -292,6 +298,7 @@ function HandBookHeroAndEquipListPanel:GetHeroData() end function HandBookHeroAndEquipListPanel:HeroHaveNum() + local curelevenStarActiveNum = 0 local curtenStarActiveNum = 0 local cursexStarActiveNum = 0 local curfiveStarActiveNum = 0 @@ -302,7 +309,10 @@ function HandBookHeroAndEquipListPanel:HeroHaveNum() --计算玩家拥有的英雄中对应星级的英雄的数量 for i, v in pairs(PlayerManager.heroHandBook) do local conFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,i) - if conFig then + if conFig then + if PlayerManager.GetHeroDataByStar(11,conFig.Id) and (proId == 0 or conFig.PropertyName == proId) then + curelevenStarActiveNum = curelevenStarActiveNum + 1 + end if PlayerManager.GetHeroDataByStar(10,conFig.Id) and (proId == 0 or conFig.PropertyName == proId) then curtenStarActiveNum = curtenStarActiveNum + 1 end @@ -329,6 +339,7 @@ function HandBookHeroAndEquipListPanel:HeroHaveNum() heroNumList[5] = curfiveStarActiveNum heroNumList[6] = cursexStarActiveNum heroNumList[10] = curtenStarActiveNum + heroNumList[11] = curelevenStarActiveNum end --英雄展示 @@ -630,6 +641,8 @@ function HandBookHeroAndEquipListPanel:OnShowSingleHeroData(...) lv = 145 elseif star == 10 then lv = 155 + elseif star == 11 then + lv = 330 else lv = 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua index 946f17b69e..f7f050b8a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua @@ -312,7 +312,7 @@ function HandBookHeroInfoPanel:CalculateHeroAllProValList(_starType,_starNum) for i, v in ConfigPairs(propertyConfig) do allAddProVal[i] = 0 end - local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum) + local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum) local curLvNum=1 local breakId = 0 local upStarId = 0 @@ -387,7 +387,7 @@ function HandBookHeroInfoPanel:UpdateLiveList() leftIndex = index - 1 leftHeroData=heroDatas[leftIndex] else - if _curStar==10 then + if _curStar==11 then _leftStar = 1 elseif _curStar==6 then _leftStar = 10 @@ -406,7 +406,7 @@ function HandBookHeroInfoPanel:UpdateLiveList() if _curStar==10 then _rightStar = 6 elseif _curStar==1 then - _rightStar = 10 + _rightStar = 11 else _rightStar = _curStar - 1 end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index 6dc900d32d..df606434d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -34,6 +34,7 @@ function this:InitComponent(gameObject) this.talent1Progress = Util.GetGameObject(this.gameObject,"talent/talent (1)/progress"):GetComponent("Text") this.talent2Image = Util.GetGameObject(this.gameObject,"talent/talent (2)"):GetComponent("Image") this.talent2Progress = Util.GetGameObject(this.gameObject,"talent/talent (2)/progress"):GetComponent("Text") + this.talentBtn = Util.GetGameObject(this.gameObject,"talent/talentBtn") this.curLvEnd = Util.GetGameObject(this.gameObject,"lvUp/curLvEnd"):GetComponent("Text") this.nextLvEnd = Util.GetGameObject(this.gameObject,"lvUp/nextLvEnd"):GetComponent("Text") @@ -89,6 +90,9 @@ function this.UpdateHeroUpStarData() --进阶属性提升 this.curLvEnd.text= HeroManager.GetCurHeroStarLvEnd(1,curHeroData) this.nextLvEnd.text= HeroManager.GetCurHeroStarLvEnd(2,curHeroData,curHeroData.breakId,upStarRankUpConfig.Id) + Util.AddOnceClick(this.talentBtn, function() + UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,curHeroData.heroConfig) + end) --进阶吞英雄条件 Util.ClearChild(this.upStarGrid.transform) local curUpStarData= HeroManager.GetHeroCurUpStarInfo(curHeroData.dynamicId) @@ -229,7 +233,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData) table.insert(curSelectHeroList,upStarHeroListData.heroList[i]) end end - this.UpdateUpStarPosHeroData(curSelectHeroList) + this:UpdateUpStarPosHeroData(curSelectHeroList) end end end @@ -242,7 +246,7 @@ end --刷新当前升星坑位英雄的信息 -function this.UpdateUpStarPosHeroData(curSelectHeroList) +function this:UpdateUpStarPosHeroData(curSelectHeroList) if LengthOfTable(curSelectHeroList) 0 then BagManager.SetDropIsSHowEquipPrint(false) @@ -340,7 +344,7 @@ function this.StarUpClick() -- 进阶音效 PlaySoundWithoutClick(SoundConfig.Sound_Recruit3) else - PopupTipPanel.ShowTip(Language[11852]) + PopupTipPanel.ShowTip("材料不足无法觉醒!") end end --扣除升星 消耗的材料 更新英雄数据 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua index e2568a46f6..54084f599d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua @@ -7,6 +7,7 @@ local orginLayer = 20 local callBack = nil local heroRankupConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig) local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) +local passiveSkillLogicConfig = ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig) --初始化组件(用于子类重写) function RoleAwakeSuccessPanel:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 4d593130a5..9656ba5664 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -183,8 +183,7 @@ function RoleInfoPanel:BindEvent() this:HeroLockEvent() end) Util.AddClick(this.talentBtn,function() - -- UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) - UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,curHeroData.heroConfig) + UIManager.OpenPanel(UIName.RoleTalentPopup,curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) end) for i = 1, #this.PageList do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 66004b53e0..139ce18373 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -39,6 +39,9 @@ function RoleUpStarListPanel:BindEvent() Util.AddClick(this.BtnSure, function() self:ClosePanel() Log("curSelectHeroList "..LengthOfTable(curSelectHeroList)) + for i, v in pairs(curSelectHeroList) do + LogPink("v.dynamicId "..v.dynamicId) + end openThisPanel:UpdateUpStarPosHeroData(curSelectHeroList) end) Util.AddClick(this.btnAutoSelect, function()