新增商店协议/调试协议

proto-lib/all_socket.lua

@@ -1,9 +1,10 @@
 -- 服务端热更新使用
 -- 协议最大ID 32766
-package.loaded[PROTO_ROOT .. "proto-lib.proto_socket"] = nil -- 1000~1999
-package.loaded[PROTO_ROOT .. "proto-lib.proto_user"] = nil -- 2000~2999
-package.loaded[PROTO_ROOT .. "proto-lib.proto_bag"] = nil -- 5000~5999
-package.loaded[PROTO_ROOT .. "proto-lib.proto_test"] = nil -- 9000~9999
+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
 
 -- 其他协议
 -- proto-lib.proto_http -- 31000~31999
@@ -13,16 +14,19 @@ local proto_socket = require(PROTO_ROOT .. "proto-lib.proto_socket")
 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 c2s = proto_socket.c2s
 c2s = c2s .. proto_user.c2s
 c2s = c2s .. proto_bag.c2s
 c2s = c2s .. proto_test.c2s
+c2s = c2s .. proto_shop.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
 
 local proto = {
     c2s = c2s,

proto-lib/proto_shop.lua

@@ -0,0 +1,66 @@
+-- 商品相关协议 2100~2199
+
+local proto_struct = [[
+]]
+
+local proto_c2s =
+    [[
+    # 代币购买商品
+    shop_buy_goods 2100 {
+        request {
+            goodsId 0: integer              # 商品ID
+            count 1: integer                # 购买数量,空则为1
+        }
+        response {
+            code 0: integer
+        }
+    }
+
+    # 轮询订单结果
+    shop_get_order 2101 {
+        request {
+            orderId 0: string               # 订单ID
+        }
+        response {
+            code 0: integer
+            orderInfo 1: DataOrder          # 订单结果
+        }
+    }
+
+    # 下单前 - 商品物品选择
+    shop_pre_order 2102 {
+        request {
+            goodsId 0: integer              # 商品ID
+            customItems 1: *DataItem        # 商品定制物品列表(数量与商品配置一致)
+        }
+        response {
+            code 0: integer
+        }
+    }
+]]
+
+local proto_s2c =
+    [[
+    # 推送商城购买订单结果
+    on_shop_order 2100 {
+        request {
+            orderInfo 0: DataOrder      # 订单数据
+        }
+    }
+
+    # 购买结果
+    on_shop_buy_goods 2302 {
+        request {
+            goodsId 0: integer              # 商品ID
+            items 1: *DataItem              # 商品发放物品列表
+            giftItems 2: *DataItem          # 赠送发放物品列表
+        }
+    }
+]]
+
+local proto = {
+    c2s = proto_struct .. proto_c2s,
+    s2c = proto_struct .. proto_s2c
+}
+
+return proto

proto-lib/proto_struct.lua

@@ -25,6 +25,19 @@ local proto_struct =
         registerVersion 5: string       # 注册版本
         activeDays 6: integer           # 活跃天数
     }
+    
+    # 订单信息
+    .DataOrder {
+        status 0: integer               # 订单状态, 1表示成功!
+        orderId 1: string               # 订单ID
+        gid 2: integer                  # 商品ID
+        items 3: *DataItem              # 商品发放物品列表
+        giftItems 4: *DataItem          # 赠送发放物品列表
+        errMsg 5: string                # 失败原因字符串！
+        payName 6: string               # SDK支付名称 比如:cmpay
+        errCode 7: string               # SDK支付方回调错误码, 可能有，可能没有
+        amount 8: integer               # 实际订单金额，单位分，要转字符串
+    }
 ]]
 
 return proto_struct

proto-lib/proto_test.lua

@@ -1,8 +1,47 @@
+-- 测试工具相关协议 2200~2299
 local proto_struct = [[
 ]]
 
-local proto_c2s = [[
+local proto_c2s =
+    [[
+        # 玩家修改个人系统时间GM
+        test_debug_system_time 2200 {
+            request {
+                uid 0: integer
+                time 1: integer                 # 玩家修改的时间戳
+                reset 2: integer                # 是否重置,0（空）:重置,1:系统时间,2:设置注册时间,3:退出标准时间
+            }
+            response {
+                code 0: integer                 # 返回码
+                sysTime 1: integer              # 服务器时间
+                debugTime 2: integer            # 调试时间（固定）
+            }
+        }
+
+        #请求给玩家增减物品GM
+        test_add_items 2201 {
+            request {
+                uid 0: integer
+                items 1: *DataItem              # 物品列表
+            }
+            response {
+                code 0: integer
+            }
+        }
+
+        # 测试支付接口
+        test_pay_goods 2202 {
+            request {
+                orderId 0: string               # 订单号 时间戳_渠道_玩家ID_商品ID
+                payName 1: string               # 支付名称wxpay cmpay...
+                status 2: boolean               # 订单成功 true, 失败 false
+                resMsg 3: string                # 订单状态解释
+                amount 4: integer               # 实际订单金额，单位分
+            }
+            response {
+                code 0: integer                 #
+            }
+        }
 ]]
 
 local proto_s2c = [[