Merge branch 'feat/select_battle_cmd' into 'main'

Feat/select battle cmd

See merge request !22

idl/ocgcore.proto

@@ -152,6 +152,7 @@ message CtosGameMsgResponse {
   message SelectEffectYnResponse { bool selected = 1; }
   message SelectPositionResponse { CardPosition position = 1; }
   message SelectOptionResponse { int32 code = 1; }
+  message SelectBattleCmdResponse { int32 selected_cmd = 1; }
 
   oneof gameMsgResponse {
     SelectIdleCmdResponse select_idle_cmd = 1;
@@ -161,6 +162,7 @@ message CtosGameMsgResponse {
     SelectEffectYnResponse select_effect_yn = 5;
     SelectPositionResponse select_position = 6;
     SelectOptionResponse select_option = 7;
+    SelectBattleCmdResponse select_battle_cmd = 8;
   }
 }
 
@@ -365,11 +367,11 @@ message StocGameMessage {
       repeated IdleData idle_datas = 2;
     }
 
-    int32 player = 1;
-    repeated IdleCmd idle_cmds = 2;
-    bool enable_bp = 3;
-    bool enable_ep = 4;
-    bool enable_shuffle = 5;
+    int32 player = 1;               // 玩家编号
+    repeated IdleCmd idle_cmds = 2; // 可操作的命令
+    bool enable_bp = 3;             // 是否可以进入BP阶段
+    bool enable_ep = 4;             // 是否可以结束回合
+    bool enable_shuffle = 5;        // 是否可以洗切手牌
   }
 
   // 位置选择操作提示
@@ -466,6 +468,33 @@ message StocGameMessage {
     repeated int32 hands = 2; // 切洗之后的手牌编号
   }
 
+  // 战斗阶段可操作指示
+  message MsgSelectBattleCmd {
+    message BattleCmd {
+      enum BattleType {
+        UNKNOWN = 0;
+        ACTIVATE = 1; // 发动效果
+        ATTACK = 2;   // 攻击
+      }
+
+      message BattleData {
+        CardInfo card_info = 1;
+        int32 effect_description =
+            2; // `BattleType`为`ACTIVATE`时才会设置这个字段
+        bool direct_attackable = 3; // 是否可以直接攻击对手
+        int32 response = 4; // 用户选择该操作项时，把这个值回传给后端
+      }
+
+      BattleType battle_type = 1;
+      repeated BattleData battle_datas = 2;
+    }
+
+    int32 player = 1;                   // 玩家编号
+    repeated BattleCmd battle_cmds = 2; // 可操作的命令
+    bool enable_m2 = 3;                 // 是否可以进入M2阶段
+    bool enable_ep = 4;                 // 是否可以结束回合
+  }
+
   oneof gameMsg {
     MsgStart start = 1;
     MsgDraw draw = 2;
@@ -481,5 +510,6 @@ message StocGameMessage {
     MsgSelectPosition select_position = 12;
     MsgSelectOption select_option = 13;
     MsgShuffleHand shuffle_hand = 14;
+    MsgSelectBattleCmd select_battle_cmd = 15;
   }
 }