This commit is contained in:
aozhiwei 2022-10-09 21:22:55 +08:00
parent c32c47bc5b
commit d364fc5c72
3 changed files with 27 additions and 26 deletions

View File

@ -476,27 +476,27 @@ enum BulletConsumeType_e
enum MagicType_e
{
MAGIC_NONE = 0,
MAGIC_AXXF = 1, //20101 爱心香风
MAGIC_SJYDHX = 2, //20701 瞬间移动回血
MAGIC_HLYZ = 3, //20801 火力压制
MAGIC_YMCZ = 4, //20901 野蛮冲撞
MAGIC_LDFY = 5, //21001 立盾防御
MAGIC_HJHX = 6, //20201 火箭浣熊
MAGIC_FG = 7, //20401 飞勾
MAGIC_WLFB = 8, //20601 威力翻倍
MAGIC_YLZ = 9, //20301 医疗站
MAGIC_YS = 10, //20501 隐身
MAGIC_AXXF, //20101 爱心香风
MAGIC_SJYDHX, //20701 瞬间移动回血
MAGIC_HLYZ, //20801 火力压制
MAGIC_YMCZ, //20901 野蛮冲撞
MAGIC_LDFY, //21001 立盾防御
MAGIC_HJHX, //20201 火箭浣熊
MAGIC_FG, //20401 飞勾
MAGIC_WLFB, //20601 威力翻倍
MAGIC_YLZ, //20301 医疗站
MAGIC_YS, //20501 隐身
MAGIC_SJXY = 21, //30101 射击眩晕
MAGIC_SSJS = 22, //30201 受伤加速
MAGIC_JSHX = 23, //30301 击杀回血
MAGIC_SWZB = 24, //30401 死亡自曝
MAGIC_CMXD = 25, //30501 此面向敌
MAGIC_MYXY = 26, //30601 免疫眩晕
MAGIC_GZJS = 27, //30701 钩爪拉动减伤
MAGIC_JYFH = 28, //30801 救援防护
MAGIC_FH = 29, //30901 复活
MAGIC_YSHF = 30, //31001 隐身恢复
MAGIC_SJXY, //30101 射击眩晕
MAGIC_SSJS, //30201 受伤加速
MAGIC_JSHX, //30301 击杀回血
MAGIC_SWZB, //30401 死亡自曝
MAGIC_CMXD, //30501 此面向敌
MAGIC_MYXY, //30601 免疫眩晕
MAGIC_GZJS, //30701 钩爪拉动减伤
MAGIC_JYFH, //30801 救援防护
MAGIC_FH, //30901 复活
MAGIC_YSHF, //31001 隐身恢复
MAGIC_END
};

View File

@ -1001,13 +1001,13 @@ namespace MetaData
}
}
{
number_meta = MetaMgr::Instance()->GetSkillNumber(i->skill_id());
if (!number_meta) {
abort();
}
SkillHelper::GetMagicIdAndBaseSkillId(i->skill_id(), magic_id, base_skill_id);
}
{
SkillHelper::GetMagicIdAndBaseSkillId(i->skill_id(), magic_id, base_skill_id);
number_meta = MetaMgr::Instance()->GetSkillNumber(i->skill_id());
if (!number_meta && GetMagicId() != 0) {
abort();
}
}
}

View File

@ -133,7 +133,8 @@ void SkillHelper::Init()
if (skill_id) {
magic_skill_hash_[i] = skill_id;
skill_magic_hash_[skill_id] = i;
//abort();
} else {
abort();
}
}
}