Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
9e0ca64dbd
|
@ -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,
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,6 +334,16 @@ function this.HeadAdapter(head, data)
|
|||
local star = data.star
|
||||
|
||||
local config = {}
|
||||
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
|
||||
|
@ -355,9 +366,11 @@ function this.HeadAdapter(head, data)
|
|||
config.PropertyName = heroConfig.PropertyName
|
||||
config.lv = roleLv
|
||||
end
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue