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 2024-08-28 19:29:12 +08:00
parent 48de22c611
commit 0a039944b2
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/custom_battle.h
View File

@ -49,7 +49,7 @@ class CustomBattle : public std::enable_shared_from_this<CustomBattle>
bool IsCustomMode() { return custom_room_type_ == CUSTOM_ROOM_CUSTOM; } bool IsCustomMode() { return custom_room_type_ == CUSTOM_ROOM_CUSTOM; }
bool IsPvp() { return !is_moba_; } bool IsPvp() { return !is_moba_; }
bool IsMoba() { return is_moba_; } bool IsMoba() { return is_moba_; }
bool IsNewBieBattle() { return is_newbie_battle_; } int IsNewBieBattle() { return is_newbie_battle_; }
void OnEnter(std::shared_ptr<cs::CMJoin> join_msg, long ip_saddr, int socket_handle, void OnEnter(std::shared_ptr<cs::CMJoin> join_msg, long ip_saddr, int socket_handle,
std::weak_ptr<SocketDisconnectHandler> sd_handler); std::weak_ptr<SocketDisconnectHandler> sd_handler);
void OnMemberReady(CustomMember* member); void OnMemberReady(CustomMember* member);

1
server/gameserver/netdata.cc
View File

@ -1367,6 +1367,7 @@ void BattleDataContext::RecalcCrit()
bool BattleDataContext::HasWing() bool BattleDataContext::HasWing()
{ {
return true;
if (hero_dto) { if (hero_dto) {
long long token_id = hero_dto->Get("token_id", ""); long long token_id = hero_dto->Get("token_id", "");
if (token_id > 6240603010001668 && token_id <= 6240603010002168) { if (token_id > 6240603010001668 && token_id <= 6240603010002168) {

5
server/gameserver/room.cc
View File

@ -4325,3 +4325,8 @@ void Room::MobaOver()
OnGameOver(); OnGameOver();
} }
} }
void Room::SetNewBieBattle(int is_newbie_battle)
{
is_newbie_battle_ = is_newbie_battle;
}

4
server/gameserver/room.h
View File

@ -308,7 +308,8 @@ public:
long long GetMobaOvertimeRaceFrameNo () { return moba_overtime_race_frameno_; } long long GetMobaOvertimeRaceFrameNo () { return moba_overtime_race_frameno_; }
void MobaOver(); void MobaOver();
std::shared_ptr<BoxDrop> GetBoxDrop() { return box_drop_; } std::shared_ptr<BoxDrop> GetBoxDrop() { return box_drop_; }
int IsNewBieBattle() { return is_newbie_battle_; }
void SetNewBieBattle(int is_newbie_battle);
std::shared_ptr<InGameVoice> GetInGameVoice() { return ingame_voice_; } std::shared_ptr<InGameVoice> GetInGameVoice() { return ingame_voice_; }
private: private:
@ -476,6 +477,7 @@ private:
std::shared_ptr<InGameVoice> ingame_voice_; std::shared_ptr<InGameVoice> ingame_voice_;
std::shared_ptr<BoxDrop> box_drop_; std::shared_ptr<BoxDrop> box_drop_;
int is_newbie_battle_ = 0;
friend class Incubator; friend class Incubator;
friend class Team; friend class Team;