Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-10-21 17:55:20 +08:00
commit 9e0ca64dbd
4 changed files with 41 additions and 22 deletions

View File

@ -972,7 +972,10 @@ RedPointType = {
Practice_imprint = 5002,--神印按钮 Practice_imprint = 5002,--神印按钮
Practice_fourQua = 5003,--四象心法 Practice_fourQua = 5003,--四象心法
Practice_Cultivation = 5004,--主角修为 Practice_Cultivation = 5004,--主角修为
playerSkill1 = 5100,--主角1技能
playerSkill2 = 5200,--主角2技能
playerSkill2 = 5300,--主角3技能
playerSkill2 = 5400,--主角4技能
wujinMission = 8500, wujinMission = 8500,
wujinTreasure = 8501, wujinTreasure = 8501,
wujinBianDui = 8502, wujinBianDui = 8502,

View File

@ -69,6 +69,9 @@ function BattleAnalysisManager:OnAddRole(role)
data.info = role data.info = role
end end
function BattleAnalysisManager:OnAddMonster(monster) function BattleAnalysisManager:OnAddMonster(monster)
if monster.uid==20100 then
monster.type=1
end
local data = self:GetRecordData(monster) local data = self:GetRecordData(monster)
data.info = monster data.info = monster
end end

View File

@ -150,7 +150,7 @@ function this.GetBattleBestData(Id)
-- 怪物只显示最后一层的怪物信息 -- 怪物只显示最后一层的怪物信息
if data.info and data.info.camp == 0 then 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 if data.damage > _MaxDamageValue then
_MaxDamageData = { _MaxDamageData = {
roleId = data.info.roleData.roleId, roleId = data.info.roleData.roleId,

View File

@ -325,7 +325,8 @@ function this.HeadAdapter(head, data)
local lv = Util.GetGameObject(head, "lv") local lv = Util.GetGameObject(head, "lv")
local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text") local lvText = Util.GetGameObject(head, "lv/Text"):GetComponent("Text")
local starRoot = Util.GetGameObject(head, "star") local starRoot = Util.GetGameObject(head, "star")
local aa=0
local frameStr="r_characterbg_goden"
if data.type == BattleUnitType.Role then if data.type == BattleUnitType.Role then
local roleId = data.roleData.monsterId or data.roleData.roleId local roleId = data.roleData.monsterId or data.roleData.roleId
local roleLv = data:GetRoleData(RoleDataName.Level) local roleLv = data:GetRoleData(RoleDataName.Level)
@ -333,31 +334,43 @@ function this.HeadAdapter(head, data)
local star = data.star local star = data.star
local config = {} local config = {}
if roleId > 10100 then if data.position==100 then
local MonsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, roleId) config.Quality=4
config.Quality = MonsterConfig.Quality if NameManager.roleSex==ROLE_SEX.BOY then
config.lv = MonsterConfig.Level aa=3201
star=MonsterConfig.Star else
if MonsterConfig.MonsterId > 10000 then aa=3202
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, MonsterConfig.MonsterId) 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.Icon = heroConfig.Icon
config.Profession = heroConfig.Profession config.Profession = heroConfig.Profession
config.PropertyName = heroConfig.PropertyName config.PropertyName = heroConfig.PropertyName
else config.lv = roleLv
local monsterViewInfo = ConfigManager.GetConfigData(ConfigName.MonsterViewConfig, MonsterConfig.MonsterId)
config.Icon = monsterViewInfo.MonsterIcon
end end
else aa=config.Icon
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, roleId) frameStr=GetHeroQuantityImageByquality(config.Quality, star)
config.Quality = heroConfig.Quality
config.Icon = heroConfig.Icon
config.Profession = heroConfig.Profession
config.PropertyName = heroConfig.PropertyName
config.lv = roleLv
end end
-- 头像 -- 头像
frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(config.Quality, star)) frame.sprite = this.spLoader:LoadSprite(frameStr)
local aa=config.Icon
if skinId and skinId>0 then if skinId and skinId>0 then
local skinConfig=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId) local skinConfig=ConfigManager.GetConfigDataByKey(ConfigName.HeroSkin,"Type",skinId)
if skinConfig then if skinConfig then