Merge branch 'feat/shuffle_extra' into 'main'

MsgShuffleHand to MsgShuffleHandExtra

See merge request !59

idl/ocgcore.proto

@@ -481,10 +481,13 @@ message StocGameMessage {
     repeated Option options = 2; // 可选项集合
   }
 
-  // 手牌切洗
-  message MsgShuffleHand {
+  // 手牌/额外卡组切洗
+  //
+  // （因为手牌切洗和额外卡组切洗的处理逻辑一样，因此这里放在一个msg里面）
+  message MsgShuffleHandExtra {
     int32 player = 1;         // 玩家编号
-    repeated int32 hands = 2; // 切洗之后的手牌编号
+    CardZone zone = 2;        // 洗切区域
+    repeated int32 cards = 3; // 切洗之后的手牌编号
   }
 
   // 盖卡切洗
@@ -854,7 +857,7 @@ message StocGameMessage {
     MsgSelectEffectYn select_effect_yn = 11;
     MsgSelectPosition select_position = 12;
     MsgSelectOption select_option = 13;
-    MsgShuffleHand shuffle_hand = 14;
+    MsgShuffleHandExtra shuffle_hand_extra = 14;
     MsgSelectBattleCmd select_battle_cmd = 15;
     MsgPosChange pos_change = 16;
     MsgSelectUnselectCard select_unselect_card = 17;