1

server/gameserver/mt/AirRaid.cc

@@ -29,4 +29,16 @@ namespace mt
             }
         }
     }
+
+    void AirRaid::Traverse(std::function<void (const AirRaid*, bool&)> cb)
+    {
+        bool stop = false;
+        for (auto& itr : raw_list) {
+            cb(itr, stop);
+            if (stop) {
+                break;
+            }
+        }
+    }
+
 }

server/gameserver/mt/AirRaid.h

@@ -15,6 +15,8 @@ namespace mt
 
         std::vector<std::tuple<int, int>> _raid_waves;
         std::vector<int> _bomb_ids;
+
+        static void Traverse(std::function<void (const AirRaid*, bool&)> cb);
     };
 
 }

server/gameserver/room.cc

@@ -3429,23 +3429,22 @@ void Room::SetInfiniteBulletMode()
 
 void Room::InitAirRaid()
 {
-    // 111
+    mt::AirRaid::Traverse
-    #if 0
+        (
-    std::list<const mt::AirRaid>& air_raids = MetaMgr::Instance()->GetAirRaids();
+         [this] (const mt::AirRaid* air_raid, bool& stop)
-    for (auto& air_raid : air_raids) {
+         {
-        xtimer.SetTimeoutEx
+             xtimer.SetTimeoutEx
-            (SERVER_FRAME_RATE * air_raid.pb->time(),
+                 (SERVER_FRAME_RATE * air_raid->time(),
-             [this, &air_raid] (int event, const a8::Args* args)
+                  [this, air_raid] (int event, const a8::Args* args)
-             {
+                  {
-                 if (a8::TIMER_EXEC_EVENT == event) {
+                      if (a8::TIMER_EXEC_EVENT == event) {
-                     if (!IsGameOver()) {
+                          if (!IsGameOver()) {
-                         AirRaid(air_raid.pb->id());
+                              AirRaid(air_raid->id());
-                     }
+                          }
-                 }
+                      }
-             },
+                  },
-             &xtimer_attacher_);
+                  &xtimer_attacher_);
-    }
+         });
-    #endif
 }
 
 void Room::AirRaid(int airraid_id)

server/tools/protobuild/cs_proto.proto

@@ -657,7 +657,7 @@ message MFEmote
 {
     optional int32 emote_id = 1; //表情id
     optional int32 player_id = 3; //玩家id
-    optional string msg = 5;
+    optional string msg = 5;;
 }
 
 //英雄结算信息