机器人Ok
This commit is contained in:
parent
1656f6000c
commit
b2f0e4f111
@ -24,15 +24,6 @@ void Android::Initialize()
|
||||
health = meta->i->health();
|
||||
skin = 14001;
|
||||
RecalcSelfCollider();
|
||||
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(a8::RandEx(12103, 12122));
|
||||
if (weapon_meta) {
|
||||
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
|
||||
weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();
|
||||
weapons[GUN_SLOT1].weapon_lv = 1;
|
||||
weapons[GUN_SLOT1].ammo = 0;
|
||||
weapons[GUN_SLOT1].meta = weapon_meta;
|
||||
curr_weapon = &weapons[GUN_SLOT1];
|
||||
}
|
||||
}
|
||||
|
||||
void Android::Update(int delta_time)
|
||||
|
@ -717,6 +717,17 @@ bool Human::HasNoDownedTeammate()
|
||||
void Human::Land()
|
||||
{
|
||||
a8::UnSetBitFlag(status, HS_Jump);
|
||||
if (entity_subtype == EST_Android) {
|
||||
MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(a8::RandEx(12103, 12122));
|
||||
if (weapon_meta) {
|
||||
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
|
||||
weapons[GUN_SLOT1].weapon_id = weapon_meta->i->id();
|
||||
weapons[GUN_SLOT1].weapon_lv = 1;
|
||||
weapons[GUN_SLOT1].ammo = 0;
|
||||
weapons[GUN_SLOT1].meta = weapon_meta;
|
||||
curr_weapon = &weapons[GUN_SLOT1];
|
||||
}
|
||||
}
|
||||
FindLocation();
|
||||
SyncAroundPlayers();
|
||||
}
|
||||
|
@ -175,8 +175,10 @@ void Room::AddPlayer(Player* hum)
|
||||
hum->FindLocation();
|
||||
hum->RefreshView();
|
||||
MatchTeam(hum);
|
||||
while (human_hash_.size() > ROOM_MAX_PLAYER_NUM) {
|
||||
RandRemoveAndroid();
|
||||
}
|
||||
}
|
||||
|
||||
unsigned short Room::AllocUniid()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user