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

23
server/gameserver/android.cc
View File

@ -12,6 +12,8 @@
#include "mt/Equip.h" #include "mt/Equip.h"
#include "mt/Robot.h" #include "mt/Robot.h"
#include "mt/Text.h" #include "mt/Text.h"
#include "mt/Hero.h"
#include "mt/Item.h"
Android::Android():Human() Android::Android():Human()
{ {
@ -164,15 +166,18 @@ void Android::InternalUpdate(int delta_time)
void Android::GiveEquip() 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 (weapon_meta) { if (item_meta) {
Weapon& weapon = weapons[GUN_SLOT1]; const mt::Equip* weapon_meta = mt::Equip::GetById(item_meta->relationship());
weapon.weapon_idx = GUN_SLOT1; if (weapon_meta) {
weapon.weapon_id = weapon_meta->id(); Weapon& weapon = weapons[GUN_SLOT1];
weapon.ammo = 0; weapon.weapon_idx = GUN_SLOT1;
weapon.meta = weapon_meta; weapon.weapon_id = weapon_meta->id();
weapon.Recalc(); weapon.ammo = 0;
SetCurrWeapon(&weapon); weapon.meta = weapon_meta;
weapon.Recalc();
SetCurrWeapon(&weapon);
}
} }
sex = robot_meta->sex(); sex = robot_meta->sex();
if (sex == 0) { if (sex == 0) {

17
server/gameserver/netdata.cc
View File

@ -448,13 +448,16 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
} }
#if 1 #if 1
if (hero_ability_->hero_meta) { 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 (meta) { if (item_meta) {
weapon1_ability_ = std::make_shared<WeaponAbility>(); const mt::Equip* meta = mt::Equip::GetById(item_meta->relationship());
weapon1_ability_->weapon_uniid = 0; if (meta) {
weapon1_ability_->weapon_lv = 1; weapon1_ability_ = std::make_shared<WeaponAbility>();
weapon1_ability_->quality = 1; weapon1_ability_->weapon_uniid = 0;
weapon1_ability_->weapon_meta = meta; weapon1_ability_->weapon_lv = 1;
weapon1_ability_->quality = 1;
weapon1_ability_->weapon_meta = meta;
}
} }
} }
#else #else