Merge pull request #26 from manfred-z6/dev

Modified CopyInfo and GameServer

Author: AbaAba0205

dependency/proto/Message2Clients.proto

@@ -11,10 +11,10 @@ message MessageOfCharacter
     int64 team_id = 2;
     int64 player_id = 3;
 
-    CharacterType character_type = 4;
+    protobuf.CharacterType character_type = 4;
 
     // 主动状态
-    CharacterState character_active_state = 5;
+    protobuf.CharacterState character_active_state = 5;
 
     // 位置
     int32 x = 6;
@@ -36,17 +36,18 @@ message MessageOfCharacter
 }
 
 
-message MessageOfMaterialResource
+message MessageOfResource
 {
-    MaterialResourceState material_resource_state = 1;
+    protobuf.ResourceType resource_type = 1;
+    protobuf.ResourceState resource_state = 2;
 
-    int32 x = 2;
-    int32 y = 3;
+    int32 x = 3;
+    int32 y = 4;
 
-    int32 remaining_amount = 4; // 采集进度 等价于血量
+    int32 remaining_amount = 5; // 采集进度 等价于血量
 
-    int32 id = 5;
-    int32 max_amount = 6;
+    int32 id = 6;
+    int32 max_amount = 7;
 }
 
 message MessageOfMap
@@ -64,38 +65,57 @@ message MessageOfTeam
 {
     int64 team_id = 1;
     int64 player_id = 2;
-    int64 score = 3;
-    int64 energy = 4;
-//    int64 guid=5;
+    int32 score = 3;
+    int32 material = 4;
+    int32 compute_power = 5;
 }
 
 message MessageOfFactory
 {
     int64 factory_id = 1;
     int64 team_id = 2;
+
     int32 x = 3;
     int32 y = 4;
+
     int32 hp = 5;
-    message ProductStack
+    int32 robust = 6;
+
+    int32 storage = 7;
+    int32 efficiency = 8;
+
+    int64 source = 9;
+    int64 computing_power = 10;
+
+    bool can_produce = 11;
+    bool can_recruit = 12;
+
+    message GoodsStack
     {
-        int32 product_type = 1;
+        protobuf.GoodsType product_type = 1;
         int32 quantity = 2;
     }
-    repeated ProductStack product_inventory = 6; //
-    int32 producing_line_count = 7; // 生产线数量
+
+    repeated GoodsStack product_inventory = 13;
+
 }
 
 message MessageOfMarket
 {
     int64 market_id = 1;
+
     int32 x = 2;
     int32 y = 3;
-    bool high_value = 4; // 是否为高额市场
+
+    protobuf.MarketType market_type = 4;
+
     message PriceEntry
     {
-        ProductType product_type = 1;
+        protobuf.GoodsType goods_type = 1;
         int32 price = 2;
+        int32 traded_quantity = 3;
     }
+
     repeated PriceEntry price_list = 5;
 }
 
@@ -108,33 +128,74 @@ message MessageOfComputeCenter
     int32 occupy_progress = 5; // 占领进度
 }
 
+message MessageOfBarrier
+{
+    int64 barrier_id = 1;
+    int32 x = 2;
+    int32 y = 3;
+}
+
+message MessageOfBush
+{
+    int64 bush_id = 1;
+    int32 x = 2;
+    int32 y = 3;
+    int32 radius = 4;
+}
+
+// 智慧大脑事件 
+message GlobalAIEvent {
+    int64 event_id = 1;
+    int64 trigger_time_ms = 2;
+    protobuf.AIEventCategory category = 3;
+    string title = 4;
+    string description = 5;
+}
+
+// 世界修正
+message AIWorldEffect {
+    int64 event_id = 1;
+    int64 duration_ms = 2;
+
+    repeated ProductPriceModifier price_modifiers = 3;
+    repeated CharacterAttributeModifier character_modifiers = 4;
+    repeated TaskTimeModifier task_modifiers = 5;
+}
+
+message ProductPriceModifier {
+    protobuf.GoodsType goods_type = 1;
+    double multiplier = 2;
+}
+
+message CharacterAttributeModifier {
+    protobuf.CharacterType character_type = 1;
+    double speed_multiplier = 2;
+    double damage_multiplier = 3;
+    double hp_multiplier = 4;
+}
+
+message TaskTimeModifier {
+    protobuf.TaskType task_type = 1;
+    double time_multiplier = 2;
+}
+
 message MessageOfObj
 {
     oneof message_of_obj
     {
-        MessageOfCharacter character_message = 1;
-        MessageOfMaterialResource material_resource_message= 2;
-        MessageOfMap map_message = 3;
-        MessageOfNews news_message = 4;
-        MessageOfTeam team_message = 5;
-        MessageOfFactory factory_message = 6;
-        MessageOfMarket market_message = 7;
-        MessageOfComputeCenter compute_center_message = 8;
-        MessageOfAIEvent ai_event_message = 9;      //服务器推送的AI事件/建议
+        MessageOfFactory factory_message = 1;
+        MessageOfCharacter character_message = 2;
+        MessageOfResource resource_message= 3;
+        MessageOfMarket market_message = 4;
+        MessageOfComputeCenter compute_center_message = 5;
+        MessageOfMap map_message = 6;
+        MessageOfNews news_message = 7;
+        MessageOfTeam team_message = 8;
+        MessageOfBarrier barrier_message = 9;
+        MessageOfBush bush_message = 10;
     }
 }
 
-// 智慧大脑事件 
-message MessageOfAIEvent
-{
-    int64 team_id = 1;
-    int64 from_character_id = 2;    // 触发来源（可选）
-    AIEventType event_type = 3;       // 事件类型
-    string description = 4;      // 人类可读说明
-    string plan_json = 5;        // 结构化计划（JSON），客户端可以解析执行
-    int64 timestamp_ms = 6;     // 事件触发时间（ms），便于回放
-    int64 event_id = 7;         // 事件id, 便于追踪
-}
 
 message MessageOfAll
     {
@@ -154,12 +215,16 @@ message MessageOfAll
 message MessageToClient
 {
     repeated MessageOfObj obj_message = 1;
-    GameState game_state = 2;
+    protobuf.GameState game_state = 2;
     protobuf.GameMode game_mode = 3;
     MessageOfAll all_message = 4;
-    // MessageGameConfig config = 5; // 可用于下发对局参数
+
+    GlobalAIEvent ai_event = 5;
+    AIWorldEffect ai_effect = 6;
+
 }
 
+
 message MoveRes // 如果打算设计撞墙保留平行速度分量，且需要返回值则可用这个（大概没啥用）
 {
     int64 actual_speed = 1;
@@ -199,6 +264,7 @@ message MessageOfNews
     int64 to_id = 4;
     int64 team_id = 5;
 }
+
 // message MsgRes // 用于获取队友发来的消息
 // {
 //     bool have_message = 1; // 是否有待接收的消息

dependency/proto/Message2Server.proto

@@ -22,7 +22,7 @@ message RegisterFactoryMsg
     int32 side_flag = 5; // 客户端希望的阵营标识
 }
 
-message CreatCharacterMsg
+message CreateCharacterMsg
 {
     CharacterType character_type = 1;
     int64 team_id = 2;
@@ -89,13 +89,13 @@ message RecoverMsg
 
 message RepairFactory
 {
-    int32 character_id = 1;
-    int32 team_id = 2;
+    int64 character_id = 1;
+    int64 team_id = 2;
 }
 
-message ProduceProductMeg
+message ProduceGoodsMeg
 {
-    ProductType product_type = 1;
+    GoodsType product_type = 1;
     int64 team_id = 2;
     int32 max_produce_num = 3;
 }
@@ -126,30 +126,31 @@ message SellMeg
 
 
 // 智慧大脑相关
-message AskAIRequest
+message StrategicAIRequest 
 {
     int64 team_id = 1;
-    int64 character_id = 2;      
-    string model = 3;          // 模型标识
-    string prompt = 4;         // 自然语言提示
-    int32 timeout_ms = 5;      // 超时时间
-    bool prefer_structured = 6; // 是否优先返回结构化计划
+    int64 current_game_time = 2;
 }
 
-message AIAction
+message StrategicAIResponse 
 {
-    AIActionType type = 1;
-    int64 character_id = 2;       // 执行者 
-    string target = 3;        // 目标说明
-    string payload_json = 4;  // 额外参数（JSON）
-    int64 eta_ms = 5;         // 建议在多少毫秒后执行
+    bool act_success = 1;
+    repeated ProductionSuggestion production_plan = 2;
+    repeated TaskSuggestion task_plan = 3;
+    string explanation = 4;
 }
 
-message AskAIResponse
+message ProductionSuggestion 
 {
-    bool act_success = 1;
-    string answer_text = 2;   // 自然语言回答
-    string plan_json = 3;     // 结构化计划（JSON），便于引擎解析执行
-    repeated AIAction actions = 4; // 可直接执行的动作列表（结构化）
-    string error_msg = 5; //
+    GoodsType product_type = 1;
+    int32 quantity = 2;
+}
+
+message TaskSuggestion 
+{
+    AIActionType action_type = 1;
+    int64 character_id = 2;
+    int32 target_x = 3;
+    int32 target_y = 4;
+    int64 target_id = 5;
 }