Merge branch 'master' of 8.134.163.21:box/box-proto

code.lua

@@ -56,6 +56,13 @@ local code = {
         NOT_FOUND = 3300, -- 不存在
         EXIST = 3301 -- 已存在
     },
+    -- 兑换码
+    EXCHANGE_CODE = {
+        NOT_FOUND = 3400, -- 不存在
+        AWARD_NOT_MORE = 3401, -- 已领完
+        TIME_OUT = 3402, -- 活动结束
+        AWARDED = 3403 -- 已领取奖励
+    },
     ACTIVITY = {
         NOT_FOUND_DATA = 6001, -- 没有活动配置
         NOT_MORE_TIMES = 6002, -- 机会已用完

proto-lib/all_socket.lua

@@ -1,5 +1,11 @@
+--[[
+Descripttion:服务端热更新使用 - 协议最大ID 32766
+version:
+Author: Neo,Huang
+Date: 2023-11-16 21:46:39
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-19 23:05:11
+--]]
 package.loaded[PROTO_ROOT .. "proto-lib.proto_socket"] = nil
 package.loaded[PROTO_ROOT .. "proto-lib.proto_user"] = nil -- 2000
 package.loaded[PROTO_ROOT .. "proto-lib.proto_bag"] = nil -- 2100
@@ -8,7 +14,7 @@ package.loaded[PROTO_ROOT .. "proto-lib.proto_shop"] = nil -- 2300
 package.loaded[PROTO_ROOT .. "proto-lib.proto_mail"] = nil -- 2400
 package.loaded[PROTO_ROOT .. "proto-lib.proto_box"] = nil -- 2500
 package.loaded[PROTO_ROOT .. "proto-lib.proto_room"] = nil -- 2600
-package.loaded[PROTO_ROOT .. "proto-lib.proto_battle"] = nil -- 2600
+package.loaded[PROTO_ROOT .. "proto-lib.proto_exchange"] = nil -- 2700
 
 -- 其他协议
 -- proto-lib.proto_http -- 31000~31999
@@ -22,7 +28,7 @@ local proto_shop = require(PROTO_ROOT .. "proto-lib.proto_shop")
 local proto_mail = require(PROTO_ROOT .. "proto-lib.proto_mail")
 local proto_box = require(PROTO_ROOT .. "proto-lib.proto_box")
 local proto_room = require(PROTO_ROOT .. "proto-lib.proto_room")
-local proto_battle = require(PROTO_ROOT .. "proto-lib.proto_battle")
+local proto_exchange = require(PROTO_ROOT .. "proto-lib.proto_exchange")
 
 local c2s = proto_socket.c2s
 c2s = c2s .. proto_user.c2s
@@ -32,7 +38,7 @@ c2s = c2s .. proto_shop.c2s
 c2s = c2s .. proto_mail.c2s
 c2s = c2s .. proto_box.c2s
 c2s = c2s .. proto_room.c2s
-c2s = c2s .. proto_battle.c2s
+c2s = c2s .. proto_exchange.c2s
 
 local s2c = proto_socket.s2c
 s2c = s2c .. proto_user.s2c
@@ -42,7 +48,7 @@ s2c = s2c .. proto_shop.s2c
 s2c = s2c .. proto_mail.s2c
 s2c = s2c .. proto_box.s2c
 s2c = s2c .. proto_room.s2c
-s2c = s2c .. proto_battle.s2c
+s2c = s2c .. proto_exchange.s2c
 
 local proto = {
     c2s = c2s,

proto-lib/proto_bag.lua

@@ -1,6 +1,20 @@
-
-local proto_struct = [[
+--[[
+Descripttion:背包
+version:
+Author: Neo,Huang
+Date: 2023-11-15 22:34:08
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-19 20:43:33
+--]]
+local proto_struct =
+    [[
+    # 资源更新信息
+    .DataItemUpdate {
+        id 0: integer                       # 物品id
+        count 1: integer                    # 物品当前数量
+        deltaCount 2: integer               # 物品变化量
+        bid 3: integer                      # 物品在背包的id
+    }
 ]]
 
 local proto_c2s =
@@ -14,7 +28,7 @@ local proto_c2s =
             items 1: *DataItemBag       # 物品列表
         }
     }
-    
+
     # 分解
     bag_exchange 2101 {
         request {
@@ -25,7 +39,7 @@ local proto_c2s =
             goldCount 1: integer        # 分解后获得金币数量
         }
     }
-    
+
     # 提取
     bag_draw 2102 {
         request {
@@ -42,7 +56,8 @@ local proto_s2c =
     # 玩家当前物品
     on_user_items 2100 {
         request {
-            items 0: *DataItemBag
+            items 0: *DataItemUpdate    # 道具变化列表
+            reason 1: string            # 资源变化的途径
         }
     }
 ]]

proto-lib/proto_battle.lua

@@ -1,49 +0,0 @@
-local proto_struct = [[
-]]
-
-local proto_c2s =
-    [[
-    # 战斗信息
-    battle_get_info 2700 {
-        request {
-        }
-        response {
-            code 0: integer
-        }
-    }
-]]
-
-local proto_s2c =
-    [[
-        # 战斗信息
-        on_battle_info 2700 {
-            request {
-            }
-        }
-
-        # 开始战斗
-        on_battle_start 2701 {
-            request {
-            }
-        }
-        
-        # 战斗轮次
-        on_battle_round 2702 {
-            request {
-            }
-        }
-
-        # 战斗结算
-        on_battle_settle 2703 {
-            request {
-                winUid 1: integer                       # 胜利玩家ID
-            }
-        }
-]]
-
-local proto = {
-    c2s = proto_struct .. proto_c2s,
-    s2c = proto_struct .. proto_s2c
-}
-
-return proto

proto-lib/proto_exchange.lua

@@ -0,0 +1,49 @@
+--[[
+Descripttion:兑换码
+version:
+Author: Neo,Huang
+Date: 2023-11-19 22:55:19
+LastEditors: Neo,Huang
+LastEditTime: 2023-11-19 22:56:48
+--]]
+local proto_struct =
+    [[
+    # 兑换记录
+    .DataExchangeRecord {
+        playerInfo 0: DataUserBaseInfo      # 玩家信息
+        items 1: *DataItem                  # 兑换奖励物品列表
+    }
+]]
+
+local proto_c2s =
+    [[
+        # 模块信息
+        exchange_get_info 2700 {
+            request {
+            }
+            response {
+                code 0: integer
+                records 1: *DataExchangeRecord  # 兑换记录
+            }
+        }
+        # 领取
+        exchange_get_award 2701 {
+            request {
+                pCode 0: string                 # 兑换码
+            }
+            response {
+                code 0: integer
+                items 1: *DataItem              # 领取物品列表
+            }
+        }
+]]
+
+local proto_s2c = [[
+]]
+
+local proto = {
+    c2s = proto_struct .. proto_c2s,
+    s2c = proto_struct .. proto_s2c
+}
+
+return proto

proto-lib/proto_room.lua

@@ -10,11 +10,12 @@ local proto_struct =
     # 房间信息
     .DataRoom {
         roomId 0: integer                   # 房间号
-        playCount 1:integer                 # 战斗人数
+        playCount 1:integer                 # 战斗人数 - 历史战绩无此字段
         battleBoxList 2: *integer           # 战斗箱子ID列表
-        playerList 3: *DataRoomPlayer       # 房间玩家列表
+        playerList 3: *DataRoomPlayer       # 房间玩家列表 - 历史战绩仅保留战斗玩家
         status 4: integer                   # 房间状态 0:等待中 1:进行中 2:结束
         createTime 5: integer               # 创建时间
+        battleTime 6: integer               # 战斗开始时间
     }
 
     # 射击结果
@@ -25,14 +26,27 @@ local proto_struct =
     # 战斗玩家
     .DataBattlePlayer {
         uid 0: integer                      # 玩家ID
-        shotList 1: *DataBattleShot         # 射击结果列表
+        seatId 1: integer                   # 座位ID
+        shotList 2: *DataBattleShot         # 射击结果列表
     }
-    # 战斗记录
-    .DataBattleRecord {
-        roomInfo 0: DataRoom
-        battleId 1: string
-        winUid 2: integer
-        battlePlayerList 3: *DataBattlePlayer   # 战斗玩家列表
+
+    # 战斗 - 玩家掉落
+    .DataBattlePlayerShot {
+        uid 0: integer                      # 玩家ID
+        shot 1: DataBattleShot              # 射击结果
+    }
+    # 战斗 - 轮次信息
+    .DataBattleRound {
+        round 0: integer                    # 轮次
+        shotList 1: *DataBattlePlayerShot   # 玩家射击列表
+    }
+    # 战斗 - 结算
+    .DataBattleSettle {
+        roomInfo 0: DataRoom                # 房间信息
+        battleId 1: string                  # 战斗编号
+        winUid 2: integer                   # 胜利玩家ID
+        rounds 3: *DataBattleRound          # 战斗轮次列表 - 历史战绩没有该字段
+        battlePlayerList 4: *DataBattlePlayer   # 战斗玩家列表
     }
 ]]
 
@@ -107,23 +121,35 @@ local proto_c2s =
             }
         }
 
-        # 获取房间对战记录列表
+        # 获取房间对战记录列表 - 每次请求返回20条
         room_get_record_list 2620 {
-         request {
+            request {
+                lastTime 0: integer         # 上次拉记录battleTime最小值
+            }
+            response {
+                code 0: integer             # 返回结果码
+                list 1: *DataBattleSettle   # 房间对战记录列表
+            }
+        }
+
+        # 获取玩家个人对战记录 - 每次请求返回20条
+        room_get_player_record_list 2621 {
+            request {
+                lastTime 0: integer         # 上次拉记录battleTime最小值
             }
             response {
                 code 0: integer             # 返回结果码
-                list 1: *DataBattleRecord   # 房间对战记录列表
+                list 1: *DataBattleSettle   # 房间对战记录列表
             }
         }
 
-        # 获取房间对战记录列表
-        room_get_brilliant_record_list 2621 {
-         request {
+        # 获取精彩对战记录列表 - 仅返回当前最近20(配置)条记录
+        room_get_brilliant_record_list 2622 {
+            request {
             }
             response {
                 code 0: integer             # 返回结果码
-                list 1: *DataBattleRecord   # 房间对战记录列表
+                list 1: *DataBattleSettle   # 房间对战记录列表
             }
         }
 ]]
@@ -152,13 +178,20 @@ local proto_s2c =
                 changeRoomPlayer 2: *DataRoomPlayer # 变化的房间成员
             }
         }
-        
+
         # 坐下房间位置结果
         on_room_seat_down 2603 {
             request {
                 code 0: integer             # 错误码
             }
         }
+
+        # 比赛结算
+        on_room_battle_settle 2604 {
+            request {
+                settle 0: DataBattleSettle
+            }
+        }
 ]]
 
 local proto = {