diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index d820f28b45..fec99cb54a 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -593,9 +593,9 @@ RectTransform: m_Father: {fileID: 7086677512586395648} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -267.96} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 151.25, y: 152.42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222245335330091708 @@ -6139,9 +6139,9 @@ RectTransform: m_Father: {fileID: 7086677512586395648} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -75.625} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 151.25, y: 151.25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222809709876260760 @@ -32196,10 +32196,10 @@ RectTransform: m_Father: {fileID: 8357676685865063738} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 125.3, y: -50} - m_SizeDelta: {x: 180, y: 100.75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 125.3, y: 0} + m_SizeDelta: {x: 0, y: 100.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222314792653266900 CanvasRenderer: @@ -32936,9 +32936,9 @@ RectTransform: m_Father: {fileID: 8357676685865063738} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1697735609296544 @@ -59465,8 +59465,8 @@ RectTransform: 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: 28, y: -24} - m_SizeDelta: {x: 250.7, y: 1.83} + m_AnchoredPosition: {x: 24, y: -19} + m_SizeDelta: {x: 176, y: 1.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4486101587543401107 CanvasRenderer: @@ -59541,9 +59541,9 @@ RectTransform: m_Father: {fileID: 7942848174134688160} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7345339821710159408 @@ -61866,10 +61866,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 + m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 4 + m_MinSize: 3 m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 @@ -62176,7 +62176,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 7, y: 483} - m_SizeDelta: {x: 215.3, y: 100} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2729942992745642625 MonoBehaviour: @@ -77349,9 +77349,9 @@ RectTransform: m_Father: {fileID: 7086677512586395648} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -477.66998} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 151.25, y: 186} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8440567242530909706 @@ -78095,7 +78095,7 @@ RectTransform: 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: 437.19, y: 56.428} + m_AnchoredPosition: {x: 415.6, y: 56.428} m_SizeDelta: {x: 438.29, y: 51.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5170435786110081326 @@ -78962,9 +78962,9 @@ RectTransform: m_Father: {fileID: 5063085520193273305} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -60.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 121, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5110366226388002499 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua index 18ac641740..c879c023b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua @@ -45,6 +45,8 @@ function this.SetSkillDataLv(_Profession,_id,_lv) if allGuildSkillData[_Profession] and allGuildSkillData[_Profession][_id] then allGuildSkillData[_Profession][_id].level = _lv allGuildSkillData[_Profession][_id].config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.GuildTechnology,"Profession",_Profession,"TechId",_id,"Level",_lv) + --更新英雄战力属性 + HeroManager.UpdateHeroPowerProfession(_Profession)--也许会卡 end end --重置一种类型的公会技能数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index d0ca216018..3c9eadd9bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -776,6 +776,14 @@ function this.UpdateHeroPower() v.warPower = this.CalculateHeroAllProValList(1, v.dynamicId, false)[HeroProType.WarPower] end end +function this.UpdateHeroPowerProfession(_Profession) + for _, v in pairs(heroDatas) do + if v.heroConfig.Profession == _Profession then + -- LogGreen("v.dynamicId "..v.dynamicId) + v.warPower = this.CalculateHeroAllProValList(1, v.dynamicId, false)[HeroProType.WarPower] + end + end +end --获取同一类型的技能 function this.GetTypeAllSkillData(_skillName) local allTypeSkillData = {}