新增邮件协议

proto-lib/all_socket.lua

@@ -1,10 +1,11 @@
 -- 服务端热更新使用
 -- 协议最大ID 32766
 package.loaded[PROTO_ROOT .. "proto-lib.proto_socket"] = nil
-package.loaded[PROTO_ROOT .. "proto-lib.proto_user"] = nil
-package.loaded[PROTO_ROOT .. "proto-lib.proto_bag"] = nil
-package.loaded[PROTO_ROOT .. "proto-lib.proto_test"] = nil
-package.loaded[PROTO_ROOT .. "proto-lib.proto_shop"] = nil
+package.loaded[PROTO_ROOT .. "proto-lib.proto_user"] = nil -- 2000
+package.loaded[PROTO_ROOT .. "proto-lib.proto_bag"] = nil -- 2100
+package.loaded[PROTO_ROOT .. "proto-lib.proto_test"] = nil -- 2200
+package.loaded[PROTO_ROOT .. "proto-lib.proto_shop"] = nil -- 2300
+package.loaded[PROTO_ROOT .. "proto-lib.proto_mail"] = nil -- 2400
 
 -- 其他协议
 -- proto-lib.proto_http -- 31000~31999
@@ -15,18 +16,21 @@ local proto_user = require(PROTO_ROOT .. "proto-lib.proto_user")
 local proto_bag = require(PROTO_ROOT .. "proto-lib.proto_bag")
 local proto_test = require(PROTO_ROOT .. "proto-lib.proto_test")
 local proto_shop = require(PROTO_ROOT .. "proto-lib.proto_shop")
+local proto_mail = require(PROTO_ROOT .. "proto-lib.proto_mail")
 
 local c2s = proto_socket.c2s
 c2s = c2s .. proto_user.c2s
 c2s = c2s .. proto_bag.c2s
 c2s = c2s .. proto_test.c2s
 c2s = c2s .. proto_shop.c2s
+c2s = c2s .. proto_mail.c2s
 
 local s2c = proto_socket.s2c
 s2c = s2c .. proto_user.s2c
 s2c = s2c .. proto_bag.s2c
 s2c = s2c .. proto_test.s2c
 s2c = s2c .. proto_shop.s2c
+s2c = s2c .. proto_mail.s2c
 
 local proto = {
     c2s = c2s,

proto-lib/proto_bag.lua

@@ -7,7 +7,7 @@ local proto_c2s =
     [[
 
     # 获取背包信息
-    bag_get_info 5000 {
+    bag_get_info 2100 {
         request {
         }
         response {
@@ -20,7 +20,7 @@ local proto_c2s =
 local proto_s2c =
     [[
     # 玩家当前物品
-    on_user_items 5000 {
+    on_user_items 2100 {
         request {
             items 0: *DataItemBag
         }

proto-lib/proto_mail.lua

@@ -0,0 +1,78 @@
+local proto_struct =
+    [[
+        # 邮件信息
+        .DataMail {
+            id 0: integer               # 邮件ID
+            title 1: string             # 邮件标题
+            cnt 2: string               # 邮件内容
+            ty 3: integer               # 邮件类型 1:GM邮件
+            createTime 4: integer       # 创建时间
+            expireTime 5: integer       # 过期时间
+            status 6: integer           # 邮件状态 0:未读 1:已读 2:删除
+            items 7: *DataItem          # 物品
+            statusItems 8: integer      # 物品状态 0:未领取 1:已领取
+        }
+]]
+
+local proto_c2s =
+    [[
+        # 获取邮件信息列表
+        mail_get_info 2400 {
+            request {
+                lastTime 0: integer         # 上次获取用户消息时间戳 非必要 空:0
+            }
+            response {
+                code 0: integer
+                mailList 1: *DataMail       # 邮件信息列表
+                sysTime 2: integer          # 系统时间
+            }
+        }
+
+        # 获取邮件奖励
+        mail_get_award 2401 {
+            request {
+                idList 0: *integer          # 邮件ID列表
+            }
+            response {
+                code 0: integer
+                items 1: *DataItem
+            }
+        }
+
+        # 读取
+        mail_read 2402 {
+            request {
+                idList 0: *integer          # 邮件ID列表
+            }
+            response {
+                code 0: integer
+            }
+        }
+
+        # 删除
+        mail_del 2403 {
+            request {
+                idList 0: *integer          # 邮件ID列表
+            }
+            response {
+                code 0: integer
+            }
+        }
+]]
+
+local proto_s2c =
+    [[
+        # 新邮件提醒
+        on_new_mail 2400 {
+            request {
+                id 0: integer               # 新增邮件ID
+            }
+        }
+]]
+
+local proto = {
+    c2s = proto_struct .. proto_c2s,
+    s2c = proto_struct .. proto_s2c
+}
+
+return proto

proto-lib/proto_shop.lua

@@ -6,7 +6,7 @@ local proto_struct = [[
 local proto_c2s =
     [[
     # 代币购买商品
-    shop_buy_goods 2100 {
+    shop_buy_goods 2300 {
         request {
             goodsId 0: integer              # 商品ID
             count 1: integer                # 购买数量,空则为1
@@ -17,7 +17,7 @@ local proto_c2s =
     }
 
     # 轮询订单结果
-    shop_get_order 2101 {
+    shop_get_order 2301 {
         request {
             orderId 0: string               # 订单ID
         }
@@ -28,7 +28,7 @@ local proto_c2s =
     }
 
     # 下单前 - 商品物品选择
-    shop_pre_order 2102 {
+    shop_pre_order 2302 {
         request {
             goodsId 0: integer              # 商品ID
             customItems 1: *DataItem        # 商品定制物品列表(数量与商品配置一致)
@@ -42,14 +42,14 @@ local proto_c2s =
 local proto_s2c =
     [[
     # 推送商城购买订单结果
-    on_shop_order 2100 {
+    on_shop_order 2300 {
         request {
             orderInfo 0: DataOrder      # 订单数据
         }
     }
 
     # 购买结果
-    on_shop_buy_goods 2302 {
+    on_shop_buy_goods 2301 {
         request {
             goodsId 0: integer              # 商品ID
             items 1: *DataItem              # 商品发放物品列表