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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-11 17:24:47 +08:00
parent ddbb749689
commit 9046f1c8ef
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -250,8 +250,8 @@ const int GUN_SLOT2 = 2;
const int FRAG_SLOT = 3; const int FRAG_SLOT = 3;
const int SMOKE_SLOT = 4; const int SMOKE_SLOT = 4;
const int MAP_HEIGHT = 2560; const int MAP_HEIGHT = 32*75;
const int MAP_WIDTH = 2560; const int MAP_WIDTH = 32*65;
const int MAP_CELL_WIDTH = 64 * 8; const int MAP_CELL_WIDTH = 64 * 8;
const int MAP_GRID_WIDTH = 64; const int MAP_GRID_WIDTH = 64;

6
server/gameserver/room.cc
View File

@ -360,15 +360,11 @@ void Room::CreateThings()
assert(thing_meta); assert(thing_meta);
#endif #endif
if (thing_meta) { if (thing_meta) {
#if 1
CreateObstacle(thing_id, thing_tpl.i->x(), thing_tpl.i->y());
#else
if (thing_meta->i->is_house()) { if (thing_meta->i->is_house()) {
CreateBuilding(thing_id, thing_tpl.i->x(), thing_tpl.i->y()); CreateBuilding(thing_id, thing_tpl.i->x(), thing_tpl.i->y());
} else { } else {
CreateObstacle(thing_id, thing_tpl.i->x(), thing_tpl.i->y()); CreateObstacle(thing_id, thing_tpl.i->x(), thing_tpl.i->y());
} }
#endif
} }
} }
} }
@ -397,7 +393,6 @@ void Room::DropItem(a8::Vec2 pos, int item_id, int item_count, int item_lv)
void Room::CreateBuilding(int thing_id, float building_x, float building_y) void Room::CreateBuilding(int thing_id, float building_x, float building_y)
{ {
#if 0
MetaData::MapThing* thing_meta = MetaMgr::Instance()->GetMapThing(thing_id); MetaData::MapThing* thing_meta = MetaMgr::Instance()->GetMapThing(thing_id);
if (!thing_meta) { if (!thing_meta) {
return; return;
@ -460,7 +455,6 @@ void Room::CreateBuilding(int thing_id, float building_x, float building_y)
); );
} }
} }
#endif
} }
Obstacle* Room::CreateObstacle(int id, float x, float y) Obstacle* Room::CreateObstacle(int id, float x, float y)

2
server/tools/protobuild/metatable.proto
View File

@ -37,6 +37,8 @@ message MapThing
required float damage_dia = 7; //伤害半径 required float damage_dia = 7; //伤害半径
required int32 drop = 8; //掉落 required int32 drop = 8; //掉落
required int32 attack_type = 9; //是否可攻击 0:不可破坏对象 1：可破坏对象 2：可穿透对象 required int32 attack_type = 9; //是否可攻击 0:不可破坏对象 1：可破坏对象 2：可穿透对象
required int32 is_house = 10;
required int32 house_id = 11;
} }
message SafeArea message SafeArea