From 0a039944b26d10d5f1c2282028f19862d98f85dd Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 28 Aug 2024 19:29:12 +0800
Subject: [PATCH] 1

---
 server/gameserver/custom_battle.h | 2 +-
 server/gameserver/netdata.cc      | 1 +
 server/gameserver/room.cc         | 5 +++++
 server/gameserver/room.h          | 4 +++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/custom_battle.h b/server/gameserver/custom_battle.h
index 1c4fb09c..fc9e22e2 100644
--- a/server/gameserver/custom_battle.h
+++ b/server/gameserver/custom_battle.h
@@ -49,7 +49,7 @@ class CustomBattle : public std::enable_shared_from_this<CustomBattle>
     bool IsCustomMode() { return custom_room_type_ == CUSTOM_ROOM_CUSTOM; }
     bool IsPvp() { 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,
                  std::weak_ptr<SocketDisconnectHandler> sd_handler);
     void OnMemberReady(CustomMember* member);
diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc
index 961993a8..a8e553a2 100644
--- a/server/gameserver/netdata.cc
+++ b/server/gameserver/netdata.cc
@@ -1367,6 +1367,7 @@ void BattleDataContext::RecalcCrit()
 
 bool BattleDataContext::HasWing()
 {
+    return true;
     if (hero_dto) {
         long long token_id = hero_dto->Get("token_id", "");
         if (token_id > 6240603010001668 && token_id <= 6240603010002168) {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index dca4ef34..5e1a1d3e 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -4325,3 +4325,8 @@ void Room::MobaOver()
         OnGameOver();
     }
 }
+
+void Room::SetNewBieBattle(int is_newbie_battle)
+{
+    is_newbie_battle_ = is_newbie_battle;
+}
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 2b250a60..7c2b407f 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -308,7 +308,8 @@ public:
     long long GetMobaOvertimeRaceFrameNo () { return moba_overtime_race_frameno_; }
     void MobaOver();
     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_; }
 
 private:
@@ -476,6 +477,7 @@ private:
 
     std::shared_ptr<InGameVoice> ingame_voice_;
     std::shared_ptr<BoxDrop> box_drop_;
+    int is_newbie_battle_ = 0;
 
     friend class Incubator;
     friend class Team;