server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-06-30 15:50:34 +08:00
parent 6142dc02c9
commit 02bf5a8e28
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/android.cc
View File

@ -12,6 +12,8 @@
#include "mt/Equip.h"
#include "mt/Robot.h"
#include "mt/Text.h"
#include "mt/Hero.h"
#include "mt/Item.h"
Android::Android():Human()
{
@ -164,7 +166,9 @@ void Android::InternalUpdate(int delta_time)
void Android::GiveEquip()
{
const mt::Equip* weapon_meta = mt::Equip::GetById(robot_meta->weapon_id());
const mt::Item* item_meta = mt::Item::GetById(meta->default_weapon());
if (item_meta) {
const mt::Equip* weapon_meta = mt::Equip::GetById(item_meta->relationship());
if (weapon_meta) {
Weapon& weapon = weapons[GUN_SLOT1];
weapon.weapon_idx = GUN_SLOT1;
@ -174,6 +178,7 @@ void Android::GiveEquip()
weapon.Recalc();
SetCurrWeapon(&weapon);
}
}
sex = robot_meta->sex();
if (sex == 0) {
sex = rand() % 3;

5
server/gameserver/netdata.cc
View File

@ -448,7 +448,9 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
}
#if 1
if (hero_ability_->hero_meta) {
const mt::Equip* meta = mt::Equip::GetById(hero_ability_->hero_meta->default_weapon());
const mt::Item* item_meta = mt::Item::GetById(hero_ability_->hero_meta->default_weapon());
if (item_meta) {
const mt::Equip* meta = mt::Equip::GetById(item_meta->relationship());
if (meta) {
weapon1_ability_ = std::make_shared<WeaponAbility>();
weapon1_ability_->weapon_uniid = 0;
@ -457,6 +459,7 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
weapon1_ability_->weapon_meta = meta;
}
}
}
#else
if (obj.HasKey("weapon_dto1") && obj.At("weapon_dto1")->IsObject()) {
weapon_dto1 = obj.At("weapon_dto1");