修复最后一个毒圈无伤害问题

server/gameserver/player.cc

@@ -195,7 +195,7 @@ void Player::UpdateAction()
                         if (item_meta){
                             if (inventory[item_meta->i->_inventory_slot()] > 0) {
                                 health += item_meta->i->heal();
-                                health = std::max(100.0f, health);
+                                health = std::min(100.0f, health);
                                 --inventory[item_meta->i->_inventory_slot()];
                                 need_sync_active_player = true;
                                 SyncAroundPlayers();

server/gameserver/room.cc

@@ -630,7 +630,11 @@ void Room::UpdateGas()
                 continue;
             }
             bool b1 = CircleContainCircle(gas_data.pos_old,
+                                          #if 1
+                                          gas_data.gas_progress,
+                                          #else
                                           gas_data.rad_old,
+                                          #endif
                                           pair.second->pos,
                                           pair.second->GetRadius()
                                           );