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-19 11:28:03 +08:00
parent ea3d21091e
commit fa71ea33d9
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -104,7 +104,7 @@ enum InventorySlot_e
IS_TRAP = 19, //陷井 IS_TRAP = 19, //陷井
IS_POSION_GAS_BOMB = 20, //毒气弹 IS_POSION_GAS_BOMB = 20, //毒气弹
IS_C4 = 21, //c3 IS_C4 = 21, //c4
IS_SHIELD_WALL = 22, //盾墙 IS_SHIELD_WALL = 22, //盾墙
IS_SINGAL_GUN = 23, //信号枪 IS_SINGAL_GUN = 23, //信号枪
IS_OIL_BUCKET = 24, //汽油桶 IS_OIL_BUCKET = 24, //汽油桶
@ -527,7 +527,7 @@ const int SPEC3_IS_BEGIN = IS_C4;
const int SPEC3_IS_END = IS_OIL_BUCKET; const int SPEC3_IS_END = IS_OIL_BUCKET;
const int SPEC1_SLOT_BEGIN = 3; //手雷 烟雾弹 const int SPEC1_SLOT_BEGIN = 3; //手雷 烟雾弹
const int SPEC2_SLOT_BEGIN = 5; //毒气弹 燃烧瓶 陷井 地雷 const int SPEC2_SLOT_BEGIN = 5; //地雷 燃烧瓶 陷井 毒气弹
const int SPEC3_SLOT_BEGIN = 9; //c4 盾墙 信号抢 汽油桶 const int SPEC3_SLOT_BEGIN = 9; //c4 盾墙 信号抢 汽油桶
const int DOOR_THING_ID = 61701; const int DOOR_THING_ID = 61701;

11
server/gameserver/creature.cc
View File

@ -2733,6 +2733,17 @@ void Creature::ProcOnceChgAttrBuff(MetaData::Buff* buff_meta)
DecHP(std::abs(chg_hp), VP_Buff, "", buff_meta->i->buff_id()); DecHP(std::abs(chg_hp), VP_Buff, "", buff_meta->i->buff_id());
} }
} }
#ifdef DEBUG
{
std::string dbg_msg = a8::Format
("buff扣血 type:%s val:%f",
{
buff_meta->int_param2,
buff_meta->int_param3,
});
room->BroadcastDebugMsg(dbg_msg);
}
#endif
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
} }
break; break;

2
server/gameserver/human.cc
View File

@ -1319,7 +1319,7 @@ void Human::AddToPartObjects(Entity* entity)
void Human::RemovePartObjects(Entity* entity) void Human::RemovePartObjects(Entity* entity)
{ {
#ifdef DEBUG #ifdef DEBUG1
if (!follow_target_) { if (!follow_target_) {
for (Human* observer : observers_) { for (Human* observer : observers_) {
if (observer->IsPlayer()) { if (observer->IsPlayer()) {

1
server/gameserver/human.h
View File

@ -44,6 +44,7 @@ struct OverRewardItem
int id = 0; int id = 0;
std::string obtain_gold; std::string obtain_gold;
std::string gold_limit; std::string gold_limit;
std::string curr_gold;
}; };
struct OverReward struct OverReward

2
server/gameserver/player.cc
View File

@ -88,7 +88,7 @@ void Player::Initialize()
} }
#ifdef DEBUG #ifdef DEBUG
{ {
std::vector<int> present_items{30202, 30201, 30301, 30203, 30207, 30208, 30209, 30210, 30204}; std::vector<int> present_items{30202, 30201, 30301, 30203, 30207, 30208, 30209, 30210, 30204, 30205, 30206};
for (int item_id : present_items) { for (int item_id : present_items) {
GMAddItem(item_id, 10); GMAddItem(item_id, 10);
} }

5
server/tools/protobuild/cs_proto.proto
View File

@ -501,10 +501,10 @@ message MFActivePlayerData
2：枪2 2：枪2
3：手雷 3：手雷
4：烟雾弹 4：烟雾弹
5: 毒气弹 5: 地雷
6: 燃烧瓶 6: 燃烧瓶
7: 陷阱 7: 陷阱
8: 地雷 8: 毒气弹
9: c4 9: c4
10: 盾墙 10: 盾墙
11: 信号抢 11: 信号抢
@ -869,6 +869,7 @@ message MFOverRewardItem
optional string obtain_gold = 1 [default = "0"]; //实际获得金币数 optional string obtain_gold = 1 [default = "0"]; //实际获得金币数
optional string gold_limit = 2 [default = "0"]; //今天可获得的金币上限 optional string gold_limit = 2 [default = "0"]; //今天可获得的金币上限
optional int32 id = 3; //英雄或者武器id optional int32 id = 3; //英雄或者武器id
optional string curr_gold = 4 [default = "0"]; //当前金币数
} }
//结算奖励 //结算奖励