Merge branch 'develop' of http://8.134.253.64:3000/huangjinghao/FishConfig into develop

# Conflicts:
#	GameConfig/M_equipment.xls
#	GameConfig/M_i18n.xls
#	GameConfig/M_monster.xls

GameConfig/A_New_BuildAll.bat

@@ -13,6 +13,10 @@ node copy.js ts\M_monster.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_skill.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_un_lock_battle.ts ..\..\game-client\assets\Script\Config
 node copy.js ts\M_item.ts ..\..\game-client\assets\Script\Config
+node copy.js ts\M_equipment.ts ..\..\game-client\assets\Script\Config
+node copy.js ts\M_everyday_task.ts ..\..\game-client\assets\Script\Config
+node copy.js ts\M_shop.ts ..\..\game-client\assets\Script\Config
+node copy.js ts\M_vip_config.ts ..\..\game-client\assets\Script\Config
 
 @echo off
 ::if "%nopause%" == "true" (@echo on) else (pause)

GameConfig/BuildServer.bat

@@ -1,7 +1,7 @@
 @echo off
 REM ===== 可配置选项 =====
 REM JSON 输出目标目录
-set JSON_TARGET=D:\project\game-framework\game-battle\src\main\resources\table
+set JSON_TARGET=D:\project\game-framework\game-business\src\main\resources\table
 REM 仅包含这些表（逗号分隔）。留空则包含所有表。
 set POJO_INCLUDE=
 REM 忽略这些表（逗号分隔）。留空则不忽略任何表。

GameConfig/CFG.check

@@ -1,17 +1,17 @@
 D:\git\newWork\Config\GameConfig\M_game_battle_field.xls:-1668593709
 D:\git\newWork\Config\GameConfig\M_monster.xls:-1235680395
-D:\git\newWork\Config\GameConfig\M_i18n.xls:675196421
+D:\git\newWork\Config\GameConfig\M_i18n.xls:-425323781
 D:\git\newWork\Config\GameConfig\M_un_lock_battle.xls:84348074
 D:\git\newWork\Config\GameConfig\M_everyday_task.xls:949185213
 D:\git\newWork\Config\GameConfig\M_vip_config.xls:1878630432
-D:\git\newWork\Config\GameConfig\M_equipment.xls:32694818
+D:\git\newWork\Config\GameConfig\M_equipment.xls:1485708483
 D:\git\newWork\Config\GameConfig\M_game_level_config.xls:-610292667
 D:\git\newWork\Config\GameConfig\M_magic_array_config.xls:-124973679
 D:\git\newWork\Config\GameConfig\M_shop.xls:81637466
-D:\git\newWork\Config\GameConfig\M_item.xls:1652899797
+D:\git\newWork\Config\GameConfig\M_item.xls:-1666295061
 D:\git\newWork\Config\GameConfig\M_fish_scheme.xls:435403286
 D:\git\newWork\Config\GameConfig\M_Global_Config.xls:-1360155821
 D:\git\newWork\Config\GameConfig\M_hero.xls:-1988414807
 D:\git\newWork\Config\GameConfig\SensitiveWordCFG.xls:-583314849
-D:\git\newWork\Config\GameConfig\M_skill.xls:1604621986
+D:\git\newWork\Config\GameConfig\M_skill.xls:1731087508
 D:\git\newWork\Config\GameConfig\M_test.xls:444037689

protocol/A_new_buildjson.bat

@@ -1 +1 @@
-pbjs -t json -w commonjs -o msg_mys.json ws_protocol.proto
+pbjs -t json -w commonjs -o msg_mys.json ws_common_request.proto ws_enter_game_request.proto ws_game_mode.proto ws_message_types.proto ws_protocol.proto ws_response.proto

protocol/msg_mys.json

@@ -2,601 +2,170 @@
     "package": "vip.metadev.module.battle.protobuf",
     "syntax": "proto2",
     "options": {
-        "java_outer_classname": "WsProtocol",
+        "java_outer_classname": "WebSocketResponseProto",
         "java_multiple_files": false
     },
     "messages": [
         {
-            "name": "WsEnvelope",
+            "name": "CommonRequest",
             "syntax": "proto2",
             "fields": [
                 {
                     "rule": "required",
                     "type": "string",
-                    "name": "type",
+                    "name": "session_id",
                     "id": 1
                 },
                 {
-                    "rule": "required",
+                    "rule": "optional",
                     "type": "string",
-                    "name": "message_id",
+                    "name": "token",
                     "id": 2
                 },
                 {
-                    "rule": "required",
+                    "rule": "optional",
                     "type": "string",
-                    "name": "session_id",
+                    "name": "client_version",
                     "id": 3
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "player_id",
+                    "name": "device_info",
                     "id": 4
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "scene_id",
+                    "name": "data",
                     "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "bytes",
-                    "name": "payload",
-                    "id": 6
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "client_version",
-                    "id": 7
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "device_info",
-                    "id": 8
                 }
             ]
         },
         {
-            "name": "WsError",
+            "name": "EnterGameRequest",
             "syntax": "proto2",
             "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "error_code",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "error_message",
-                    "id": 2
-                }
-            ]
-        },
-        {
-            "name": "WsHeartbeat",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "heartbeat_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "client_timestamp",
-                    "id": 2
-                },
                 {
                     "rule": "optional",
-                    "type": "int64",
-                    "name": "server_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsConnectionAck",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "status",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "message",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "server_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsAuthentication",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "token",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "auth_timestamp",
-                    "id": 3
-                }
-            ]
-        },
-        {
-            "name": "WsAuthenticationResponse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "result",
-                    "id": 1
+                    "type": "WsMessageType",
+                    "name": "message_type",
+                    "id": 1,
+                    "options": {
+                        "default": "GAME_JOIN"
+                    }
                 },
                 {
                     "rule": "required",
-                    "type": "string",
-                    "name": "message",
+                    "type": "GameMode",
+                    "name": "game_mode",
                     "id": 2
                 },
                 {
-                    "rule": "optional",
-                    "type": "PlayerInfo",
-                    "name": "player_info",
+                    "rule": "repeated",
+                    "type": "CommonRequest",
+                    "name": "envelope",
                     "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "auth_timestamp",
-                    "id": 4
                 }
             ]
         },
         {
-            "name": "PlayerInfo",
+            "name": "WebSocketResponse",
             "syntax": "proto2",
             "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "nickname",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "level",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "experience",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "vip_level",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "gold",
-                    "id": 6
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "diamond",
-                    "id": 7
-                },
                 {
                     "rule": "optional",
-                    "type": "string",
-                    "name": "avatar_url",
-                    "id": 8
-                },
-                {
-                    "rule": "required",
-                    "type": "bool",
-                    "name": "online",
-                    "id": 9
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "last_login_time",
-                    "id": 10
-                }
-            ]
-        },
-        {
-            "name": "WsGameStateUpdate",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_state",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "game_mode",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "current_round",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "total_rounds",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "game_time",
-                    "id": 6
-                }
-            ]
-        },
-        {
-            "name": "WsBattleAction",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "action_type",
+                    "type": "WsMessageType",
+                    "name": "message_type",
                     "id": 1
                 },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "action_id",
-                    "id": 2
-                },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "target_id",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "action_timestamp",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "WsBattleResult",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "battle_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "result",
+                    "name": "session_id",
                     "id": 2
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "winner_id",
-                    "id": 3
-                },
-                {
-                    "rule": "repeated",
-                    "type": "BattleReward",
-                    "name": "rewards",
-                    "id": 4
-                },
-                {
-                    "rule": "optional",
-                    "type": "BattleStats",
-                    "name": "battle_stats",
-                    "id": 5
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "battle_timestamp",
-                    "id": 6
-                }
-            ]
-        },
-        {
-            "name": "BattleReward",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "reward_type",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "reward_id",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "reward_amount",
+                    "name": "status",
                     "id": 3
                 },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "reward_description",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "BattleStats",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "total_damage",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "damage_taken",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "skills_used",
-                    "id": 3
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "items_used",
+                    "name": "error_code",
                     "id": 4
                 },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "battle_duration",
-                    "id": 5
-                }
-            ]
-        },
-        {
-            "name": "WsItemUse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "item_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "item_type",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "use_amount",
-                    "id": 3
-                },
                 {
                     "rule": "optional",
                     "type": "string",
-                    "name": "target_id",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "use_timestamp",
+                    "name": "error_message",
                     "id": 5
-                }
-            ]
-        },
-        {
-            "name": "WsSkillUse",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "skill_id",
-                    "id": 1
-                },
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "skill_name",
-                    "id": 2
-                },
-                {
-                    "rule": "required",
-                    "type": "int32",
-                    "name": "skill_level",
-                    "id": 3
                 },
                 {
                     "rule": "optional",
-                    "type": "string",
-                    "name": "target_id",
-                    "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "use_timestamp",
-                    "id": 5
+                    "type": "bytes",
+                    "name": "data",
+                    "id": 6
                 }
             ]
-        },
+        }
+    ],
+    "enums": [
         {
-            "name": "WsSystemNotification",
+            "name": "GameMode",
             "syntax": "proto2",
-            "fields": [
+            "values": [
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "notification_type",
+                    "name": "STORY_MODE",
                     "id": 1
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "title",
+                    "name": "ENDLESS_NOVICE",
                     "id": 2
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "content",
+                    "name": "ENDLESS_INTERMEDIATE",
                     "id": 3
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "priority",
+                    "name": "ENDLESS_ADVANCED",
                     "id": 4
-                },
-                {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "notification_timestamp",
-                    "id": 5
                 }
             ]
         },
         {
-            "name": "WsPlayerStateUpdate",
+            "name": "WsMessageType",
             "syntax": "proto2",
-            "fields": [
+            "values": [
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "player_id",
-                    "id": 1
+                    "name": "UNKNOWN",
+                    "id": 0
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "state_type",
-                    "id": 2
-                },
-                {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "state_description",
-                    "id": 3
+                    "name": "CONNECTION_ACK",
+                    "id": 1000
                 },
                 {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "state_timestamp",
-                    "id": 4
-                }
-            ]
-        },
-        {
-            "name": "WsSceneChange",
-            "syntax": "proto2",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_id",
-                    "id": 1
+                    "name": "HEARTBEAT",
+                    "id": 1001
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_name",
-                    "id": 2
+                    "name": "AUTHENTICATION",
+                    "id": 1002
                 },
                 {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "scene_type",
-                    "id": 3
+                    "name": "AUTHENTICATION_RESPONSE",
+                    "id": 1003
                 },
                 {
-                    "rule": "optional",
-                    "type": "string",
-                    "name": "change_reason",
-                    "id": 4
+                    "name": "ERROR",
+                    "id": 1004
                 },
                 {
-                    "rule": "required",
-                    "type": "int64",
-                    "name": "change_timestamp",
-                    "id": 5
+                    "name": "GAME_JOIN",
+                    "id": 2000
                 }
             ]
         }

protocol/ws_common.proto

@@ -0,0 +1,14 @@
+syntax = "proto2";
+package vip.metadev.module.battle.protobuf;
+
+option java_outer_classname = "WsCommonProto";
+option java_multiple_files = false;
+
+// WebSocket 消息信封 - 公共必传参数集
+message CommonRequest {
+    required string session_id = 1;              // 会话ID
+    required string token = 2;                   // 玩家token
+    optional string client_version = 3;          // 客户端版本
+    optional string device_info = 4;             // 设备信息
+    optional string data = 5;                    // 存储json类型的参数值
+} 

protocol/ws_common_response.proto

@@ -0,0 +1,17 @@
+syntax = "proto2";
+
+package vip.metadev.module.battle.protobuf;
+option java_outer_classname = "CommonResponseProto";
+option java_multiple_files = false;
+// 导入消息类型枚举
+import "ws_message_types.proto";
+
+// 通用响应消息
+message CommonResponse {
+    optional WsMessageType message_type = 1;     // 消息类型
+    optional string session_id = 2;              // 会话ID
+    optional string status = 3;                  // 响应状态：success/error
+    optional string error_code = 4;              // 错误代码
+    optional string error_message = 5;           // 错误消息
+    optional string data = 6;                     // 响应数据（可以是protobuf消息或其他二进制数据）
+} 

protocol/ws_enter_game_request.proto

@@ -4,16 +4,17 @@ package vip.metadev.module.battle.protobuf;
 option java_outer_classname = "EnterGameRequestProto";
 option java_multiple_files = false;
 
-// 导入游戏模式枚举
-import "ws_game_mode.proto";
 // 导入消息类型枚举
 import "ws_message_types.proto";
 // 导入公共消息定义
 import "ws_common_request.proto";
 
+import "ws_common_response.proto";
+
 // 进入游戏请求消息
 message EnterGameRequest {
-    optional WsMessageType message_type = 1 [default = GAME_JOIN];     // 消息类型，使用枚举，默认为进入游戏
-    required GameMode game_mode = 2;    // 游戏模式
+    optional WsMessageType message_id = 1 [default = ENTER_GAME];     // 消息类型，使用枚举，默认为进入游戏
+    required string game_mode = 2;    // 游戏模式
     repeated CommonRequest envelope = 3;     // 公共必传参数集
-} 
+}
+

protocol/ws_message_types.proto

@@ -15,5 +15,6 @@ enum WsMessageType {
     ERROR = 1004;                   // 错误消息
     
     // 游戏相关消息类型 (2000-2999)
-    GAME_JOIN = 2000;               // 进入游戏
+    ENTER_GAME = 2000;               // 进入游戏
+    CHOOSE_MAGIC_ARRAY=2001;         //选择魔法阵
 }