merge dev

server/gameserver/bullet.cc

@@ -422,6 +422,18 @@ void Bullet::ProcPosionGasBomb(int delay_time)
 void Bullet::ProcMolotorCocktailBomb(int delay_time)
 {
     if (sender.Get()) {
+        #if 1
+        a8::Vec2 old_buff_vec2_param1 = sender.Get()->buff_vec2_param1;
+        sender.Get()->buff_vec2_param1 = GetPos();
+        MetaData::Buff * buff_meta = MetaMgr::Instance()->GetBuff(gun_meta->i->buffid());
+        if (buff_meta) {
+            sender.Get()->AddBuff(sender.Get(),
+                                  buff_meta,
+                                  1
+                                  );
+        }
+        sender.Get()->buff_vec2_param1 = old_buff_vec2_param1;
+        #else
         MolotorCocktailMiTask* task = new MolotorCocktailMiTask();
         task->room = room;
         task->sender.Attach(sender.Get());
@@ -447,5 +459,6 @@ void Bullet::ProcMolotorCocktailBomb(int delay_time)
              },
              &room->timer_attacher.timer_list_
              );
+        #endif
     }
 }

server/gameserver/creature.cc

@@ -146,9 +146,11 @@ void Creature::AddBuff(Creature* caster,
                        int skill_lv,
                        MetaData::Skill* buff_skill_meta)
 {
+    #if 0
     if (GetBuffById(buff_meta->i->buff_id())) {
         return;
     }
+    #endif
     if (IsImmuneBuffEffect(buff_meta->i->buff_effect())) {
         return;
     }

server/tools/protobuild/cs_msgid.proto

@@ -20,6 +20,7 @@ enum CMMessageId_e
     _CMAdEnd = 214;
     _CMGetBoxInfo = 215;
     _CMOpenBox = 216;
+    _CMExecCommand = 217;
 }
 
 enum SMMessageId_e

server/tools/protobuild/cs_proto.proto

@@ -899,6 +899,12 @@ message CMMove
     optional int32 get_on = 36;
 }
 
+//执行GM指令
+message CMExecCommand
+{
+    optional string cmd = 1; //指令
+}
+
 //丢弃道具
 message CMDropItem
 {