diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 147cdfe3f5..8f198cf75f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -61,7 +61,7 @@ function ExpeditionMainPanel:InitComponent() --self.mask = Util.GetGameObject(self.parent, "mask") --self.mask:SetActive(false) npc = NameManager.roleSex == ROLE_SEX.BOY and "live2d_npc_map" or "live2d_npc_map_nv" - local scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.26 + local scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.26 or Vector3.one * 0.16 self.liveNode = poolManager:LoadLive(npc, Util.GetTransform(self.parent, "playerLive"), scale, Vector3.zero) SkeletonGraphic = self.liveNode:GetComponent("SkeletonGraphic") if SkeletonGraphic then diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua index 144c57c984..01e74dbfb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua @@ -133,7 +133,7 @@ end --设置单个上阵英雄信息 function this.SetCardSingleData(o,monsterId, _pos) - o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("t_biandui.xuanzhongkuang") + o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("bd_xinkapaifan") local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterId.heroTid) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 6b7071795a..4041408432 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -206,7 +206,7 @@ function this:OnOpen(_panelType,...) panelType = _panelType if panelType == FORMATION_TYPE.EXPEDITION then for k,v in pairs(bgListGo) do - v:GetComponent("Image").sprite = Util.LoadSprite("t_biandui.xuanzhongkuang") + v:GetComponent("Image").sprite = Util.LoadSprite("bd_xinkapaifan") this.line:GetComponent("RectTransform").sizeDelta = Vector2.New(294.2,439.48) end else diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua index c879c023b0..d08b17eaf3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillManager.lua @@ -46,7 +46,7 @@ function this.SetSkillDataLv(_Profession,_id,_lv) allGuildSkillData[_Profession][_id].level = _lv allGuildSkillData[_Profession][_id].config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.GuildTechnology,"Profession",_Profession,"TechId",_id,"Level",_lv) --更新英雄战力属性 - HeroManager.UpdateHeroPowerProfession(_Profession)--也许会卡 + -- HeroManager.UpdateHeroPowerProfession(_Profession)--也许会卡 end end --重置一种类型的公会技能数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua index 3bfd976157..00b2fc9b15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua @@ -248,6 +248,7 @@ end --界面关闭时调用(用于子类重写) function GuildSkillUpLvPopup:OnClose() tabRedPotList = {} + HeroManager.UpdateHeroPowerProfession()--也许会卡 end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 3c9eadd9bf..30e0874251 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -778,10 +778,10 @@ function this.UpdateHeroPower() end function this.UpdateHeroPowerProfession(_Profession) for _, v in pairs(heroDatas) do - if v.heroConfig.Profession == _Profession then + -- if v.heroConfig.Profession == _Profession then -- LogGreen("v.dynamicId "..v.dynamicId) v.warPower = this.CalculateHeroAllProValList(1, v.dynamicId, false)[HeroProType.WarPower] - end + -- end end end --获取同一类型的技能