diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 331d56630d..d9ee9e7dab 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -972,7 +972,10 @@ RedPointType = { Practice_imprint = 5002,--神印按钮 Practice_fourQua = 5003,--四象心法 Practice_Cultivation = 5004,--主角修为 - + playerSkill1 = 5100,--主角1技能 + playerSkill2 = 5200,--主角2技能 + playerSkill2 = 5300,--主角3技能 + playerSkill2 = 5400,--主角4技能 wujinMission = 8500, wujinTreasure = 8501, wujinBianDui = 8502, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua index 858c315e13..df8c4bb803 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleAnalysisManager.lua @@ -69,6 +69,9 @@ function BattleAnalysisManager:OnAddRole(role) data.info = role end function BattleAnalysisManager:OnAddMonster(monster) + if monster.uid==20100 then + monster.type=1 + end local data = self:GetRecordData(monster) data.info = monster end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua index baecad42b9..d13d849f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleRecordManager.lua @@ -150,7 +150,7 @@ function this.GetBattleBestData(Id) -- 怪物只显示最后一层的怪物信息 if data.info and data.info.camp == 0 then -- 计算最大值(不计算异妖的) - if data.info.type == BattleUnitType.Role then + if data.info.type == BattleUnitType.Role and data.info.position<7 then if data.damage > _MaxDamageValue then _MaxDamageData = { roleId = data.info.roleData.roleId, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 0592bdfdf3..ae9d76a427 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -325,7 +325,8 @@ function this.HeadAdapter(head, data) local lv = Util.GetGameObject(head, "lv") local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text") local starRoot = Util.GetGameObject(head, "star") - + local aa=0 + local frameStr="r_characterbg_goden" if data.type == BattleUnitType.Role then local roleId = data.roleData.monsterId or data.roleData.roleId local roleLv = data:GetRoleData(RoleDataName.Level) @@ -333,31 +334,43 @@ function this.HeadAdapter(head, data) local star = data.star local config = {} - if roleId > 10100 then - local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId) - config.Quality = MonsterConfig.Quality - config.lv = MonsterConfig.Level - star=MonsterConfig.Star - if MonsterConfig.MonsterId > 10000 then - local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, MonsterConfig.MonsterId) + if data.position==100 then + config.Quality=4 + if NameManager.roleSex==ROLE_SEX.BOY then + aa=3201 + else + aa=3202 + end + config.lv=PlayerManager.level + star=0 + else + if roleId > 10100 then + local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId) + config.Quality = MonsterConfig.Quality + config.lv = MonsterConfig.Level + star=MonsterConfig.Star + if MonsterConfig.MonsterId > 10000 then + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, MonsterConfig.MonsterId) + config.Icon = heroConfig.Icon + config.Profession = heroConfig.Profession + config.PropertyName = heroConfig.PropertyName + else + local monsterViewInfo = ConfigManager.GetConfigData(ConfigName.MonsterViewConfig, MonsterConfig.MonsterId) + config.Icon = monsterViewInfo.MonsterIcon + end + else + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, roleId) + config.Quality = heroConfig.Quality config.Icon = heroConfig.Icon config.Profession = heroConfig.Profession config.PropertyName = heroConfig.PropertyName - else - local monsterViewInfo = ConfigManager.GetConfigData(ConfigName.MonsterViewConfig, MonsterConfig.MonsterId) - config.Icon = monsterViewInfo.MonsterIcon + config.lv = roleLv end - else - local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, roleId) - config.Quality = heroConfig.Quality - config.Icon = heroConfig.Icon - config.Profession = heroConfig.Profession - config.PropertyName = heroConfig.PropertyName - config.lv = roleLv + aa=config.Icon + frameStr=GetHeroQuantityImageByquality(config.Quality, star) end -- 头像 - frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(config.Quality, star)) - local aa=config.Icon + frame.sprite = this.spLoader:LoadSprite(frameStr) if skinId and skinId>0 then local skinConfig=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId) if skinConfig then