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 2022-10-18 12:55:26 +08:00
parent 39d5bd082f
commit a9d476c33d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/metadata.cc
View File

@ -353,13 +353,18 @@ namespace MetaData
a8::XValue(strings2[1]).GetDouble(), a8::XValue(strings2[1]).GetDouble(),
strings2.size() > 2 ? a8::XValue(strings2[2]).GetDouble() : 0, strings2.size() > 2 ? a8::XValue(strings2[2]).GetDouble() : 0,
strings2.size() > 3 ? a8::XValue(strings2[3]).GetInt() : 0, strings2.size() > 3 ? a8::XValue(strings2[3]).GetInt() : 0,
strings2.size() > 4 ? a8::XValue(strings2[4]).GetInt() : 0 strings2.size() > 4 ? a8::XValue(strings2[4]).GetInt() : 0,
strings2.size() > 5 ? a8::XValue(strings2[5]).GetInt() : 0
) )
); );
lock_time += strings2.size() > 3 ? a8::XValue(strings2[3]).GetInt() : 0; if (std::get<5>(bullet_born_offset[bullet_born_offset.size() - 1]) != 0) {
lock_time = std::max(lock_time, strings2.size()>3 ? a8::XValue(strings2[3]).GetInt() : 0);
}
#if 0
if (strings2.size() > 4 && a8::XValue(strings2[4]).GetInt() == 1) { if (strings2.size() > 4 && a8::XValue(strings2[4]).GetInt() == 1) {
lock_time = 0; lock_time = 0;
} }
#endif
} }
} }
{ {

4
server/gameserver/metadata.h
View File

@ -96,8 +96,8 @@ namespace MetaData
const metatable::Equip* i = nullptr; const metatable::Equip* i = nullptr;
int lock_time = 0; int lock_time = 0;
//0,0,0,0,后座力 //0,0,0,0,后座力,是否取消定身
std::vector<std::tuple<float, float, float, int, int>> bullet_born_offset; std::vector<std::tuple<float, float, float, int, int, int>> bullet_born_offset;
std::vector<std::tuple<int, a8::Vec2>> shoot_offsets; std::vector<std::tuple<int, a8::Vec2>> shoot_offsets;
std::shared_ptr<std::tuple<float, float, float>> gun_muzzle_position; std::shared_ptr<std::tuple<float, float, float>> gun_muzzle_position;
std::shared_ptr<std::tuple<float, float, float>> movex_position; std::shared_ptr<std::tuple<float, float, float>> movex_position;