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-05-18 14:25:50 +08:00
parent 79cec69263
commit 34ae57b544
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/constant.h
View File

@ -81,7 +81,9 @@ enum InventorySlot_e
IS_SINGAL_GUN = 23, //信号枪 IS_SINGAL_GUN = 23, //信号枪
IS_OIL_BUCKET = 24, //汽油桶 IS_OIL_BUCKET = 24, //汽油桶
IS_GEMSTONE = 25, //能量宝石 IS_YELLOW_STONE = 25, //黄宝石
IS_BLUE_STONE = 26, //蓝宝石
IS_PURPLE_STONE = 27, //紫宝石
IS_MAX = 30, IS_MAX = 30,
IS_END IS_END

12
server/gameserver/human.cc
View File

@ -1249,7 +1249,7 @@ void Human::DeadDrop()
on_dead_remove_objects_.clear(); on_dead_remove_objects_.clear();
} }
{ {
if (GetInventory(IS_GEMSTONE) > 0 && gemstone > 0) { if (GetInventory(IS_YELLOW_STONE) > 0 && gemstone > 0) {
room->frame_event.AddPropChg room->frame_event.AddPropChg
( (
GetWeakPtrRef(), GetWeakPtrRef(),
@ -1266,8 +1266,8 @@ void Human::DeadDrop()
SetMaxHP(GetBattleContext()->GetMaxHP()); SetMaxHP(GetBattleContext()->GetMaxHP());
gemstone = 0; gemstone = 0;
DecInventory(IS_GEMSTONE, GetInventory(IS_GEMSTONE)); DecInventory(IS_YELLOW_STONE, GetInventory(IS_YELLOW_STONE));
SyncVolume(IS_GEMSTONE); SyncVolume(IS_YELLOW_STONE);
} }
} }
MarkSyncActivePlayer(__FILE__, __LINE__, __func__); MarkSyncActivePlayer(__FILE__, __LINE__, __func__);
@ -3235,10 +3235,10 @@ void Human::SyncVolume(int slot_id)
void Human::ProcGemStoneItem(AddItemDTO& dto) void Human::ProcGemStoneItem(AddItemDTO& dto)
{ {
if (GetInventory(IS_GEMSTONE) >= GetVolume(IS_GEMSTONE)) { if (GetInventory(IS_YELLOW_STONE) >= GetVolume(IS_YELLOW_STONE)) {
return; return;
} }
AddInventory(IS_GEMSTONE, 1); AddInventory(IS_YELLOW_STONE, 1);
gemstone += 1; gemstone += 1;
room->frame_event.AddPropChg room->frame_event.AddPropChg
( (
@ -3283,7 +3283,7 @@ void Human::ProcGemStoneItem(AddItemDTO& dto)
0, 0,
GetMaxHP(), GetMaxHP(),
true); true);
SyncVolume(IS_GEMSTONE); SyncVolume(IS_YELLOW_STONE);
//刷新数量 //刷新数量
int add_num = 1; int add_num = 1;
Entity* entity = room->GetEntityByUniId(dto.uniid); Entity* entity = room->GetEntityByUniId(dto.uniid);

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

@ -253,6 +253,7 @@ message MFWeapon
optional string weapon_uniid = 3; //武器唯一id optional string weapon_uniid = 3; //武器唯一id
optional int32 ammo = 4; //弹药数 optional int32 ammo = 4; //弹药数
optional int32 volume = 5; //弹夹容量 optional int32 volume = 5; //弹夹容量
optional int32 weapon_battle_lv = 6 [default = 0]; //武器战内等级(升级)
} }
//皮肤 //皮肤