上传代码

bin/json/game_askedrecruit.json

@@ -2,6 +2,7 @@
   {
     "key": 0,
     "type": 0,
+    "talkPoint": 0,
     "storyText": {
       "key": "drawcard_asked_storyText_1",
       "text": "（乌龟大师）：我在预兆中见过你的身影。"
@@ -18,6 +19,7 @@
   {
     "key": 1,
     "type": 1,
+    "talkPoint": 0,
     "storyText": {
       "key": "drawcard_asked_storyText_2",
       "text": "（乌龟大师）：孩子，你是追逐命运至此的勇士，还是身沐月光的传承之人？"
@@ -34,6 +36,7 @@
   {
     "key": 2,
     "type": 0,
+    "talkPoint": 1,
     "storyText": {
       "key": "drawcard_asked_storyText_3",
       "text": "（乌龟大师）：他决意召你前来"
@@ -50,6 +53,7 @@
   {
     "key": 3,
     "type": 0,
+    "talkPoint": 2,
     "storyText": {
       "key": "drawcard_asked_storyText_4",
       "text": "（乌龟大师）：却无法束缚你的言行。"
@@ -66,6 +70,7 @@
   {
     "key": 4,
     "type": 1,
+    "talkPoint": 0,
     "storyText": {
       "key": "drawcard_asked_storyText_5",
       "text": "（乌龟大师）：你如今身在阴影下，还是藏在月光中？"
@@ -82,6 +87,7 @@
   {
     "key": 5,
     "type": 0,
+    "talkPoint": 1,
     "storyText": {
       "key": "drawcard_asked_storyText_6",
       "text": "（乌龟大师）：黑暗终将吞没一切"
@@ -98,6 +104,7 @@
   {
     "key": 6,
     "type": 0,
+    "talkPoint": 2,
     "storyText": {
       "key": "drawcard_asked_storyText_7",
       "text": "（乌龟大师）：只留一线生机……"
@@ -114,6 +121,7 @@
   {
     "key": 7,
     "type": 1,
+    "talkPoint": 0,
     "storyText": {
       "key": "drawcard_asked_storyText_8",
       "text": "（乌龟大师）：你来见证终局，还是来博取这一线生机？"
@@ -130,6 +138,7 @@
   {
     "key": 8,
     "type": 0,
+    "talkPoint": 0,
     "storyText": {
       "key": "drawcard_asked_storyText_9",
       "text": "（乌龟大师）：有趣！"

bin/json/game_battleready.json

@@ -2986,5 +2986,40 @@
     "BlueAssistTeam": 0,
     "CanFriendHelp": 1,
     "Numrounds": 0
+  },
+  {
+    "id": 20111001,
+    "PlayType": 20,
+    "HeroCount": 5,
+    "readyScene": "scenesfight_role_interface_05",
+    "battleScenes": [
+      "scenesfight_07"
+    ],
+    "BGMusic": "",
+    "LoadingId": 0,
+    "HideAlienSpace": 0,
+    "HideFightUI": 0,
+    "RuleTips": {
+      "key": "",
+      "text": ""
+    },
+    "BattleTips": {
+      "key": "",
+      "text": ""
+    },
+    "battleEvents": [],
+    "ScoreGroupID": 0,
+    "disableAiCamera": 0,
+    "ChoseCamp": [],
+    "DisableCamp": [],
+    "DefaultHero": 0,
+    "ChoseHero": [],
+    "DisableHero": [],
+    "LockSlots": [],
+    "HeroCheck": [],
+    "RedAssistTeam": 0,
+    "BlueAssistTeam": 0,
+    "CanFriendHelp": 0,
+    "Numrounds": 0
   }
 ]

bin/json/game_catchbugstage.json

@@ -25,7 +25,8 @@
     "stageskill": {
       "key": "",
       "text": ""
-    }
+    },
+    "points": 4
   },
   {
     "id": 1002,
@@ -53,7 +54,8 @@
     "stageskill": {
       "key": "",
       "text": ""
-    }
+    },
+    "points": 5
   },
   {
     "id": 1003,
@@ -81,7 +83,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_3",
       "text": ""
-    }
+    },
+    "points": 6
   },
   {
     "id": 1004,
@@ -113,7 +116,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_4",
       "text": ""
-    }
+    },
+    "points": 7
   },
   {
     "id": 1005,
@@ -145,7 +149,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_5",
       "text": ""
-    }
+    },
+    "points": 8
   },
   {
     "id": 1006,
@@ -177,7 +182,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_6",
       "text": ""
-    }
+    },
+    "points": 9
   },
   {
     "id": 1007,
@@ -209,7 +215,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_7",
       "text": ""
-    }
+    },
+    "points": 10
   },
   {
     "id": 1008,
@@ -241,7 +248,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_8",
       "text": ""
-    }
+    },
+    "points": 11
   },
   {
     "id": 1009,
@@ -273,7 +281,8 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_9",
       "text": ""
-    }
+    },
+    "points": 12
   },
   {
     "id": 1010,
@@ -307,6 +316,7 @@
     "stageskill": {
       "key": "catchbugs_stage_stageskill_10",
       "text": ""
-    }
+    },
+    "points": 13
   }
 ]

bin/json/game_effect.json

@@ -27,8 +27,60 @@
     "key": "loading_loop",
     "path": "Effect/Scenario/effect_openshow_fly_tunnel_01.prefab"
   },
+  {
+    "key": "loading_screenshot",
+    "path": "Effect/Scene/Loading/effect_screeshot.prefab"
+  },
   {
     "key": "loading_blackScreen",
     "path": "Effect/Scene/Loading/effect_scene_load_blackScreen.prefab"
+  },
+  {
+    "key": "asked_talk_in",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_talk_01.prefab"
+  },
+  {
+    "key": "asked_option_talk_in",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_talk_02_1.prefab"
+  },
+  {
+    "key": "asked_option_talk_show",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_talk_02_2.prefab"
+  },
+  {
+    "key": "asked_option_talk_out",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_talk_02_3.prefab"
+  },
+  {
+    "key": "asked_option_left_in",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_1.prefab"
+  },
+  {
+    "key": "asked_option_left_show",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_2.prefab"
+  },
+  {
+    "key": "asked_option_left_out",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_red_3.prefab"
+  },
+  {
+    "key": "asked_option_right_in",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_1.prefab"
+  },
+  {
+    "key": "asked_option_right_show",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_2.prefab"
+  },
+  {
+    "key": "asked_option_right_out",
+    "path": "Effect/UI/Recruit/effect_ui_wendao_interface_choose01_bule_3.prefab"
+  },
+  {
+    "key": "effect_ui_baozha",
+    "path": "Spine/effect_ui_baozha.prefab"
+  },
+  {
+    "key": "gongjian",
+    "path": "Spine/gongjian.prefab"
   }
 ]

bin/json/game_initial.json

@@ -29,16 +29,6 @@
       }
     ]
   },
-  {
-    "index": "356",
-    "var": [
-      {
-        "a": "mts",
-        "t": "20030001",
-        "n": 3
-      }
-    ]
-  },
   {
     "index": "357",
     "var": [
@@ -59,16 +49,6 @@
       }
     ]
   },
-  {
-    "index": "359",
-    "var": [
-      {
-        "a": "mts",
-        "t": "20030002",
-        "n": 3
-      }
-    ]
-  },
   {
     "index": "360",
     "var": [

bin/json/game_item.json

@@ -346,7 +346,7 @@
     "id": "10000008",
     "name": {
       "key": "item_item_name_8",
-      "text": "初级经验丹"
+      "text": "初级月髓项链"
     },
     "usetype": 1,
     "color": 2,
@@ -372,11 +372,11 @@
     "img": "item_10000008",
     "intr": {
       "key": "item_item_intr_8",
-      "text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供250经验值。"
+      "text": "蕴含神秘力量的月髓项链，可以在守护者界面为守护者提供250经验值。"
     },
     "describe": {
       "key": "item_item_describe_8",
-      "text": "初级的经验丹，守护者的道路由此开启。"
+      "text": "初级的月髓项链，守护者的道路由此开启。"
     },
     "dialogue": {
       "key": "item_item_dialogue_8",
@@ -395,7 +395,7 @@
     "id": "10000009",
     "name": {
       "key": "item_item_name_9",
-      "text": "中级经验丹"
+      "text": "中级月髓项链"
     },
     "usetype": 1,
     "color": 3,
@@ -421,11 +421,11 @@
     "img": "item_10000009",
     "intr": {
       "key": "item_item_intr_9",
-      "text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供2000经验值。"
+      "text": "蕴含神秘力量的月髓项链，可以在守护者界面为守护者提供2000经验值。"
     },
     "describe": {
       "key": "item_item_describe_9",
-      "text": "中级的经验丹，通常给予那些战斗比较熟练的守护者。"
+      "text": "中级的月髓项链，通常给予那些战斗比较熟练的守护者。"
     },
     "dialogue": {
       "key": "item_item_dialogue_9",
@@ -444,7 +444,7 @@
     "id": "10000010",
     "name": {
       "key": "item_item_name_10",
-      "text": "高级经验丹"
+      "text": "高级月髓项链"
     },
     "usetype": 1,
     "color": 4,
@@ -470,11 +470,11 @@
     "img": "item_10000010",
     "intr": {
       "key": "item_item_intr_10",
-      "text": "蕴含神秘力量的经验丹，可以在守护者界面为守护者提供8000经验值。"
+      "text": "蕴含神秘力量的月髓项链，可以在守护者界面为守护者提供8000经验值。"
     },
     "describe": {
       "key": "item_item_describe_10",
-      "text": "高级的经验丹，常见于经历上千次战斗的守护者。"
+      "text": "高级的月髓项链，常见于经历上千次战斗的守护者。"
     },
     "dialogue": {
       "key": "item_item_dialogue_10",

bin/json/game_mainachievement.json

@@ -12,6 +12,11 @@
         "a": "item",
         "t": "10000008",
         "n": 10
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000008"
@@ -29,6 +34,11 @@
         "a": "item",
         "t": "10000008",
         "n": 10
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000008"
@@ -46,6 +56,11 @@
         "a": "item",
         "t": "10000009",
         "n": 5
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000009"
@@ -63,6 +78,11 @@
         "a": "item",
         "t": "10000009",
         "n": 5
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000009"
@@ -80,6 +100,11 @@
         "a": "item",
         "t": "10000009",
         "n": 10
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000009"
@@ -97,6 +122,11 @@
         "a": "item",
         "t": "10000009",
         "n": 10
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000009"
@@ -114,6 +144,11 @@
         "a": "item",
         "t": "10000001",
         "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000001"
@@ -131,6 +166,11 @@
         "a": "item",
         "t": "10000001",
         "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000001"
@@ -148,6 +188,11 @@
         "a": "item",
         "t": "10000001",
         "n": 1
+      },
+      {
+        "a": "item",
+        "t": "24011001",
+        "n": 50
       }
     ],
     "icon": "item_10000001"

bin/json/game_mainventure.json

@@ -15,10 +15,10 @@
     "pos": 1,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_2",
-      "text": "章节商店"
+      "text": "藏宝图"
     },
     "jumpidList": [
-      10063
+      10066
     ]
   },
   {
@@ -44,10 +44,10 @@
     "pos": 4,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_5",
-      "text": "捕羊大赛"
+      "text": "养成训练"
     },
     "jumpidList": [
-      10042
+      10045
     ]
   },
   {
@@ -55,10 +55,10 @@
     "pos": 5,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_6",
-      "text": "养成训练"
+      "text": "捕羊大赛"
     },
     "jumpidList": [
-      10045
+      10042
     ]
   },
   {
@@ -77,10 +77,10 @@
     "pos": 1,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_8",
-      "text": "章节商店"
+      "text": "藏宝图"
     },
     "jumpidList": [
-      10063
+      10066
     ]
   },
   {
@@ -137,10 +137,10 @@
     "pos": 1,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_14",
-      "text": "章节商店"
+      "text": "藏宝图"
     },
     "jumpidList": [
-      10063
+      10066
     ]
   },
   {
@@ -195,10 +195,10 @@
     "pos": 1,
     "venturetext": {
       "key": "mainchapter_main_venture_venturetext_20",
-      "text": "章节商店"
+      "text": "藏宝图"
     },
     "jumpidList": [
-      10063
+      10066
     ]
   },
   {

bin/json/game_opencond.json

@@ -1212,7 +1212,7 @@
     "main": [
       {
         "key": 3,
-        "param": 20050
+        "param": 20020
       }
     ],
     "wkqbx": 2,

bin/json/game_passcheck.json

@@ -1615,5 +1615,215 @@
         "n": 5
       }
     ]
+  },
+  {
+    "id": 50001,
+    "passcheck_type": 5,
+    "parameter": 5,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10001",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50002,
+    "passcheck_type": 5,
+    "parameter": 10,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10002",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50003,
+    "passcheck_type": 5,
+    "parameter": 15,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10003",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50004,
+    "passcheck_type": 5,
+    "parameter": 20,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10004",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50005,
+    "passcheck_type": 5,
+    "parameter": 25,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10005",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50006,
+    "passcheck_type": 5,
+    "parameter": 30,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10006",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50007,
+    "passcheck_type": 5,
+    "parameter": 35,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10007",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50008,
+    "passcheck_type": 5,
+    "parameter": 40,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10008",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50009,
+    "passcheck_type": 5,
+    "parameter": 45,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10009",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
+  },
+  {
+    "id": 50010,
+    "passcheck_type": 5,
+    "parameter": 50,
+    "unlock_text": {
+      "key": "passcheck_passcheck_unlock_text_10010",
+      "text": "{0}个地格"
+    },
+    "free_reward": {
+      "a": "attr",
+      "t": "diamond",
+      "n": 30
+    },
+    "pay_reward": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 300
+      }
+    ]
   }
 ]

bin/json/game_pricegroup.json

@@ -337,7 +337,7 @@
     "id": 29,
     "pricegroupId": 2001,
     "purchasemin": 8,
-    "purchasemax": 8,
+    "purchasemax": -1,
     "cost": [
       {
         "a": "attr",

bin/json/game_puggsyfight.json

@@ -9,7 +9,7 @@
       "key": "guild_guild_boss_boss_name_1",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       155005111,
@@ -30,7 +30,7 @@
       "key": "guild_guild_boss_boss_name_2",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       155007111,
@@ -51,7 +51,7 @@
       "key": "guild_guild_boss_boss_name_3",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       155006111,
@@ -72,7 +72,7 @@
       "key": "guild_guild_boss_boss_name_4",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       155005111,
@@ -93,7 +93,7 @@
       "key": "guild_guild_boss_boss_name_5",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       155005111,
@@ -114,7 +114,7 @@
       "key": "guild_guild_boss_boss_name_6",
       "text": "他是一名懦弱的战士"
     },
-    "BattleReadyID": 11706001,
+    "BattleReadyID": 20111001,
     "heroId": "33003",
     "skill": [
       125001111,

bin/json/game_tdweapon.json

@@ -13,14 +13,15 @@
     "sak": 20,
     "atk_speed": 200,
     "weapon_type": 1,
-    "bulletPrefab": "",
+    "bulletPrefab": "gongjian",
     "fly_speed": 10,
     "hitRange": 1,
     "hitNum": 0,
     "num": 0,
     "explosion_Range": 0,
     "catapult": 0,
-    "pro": 1000
+    "pro": 1000,
+    "explosion_effect": ""
   },
   {
     "id": 2,
@@ -34,16 +35,17 @@
       "text": "向前方射出一枚爆炎弹，碰到第一个敌人后会立刻爆炸造成范围伤害"
     },
     "sak": 50,
-    "atk_speed": 5000,
+    "atk_speed": 400,
     "weapon_type": 2,
-    "bulletPrefab": "",
+    "bulletPrefab": "gongjian",
     "fly_speed": 8,
     "hitRange": 1,
     "hitNum": 0,
     "num": 0,
     "explosion_Range": 3,
     "catapult": 0,
-    "pro": 1000
+    "pro": 1000,
+    "explosion_effect": "effect_ui_baozha"
   },
   {
     "id": 3,
@@ -57,15 +59,16 @@
       "text": "射出后可以穿透敌人的弹力球，会在敌人之间相互碰撞"
     },
     "sak": 15,
-    "atk_speed": 2000,
+    "atk_speed": 300,
     "weapon_type": 3,
-    "bulletPrefab": "",
+    "bulletPrefab": "gongjian",
     "fly_speed": 10,
     "hitRange": 1,
     "hitNum": 0,
     "num": 0,
     "explosion_Range": 0,
-    "catapult": 0,
+    "catapult": 1,
-    "pro": 1000
+    "pro": 1000,
+    "explosion_effect": ""
   }
 ]

bin/json/game_tdweaponrandom.json

@@ -2,66 +2,79 @@
   {
     "id": 1,
     "weapon_id": 1,
-    "skill_id": 1001
+    "skill_id": 1001,
+    "subSkill_id": []
   },
   {
     "id": 2,
     "weapon_id": 1,
-    "skill_id": 1002
+    "skill_id": 1002,
+    "subSkill_id": []
   },
   {
     "id": 3,
     "weapon_id": 1,
-    "skill_id": 1003
+    "skill_id": 1003,
+    "subSkill_id": []
   },
   {
     "id": 4,
     "weapon_id": 1,
-    "skill_id": 1004
+    "skill_id": 1004,
+    "subSkill_id": []
   },
   {
     "id": 5,
     "weapon_id": 1,
-    "skill_id": 1005
+    "skill_id": 1005,
+    "subSkill_id": []
   },
   {
     "id": 6,
     "weapon_id": 2,
-    "skill_id": 2001
+    "skill_id": 2001,
+    "subSkill_id": []
   },
   {
     "id": 7,
     "weapon_id": 2,
-    "skill_id": 2002
+    "skill_id": 2002,
+    "subSkill_id": []
   },
   {
     "id": 8,
     "weapon_id": 2,
-    "skill_id": 2003
+    "skill_id": 2003,
+    "subSkill_id": []
   },
   {
     "id": 9,
     "weapon_id": 2,
-    "skill_id": 2004
+    "skill_id": 2004,
+    "subSkill_id": []
   },
   {
     "id": 10,
     "weapon_id": 2,
-    "skill_id": 2005
+    "skill_id": 2005,
+    "subSkill_id": []
   },
   {
     "id": 11,
     "weapon_id": 3,
-    "skill_id": 3001
+    "skill_id": 3001,
+    "subSkill_id": []
   },
   {
     "id": 12,
     "weapon_id": 3,
-    "skill_id": 3002
+    "skill_id": 3002,
+    "subSkill_id": []
   },
   {
     "id": 13,
     "weapon_id": 3,
-    "skill_id": 3003
+    "skill_id": 3003,
+    "subSkill_id": []
   }
 ]

bin/json/game_tdweaponskill.json

@@ -10,6 +10,8 @@
       "key": "td_t_skill_describe_des1001",
       "text": "分裂+1"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       1
     ],
@@ -30,6 +32,8 @@
       "key": "td_t_skill_describe_des1002",
       "text": "击中目标后，对目标造成5%减速"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [],
     "value": [
       50
@@ -48,6 +52,8 @@
       "key": "td_t_skill_describe_des1003",
       "text": "伤害+10%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       2
     ],
@@ -68,6 +74,8 @@
       "key": "td_t_skill_describe_des1004",
       "text": "射击频率+10%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       4
     ],
@@ -88,6 +96,8 @@
       "key": "td_t_skill_describe_des1005",
       "text": "飞行速度+10%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       3
     ],
@@ -108,6 +118,8 @@
       "key": "td_t_skill_describe_des2001",
       "text": "所有武器伤害攻击力+5%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       20
     ],
@@ -128,6 +140,8 @@
       "key": "td_t_skill_describe_des2002",
       "text": "所有武器射击频率+5%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       22
     ],
@@ -148,6 +162,8 @@
       "key": "td_t_skill_describe_des2003",
       "text": "城墙生命值上限+5，并额外恢复5点生命值"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       42,
       41
@@ -170,6 +186,8 @@
       "key": "td_t_skill_describe_des2004",
       "text": "城墙生命值上限+10"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       42
     ],
@@ -190,6 +208,8 @@
       "key": "td_t_skill_describe_des2005",
       "text": "城墙恢复10点生命值"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       41
     ],
@@ -210,6 +230,8 @@
       "key": "td_t_skill_describe_des3001",
       "text": "{0}能够额外穿透1个怪物"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       1
     ],
@@ -230,6 +252,8 @@
       "key": "td_t_skill_describe_des3002",
       "text": "{0}爆炸范围+10%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       5
     ],
@@ -250,6 +274,8 @@
       "key": "td_t_skill_describe_des3003",
       "text": "{0}弹射次数+1"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       6
     ],
@@ -270,6 +296,8 @@
       "key": "td_t_skill_describe_des4001",
       "text": "所有武器伤害攻击力+5%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       20
     ],
@@ -290,6 +318,8 @@
       "key": "td_t_skill_describe_des4002",
       "text": "所有武器射击频率+5%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       22
     ],
@@ -310,6 +340,8 @@
       "key": "td_t_skill_describe_des4003",
       "text": "所有弹道飞行速度+5%"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       21
     ],
@@ -330,6 +362,8 @@
       "key": "td_t_skill_describe_des4004",
       "text": "城墙生命值上限+5，并额外恢复5点生命值"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       42,
       41
@@ -352,6 +386,8 @@
       "key": "td_t_skill_describe_des4005",
       "text": "城墙生命值上限+10"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       42
     ],
@@ -372,6 +408,8 @@
       "key": "td_t_skill_describe_des4006",
       "text": "城墙恢复10点生命值"
     },
+    "trigger_type": 0,
+    "trigger_pro": 0,
     "skilltype": [
       41
     ],

bin/json/game_worldtask.json

@@ -408,7 +408,33 @@
     "finish": [],
     "finishparameter": "",
     "fnishipoint": [],
-    "reword": [],
+    "reword": [
+      {
+        "a": "equi",
+        "t": "10510",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10511",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10512",
+        "n": 1
+      },
+      {
+        "a": "equi",
+        "t": "10513",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      }
+    ],
     "module": []
   },
   {
@@ -506,33 +532,7 @@
     "finish": [],
     "finishparameter": "",
     "fnishipoint": [],
-    "reword": [
+    "reword": [],
-      {
-        "a": "equi",
-        "t": "10510",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10511",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10512",
-        "n": 1
-      },
-      {
-        "a": "equi",
-        "t": "10513",
-        "n": 1
-      },
-      {
-        "a": "item",
-        "t": "10000001",
-        "n": 1
-      }
-    ],
     "module": []
   },
   {

modules/catchbugs/api_passlevel.go

@@ -0,0 +1,45 @@
+package catchbugs
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+func (this *apiComp) PassLevelCheck(session comm.IUserSession, req *pb.CatchbugsPassLevelReq) (errdata *pb.ErrorData) {
+	return
+}
+
+func (this *apiComp) PassLevel(session comm.IUserSession, req *pb.CatchbugsPassLevelReq) (errdata *pb.ErrorData) {
+	var (
+		conf *cfg.GameCatchbugStageData
+		info *pb.DBCatchBugs
+		err  error
+	)
+	if errdata = this.PassLevelCheck(session, req); errdata != nil {
+		return
+	}
+	if conf, err = this.module.configure.getGameCatchbugStage(req.Level); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Message: err.Error(),
+		}
+		return
+	}
+
+	if info, err = this.module.model.getModel(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+	info.Integral += conf.Points
+	info.Level[req.Level] = true
+	this.module.model.Change(session.GetUserId(), map[string]interface{}{
+		"integral": info.Integral,
+		"level":    info.Level,
+	})
+	session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsPassLevelResp{Level: req.Level, Integral: info.Integral})
+	return
+}

modules/catchbugs/configure.go

@@ -8,6 +8,7 @@ import (
 )
 
 const (
+	game_catchbugstage       = "game_catchbugstage.json"
 	game_catchbugreward      = "game_catchbugreward.json"
 	game_catchbuglllustrated = "game_catchbuglllustrated.json"
 	game_catchbugskill       = "game_catchbugskill.json"
@@ -22,6 +23,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	err = this.MCompConfigure.Init(service, module, comp, options)
 	this.module = module.(*CatchBugs)
 	err = this.LoadMultiConfigure(map[string]interface{}{
+		game_catchbugstage:       cfg.NewGameCatchbugStage,
 		game_catchbugreward:      cfg.NewGameCatchbugReward,
 		game_catchbuglllustrated: cfg.NewGameCatchbugLllustrated,
 		game_catchbugskill:       cfg.NewGameCatchbugSkill,
@@ -69,3 +71,20 @@ func (this *configureComp) getGameCatchbugSkillData(id int32) (conf *cfg.GameCat
 	}
 	return
 }
+
+// 获取奖励列表
+func (this *configureComp) getGameCatchbugStage(id int32) (conf *cfg.GameCatchbugStageData, err error) {
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(game_catchbugstage); err != nil {
+		return
+	}
+	if conf, ok = v.(*cfg.GameCatchbugStage).GetDataMap()[id]; !ok {
+		err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_catchbugstage, id)
+		this.module.Errorf("err:%v", err)
+		return
+	}
+	return
+}

modules/pay/api_createorder.go

@@ -3,6 +3,7 @@ package pay
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -17,13 +18,20 @@ func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.PayCrea
 // /获取系统公告
 func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.PayCreateOrderReq) (errdata *pb.ErrorData) {
 	var (
+		conf  *cfg.GameRechargeData
 		order *pb.DBPayOrder
 		err   error
 	)
 	if errdata = this.CreateOrderCheck(session, req); errdata != nil {
 		return
 	}
-
+	if conf, err = this.module.configure.getGameRecharge(order.Bpoints); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_ConfigNoFound,
+			Message: err.Error(),
+		}
+		return
+	}
 	order = &pb.DBPayOrder{
 		Orderid: primitive.NewObjectID().Hex(),
 		Uid:     session.GetUserId(),
@@ -32,6 +40,8 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.PayCreateOrd
 		State:   pb.DBPayOrderState_PayOrder_Unpaid,
 		Ptype:   req.Ptype,
 		Pid:     req.Pid,
+		Price:   conf.Amount,
+		Amount:  1,
 	}
 	if err = this.module.model.create(order); err != nil {
 		errdata = &pb.ErrorData{

modules/pay/api_delivery.go

@@ -2,11 +2,12 @@ package pay
 
 import (
 	"context"
-	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
-	"math"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 //参数校验
@@ -19,44 +20,43 @@ func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliver
 func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) {
 	var (
 		conf  *cfg.GameRechargeData
-		voucher *cfg.Gameatn
+		order *pb.DBPayOrder
-		amount  uint32
-		neet    uint32
 		err   error
 	)
 	if errdata = this.DeliveryCheck(session, req); errdata != nil {
 		return
 	}
-	if conf, err = this.module.configure.getGameRecharge(req.Productid); err != nil {
+	if conf, err = this.module.configure.getGameRecharge(order.Bpoints); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_ConfigNoFound,
-			Title:   pb.ErrorCode_ConfigNoFound.ToString(),
 			Message: err.Error(),
 		}
 		return
 	}
-
+	order = &pb.DBPayOrder{
-	voucher = this.module.ModuleTools.GetGlobalConf().Voucher
+		Orderid: primitive.NewObjectID().Hex(),
-	amount = this.module.ModuleItems.QueryItemAmount(session.GetUserId(), voucher.T)
+		Uid:     session.GetUserId(),
-	neet = uint32(math.Floor(float64(conf.Amount) / 100))
+		Bpoints: req.BillingPoints,
-	if amount < neet {
+		Ctime:   time.Now().Unix(),
+		State:   pb.DBPayOrderState_PayOrder_Unpaid,
+		Ptype:   req.Ptype,
+		Pid:     req.Pid,
+		Price:   conf.Amount,
+		Amount:  1,
+	}
+	if err = this.module.model.create(order); err != nil {
 		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_ResNoEnough,
+			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_ResNoEnough.ToString(),
+			Message: err.Error(),
-			Message: fmt.Sprintf("需要代金卷:%d 只有:%d", neet, amount),
 		}
-		return
 	}
-	needatn := []*cfg.Gameatn{{
+	if err = this.module.Rpc_ModulePayDelivery(context.Background(), &pb.HttpPayDeliveryReq{
-		A: voucher.A,
+		Uid:       session.GetUserId(),
-		T: voucher.T,
+		Orderid:   order.Orderid,
-		N: int32(neet),
+		Productid: order.Bpoints,
-	}}
+		Price:     order.Price,
-
+		Amount:    order.Amount,
-	if errdata = this.module.ConsumeRes(session, needatn, true); errdata != nil {
+	}, &pb.HttpPayDeliveryResp{}); err != nil {
-		return
-	}
-	if err = this.module.Rpc_ModulePayDelivery(context.Background(), req, &pb.PayDeliveryResp{}); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.ToString(),

modules/pay/module.go

@@ -92,7 +92,7 @@ func (this *Pay) OnInstallComp() {
 }
 
 // RPC-----------------------------------------------------------------------------------------------------------------------
-func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDeliveryReq, reply *pb.PayDeliveryResp) (err error) {
+func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeliveryReq, reply *pb.HttpPayDeliveryResp) (err error) {
 	this.Debug("Rpc_ModulePayDelivery", log.Field{Key: "args", Value: args.String()})
 	var (
 		order   *pb.DBPayOrder

modules/robot/modulerobot_shop.go

@@ -12,11 +12,11 @@ import (
 
 //用户模块 机器人
 type ModuleRobot_Shop struct {
-	goods map[pb.ShopType][]*pb.ShopItem
+	goods map[int32][]*pb.ShopItem
 }
 
 func (this *ModuleRobot_Shop) Init() (err error) {
-	this.goods = make(map[pb.ShopType][]*pb.ShopItem)
+	this.goods = make(map[int32][]*pb.ShopItem)
 	return
 }
 
@@ -35,7 +35,7 @@ func (this *ModuleRobot_Shop) OncePipeline(robot IRobot) (err error) {
 		errdata *pb.ErrorData
 	)
 	if _, errdata = robot.SendMessage("shop", "getlist", &pb.ShopGetListReq{
-		SType: pb.ShopType_DiamondShop,
+		SType: 1,
 	}); errdata != nil {
 		err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 		return
@@ -50,10 +50,10 @@ func (this *ModuleRobot_Shop) DoPipeline(robot IRobot) (err error) {
 		usermodule *ModuleRobot_User
 	)
 	usermodule = robot.GetModule(comm.ModuleUser).(*ModuleRobot_User)
-	for _, v := range this.goods[pb.ShopType_GoldShop] {
+	for _, v := range this.goods[1] {
 		if v.LeftBuyNum > 0 && usermodule.user.Gold >= int64(v.Consume[0].N) {
 			if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{
-				ShopType: pb.ShopType_GoldShop,
+				ShopType: 1,
 				Gid:      v.Gid,
 				BuyNum:   1,
 			}); errdata != nil {
@@ -63,10 +63,10 @@ func (this *ModuleRobot_Shop) DoPipeline(robot IRobot) (err error) {
 			break
 		}
 	}
-	for _, v := range this.goods[pb.ShopType_DiamondShop] {
+	for _, v := range this.goods[2] {
 		if v.LeftBuyNum > 0 && usermodule.user.Diamond >= int64(v.Consume[0].N) {
 			if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{
-				ShopType: pb.ShopType_DiamondShop,
+				ShopType: 2,
 				Gid:      v.Gid,
 				BuyNum:   1,
 			}); errdata != nil {
@@ -91,16 +91,16 @@ func (this *ModuleRobot_Shop) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskDa
 		)
 		usermodule = robot.GetModule(comm.ModuleUser).(*ModuleRobot_User)
 		if _, errdata = robot.SendMessage("shop", "getlist", &pb.ShopGetListReq{
-			SType: pb.ShopType_DiamondShop,
+			SType: 2,
 		}); errdata != nil {
 			err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 			return
 		}
 
-		for _, v := range this.goods[pb.ShopType_DiamondShop] {
+		for _, v := range this.goods[2] {
 			if v.LeftBuyNum > 0 && usermodule.user.Diamond >= int64(v.Consume[0].N) {
 				if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{
-					ShopType: pb.ShopType_DiamondShop,
+					ShopType: 2,
 					Gid:      v.Gid,
 					BuyNum:   1,
 				}); errdata != nil {

modules/shop/api_getlist.go

@@ -66,7 +66,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
 		return
 	}
 	sdata = shopData.Shops[int32(req.SType)]
-	if req.SType == pb.ShopType_GoldShop {
+	if req.SType == 1 {
 		refresh = this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2)
 	}
 	if sdata == nil {

modules/shop/module_test.go

@@ -78,7 +78,7 @@ func TestMain(m *testing.M) {
 
 // 测试api_getlist
 func Test_Module_APIGetList(t *testing.T) {
-	data, _ := ptypes.MarshalAny(&pb.ShopGetListReq{SType: pb.ShopType_GoldShop, IsManualRefresh: false})
+	data, _ := ptypes.MarshalAny(&pb.ShopGetListReq{SType: 1, IsManualRefresh: false})
 	reply := &pb.RPCMessageReply{}
 	s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62b16dda909b2f8faeff788d", MainType: "shop", SubType: "getlist", Message: data}, reply)
 	log.Debugf("reply:%v", reply)

modules/web/api_paydelivery.go

@@ -27,14 +27,14 @@ func (this *Api_Comp) PayDelivery(c *engine.Context) {
 	// req := make([]interface{}, 0)
 	// err := c.BindJSON(&req)
 	var (
-		payreq *pb.PayDeliveryReq = &pb.PayDeliveryReq{
+		payreq *pb.HttpPayDeliveryReq = &pb.HttpPayDeliveryReq{
 			Uid:       uid,
 			Productid: pid,
 			Orderid:   oid,
 			Price:     price,
 			Amount:    1,
 		}
-		payresp *pb.PayDeliveryResp = &pb.PayDeliveryResp{
+		payresp *pb.HttpPayDeliveryResp = &pb.HttpPayDeliveryResp{
 			Code: 0,
 			Msg:  "成功",
 			Data: "",

pb/battle_db.pb.go

@@ -105,6 +105,7 @@ const (
 	PlayType_guildgve     PlayType = 17 //工会gve
 	PlayType_stone        PlayType = 18 // 石阵秘境
 	PlayType_expboos      PlayType = 19 //经验副本
+	PlayType_isLand       PlayType = 20 //海岛
 )
 
 // Enum value maps for PlayType.
@@ -130,6 +131,7 @@ var (
 		17: "guildgve",
 		18: "stone",
 		19: "expboos",
+		20: "isLand",
 	}
 	PlayType_value = map[string]int32{
 		"null":         0,
@@ -152,6 +154,7 @@ var (
 		"guildgve":     17,
 		"stone":        18,
 		"expboos":      19,
+		"isLand":       20,
 	}
 )
 
@@ -825,7 +828,7 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a,
 	0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12,
 	0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76,
-	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x90, 0x02,
+	0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x9c, 0x02,
 	0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75,
 	0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65,
 	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09,
@@ -843,12 +846,13 @@ var file_battle_battle_db_proto_rawDesc = []byte{
 	0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75,
 	0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e,
 	0x65, 0x10, 0x12, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x78, 0x70, 0x62, 0x6f, 0x6f, 0x73, 0x10, 0x13,
-	0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x0a, 0x0a, 0x06, 0x69, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x2a, 0x1f, 0x0a, 0x0c,
-	0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10,
+	0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02,
-	0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d,
+	0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a,
-	0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72,
+	0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a,
-	0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06,
+	0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01,
-	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/catchbugs_db.pb.go

@@ -31,7 +31,8 @@ type DBCatchBugs struct {
 	Integral int32           `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"`
 	Books    map[int32]int32 `protobuf:"bytes,4,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`   //图鉴
 	Awards   map[int32]bool  `protobuf:"bytes,5,rep,name=awards,proto3" json:"awards" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //奖励
-	Weektime int64           `protobuf:"varint,6,opt,name=weektime,proto3" json:"weektime"`                                                                                      //周时长
+	Level    map[int32]bool  `protobuf:"bytes,6,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`   //通关信息
+	Weektime int64           `protobuf:"varint,7,opt,name=weektime,proto3" json:"weektime"`                                                                                      //周时长
 }
 
 func (x *DBCatchBugs) Reset() {
@@ -101,6 +102,13 @@ func (x *DBCatchBugs) GetAwards() map[int32]bool {
 	return nil
 }
 
+func (x *DBCatchBugs) GetLevel() map[int32]bool {
+	if x != nil {
+		return x.Level
+	}
+	return nil
+}
+
 func (x *DBCatchBugs) GetWeektime() int64 {
 	if x != nil {
 		return x.Weektime
@@ -425,7 +433,7 @@ var File_catchbugs_catchbugs_db_proto protoreflect.FileDescriptor
 var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{
 	0x0a, 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63,
 	0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a,
-	0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd, 0x02, 0x0a, 0x0b, 0x44,
+	0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x03, 0x0a, 0x0b, 0x44,
 	0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
@@ -436,56 +444,62 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{
 	0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64,
 	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
 	0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65,
+	0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x2d, 0x0a, 0x05, 0x6c, 0x65, 0x76,
-	0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65,
+	0x65, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74,
-	0x6b, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e,
+	0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72,
-	0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, 0x6b,
-	0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x74, 0x69, 0x6d, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74,
-	0x39, 0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x42,
+	0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
-	0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
-	0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
-	0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61,
+	0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x72, 0x74, 0x22, 0xcc, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
+	0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
-	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72,
+	0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
-	0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a,
-	0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
-	0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04,
+	0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72, 0x74, 0x22, 0xcc, 0x01, 0x0a, 0x11,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69,
+	0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69,
+	0x72, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f,
+	0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
-	0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c,
+	0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20,
-	0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
+	0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73,
-	0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64,
+	0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14,
-	0x73, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
+	0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
-	0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
+	0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e,
-	0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
+	0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20,
-	0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
+	0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42,
-	0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
+	0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75,
+	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a,
-	0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61,
+	0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12,
-	0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75,
+	0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
-	0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01,
+	0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f,
+	0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+	0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
+	0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03,
+	0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61,
+	0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72,
+	0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75,
+	0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
+	0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43,
-	0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75,
+	0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61,
-	0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03,
-	0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
-	0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63,
+	0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61,
+	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72,
-	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
 }
 
 var (
@@ -500,7 +514,7 @@ func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte {
 	return file_catchbugs_catchbugs_db_proto_rawDescData
 }
 
-var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{
 	(*DBCatchBugs)(nil),       // 0: DBCatchBugs
 	(*DBCatchBugsRules)(nil),  // 1: DBCatchBugsRules
@@ -509,22 +523,24 @@ var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{
 	(*DBCatchBugsRoom)(nil),   // 4: DBCatchBugsRoom
 	nil,                       // 5: DBCatchBugs.BooksEntry
 	nil,                       // 6: DBCatchBugs.AwardsEntry
-	(*BaseUserInfo)(nil),      // 7: BaseUserInfo
+	nil,                       // 7: DBCatchBugs.LevelEntry
+	(*BaseUserInfo)(nil),      // 8: BaseUserInfo
 }
 var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{
 	5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry
 	6, // 1: DBCatchBugs.awards:type_name -> DBCatchBugs.AwardsEntry
-	7, // 2: DBCatchBugsPlayer.info:type_name -> BaseUserInfo
+	7, // 2: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry
-	1, // 3: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
+	8, // 3: DBCatchBugsPlayer.info:type_name -> BaseUserInfo
-	2, // 4: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
+	1, // 4: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
-	2, // 5: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
+	2, // 5: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
-	3, // 6: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard
+	2, // 6: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
-	3, // 7: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
+	3, // 7: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard
-	8, // [8:8] is the sub-list for method output_type
+	3, // 8: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
-	8, // [8:8] is the sub-list for method input_type
+	9, // [9:9] is the sub-list for method output_type
-	8, // [8:8] is the sub-list for extension type_name
+	9, // [9:9] is the sub-list for method input_type
-	8, // [8:8] is the sub-list for extension extendee
+	9, // [9:9] is the sub-list for extension type_name
-	0, // [0:8] is the sub-list for field type_name
+	9, // [9:9] is the sub-list for extension extendee
+	0, // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_catchbugs_catchbugs_db_proto_init() }
@@ -601,7 +617,7 @@ func file_catchbugs_catchbugs_db_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/catchbugs_msg.pb.go

@@ -106,6 +106,108 @@ func (x *CatchbugsInfoResp) GetInfo() *DBCatchBugs {
 	return nil
 }
 
+type CatchbugsPassLevelReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
+}
+
+func (x *CatchbugsPassLevelReq) Reset() {
+	*x = CatchbugsPassLevelReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsPassLevelReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsPassLevelReq) ProtoMessage() {}
+
+func (x *CatchbugsPassLevelReq) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsPassLevelReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsPassLevelReq) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *CatchbugsPassLevelReq) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
+type CatchbugsPassLevelResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Level    int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"`
+	Integral int32 `protobuf:"varint,2,opt,name=integral,proto3" json:"integral"` //红方积分
+}
+
+func (x *CatchbugsPassLevelResp) Reset() {
+	*x = CatchbugsPassLevelResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsPassLevelResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsPassLevelResp) ProtoMessage() {}
+
+func (x *CatchbugsPassLevelResp) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsPassLevelResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsPassLevelResp) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *CatchbugsPassLevelResp) GetLevel() int32 {
+	if x != nil {
+		return x.Level
+	}
+	return 0
+}
+
+func (x *CatchbugsPassLevelResp) GetIntegral() int32 {
+	if x != nil {
+		return x.Integral
+	}
+	return 0
+}
+
 //领奖
 type CatchbugsAwardReq struct {
 	state         protoimpl.MessageState
@@ -116,7 +218,7 @@ type CatchbugsAwardReq struct {
 func (x *CatchbugsAwardReq) Reset() {
 	*x = CatchbugsAwardReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -129,7 +231,7 @@ func (x *CatchbugsAwardReq) String() string {
 func (*CatchbugsAwardReq) ProtoMessage() {}
 
 func (x *CatchbugsAwardReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -142,7 +244,7 @@ func (x *CatchbugsAwardReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsAwardReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsAwardReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{2}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
 }
 
 type CatchbugsAwardResp struct {
@@ -157,7 +259,7 @@ type CatchbugsAwardResp struct {
 func (x *CatchbugsAwardResp) Reset() {
 	*x = CatchbugsAwardResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -170,7 +272,7 @@ func (x *CatchbugsAwardResp) String() string {
 func (*CatchbugsAwardResp) ProtoMessage() {}
 
 func (x *CatchbugsAwardResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -183,7 +285,7 @@ func (x *CatchbugsAwardResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsAwardResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsAwardResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{3}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *CatchbugsAwardResp) GetAwardmap() map[int32]bool {
@@ -212,7 +314,7 @@ type CatchbugsSingleGameReq struct {
 func (x *CatchbugsSingleGameReq) Reset() {
 	*x = CatchbugsSingleGameReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -225,7 +327,7 @@ func (x *CatchbugsSingleGameReq) String() string {
 func (*CatchbugsSingleGameReq) ProtoMessage() {}
 
 func (x *CatchbugsSingleGameReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -238,7 +340,7 @@ func (x *CatchbugsSingleGameReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsSingleGameReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsSingleGameReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CatchbugsSingleGameReq) GetRules() *DBCatchBugsRules {
@@ -258,7 +360,7 @@ type CatchbugsSingleGameResp struct {
 func (x *CatchbugsSingleGameResp) Reset() {
 	*x = CatchbugsSingleGameResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -271,7 +373,7 @@ func (x *CatchbugsSingleGameResp) String() string {
 func (*CatchbugsSingleGameResp) ProtoMessage() {}
 
 func (x *CatchbugsSingleGameResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -284,7 +386,7 @@ func (x *CatchbugsSingleGameResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsSingleGameResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsSingleGameResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
 }
 
 //游戏准备推送
@@ -300,7 +402,7 @@ type CatchbugsGameReadyPush struct {
 func (x *CatchbugsGameReadyPush) Reset() {
 	*x = CatchbugsGameReadyPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -313,7 +415,7 @@ func (x *CatchbugsGameReadyPush) String() string {
 func (*CatchbugsGameReadyPush) ProtoMessage() {}
 
 func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -326,7 +428,7 @@ func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsGameReadyPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsGameReadyPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *CatchbugsGameReadyPush) GetServicePath() string {
@@ -355,7 +457,7 @@ type CatchbugsReadyReq struct {
 func (x *CatchbugsReadyReq) Reset() {
 	*x = CatchbugsReadyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -368,7 +470,7 @@ func (x *CatchbugsReadyReq) String() string {
 func (*CatchbugsReadyReq) ProtoMessage() {}
 
 func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -381,7 +483,7 @@ func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsReadyReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsReadyReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *CatchbugsReadyReq) GetRoomid() string {
@@ -404,7 +506,7 @@ type CatchbugsReadyResp struct {
 func (x *CatchbugsReadyResp) Reset() {
 	*x = CatchbugsReadyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -417,7 +519,7 @@ func (x *CatchbugsReadyResp) String() string {
 func (*CatchbugsReadyResp) ProtoMessage() {}
 
 func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -430,7 +532,7 @@ func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsReadyResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsReadyResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *CatchbugsReadyResp) GetRoomid() string {
@@ -460,7 +562,7 @@ type CatchbugsRoundStartPush struct {
 func (x *CatchbugsRoundStartPush) Reset() {
 	*x = CatchbugsRoundStartPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -473,7 +575,7 @@ func (x *CatchbugsRoundStartPush) String() string {
 func (*CatchbugsRoundStartPush) ProtoMessage() {}
 
 func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -486,7 +588,7 @@ func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsRoundStartPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsRoundStartPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *CatchbugsRoundStartPush) GetRound() int32 {
@@ -517,7 +619,7 @@ type CatchbugsHandleReq struct {
 func (x *CatchbugsHandleReq) Reset() {
 	*x = CatchbugsHandleReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -530,7 +632,7 @@ func (x *CatchbugsHandleReq) String() string {
 func (*CatchbugsHandleReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -543,7 +645,7 @@ func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *CatchbugsHandleReq) GetRoomid() string {
@@ -576,7 +678,7 @@ type CatchbugsHandleResp struct {
 func (x *CatchbugsHandleResp) Reset() {
 	*x = CatchbugsHandleResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -589,7 +691,7 @@ func (x *CatchbugsHandleResp) String() string {
 func (*CatchbugsHandleResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -602,7 +704,7 @@ func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
 }
 
 //玩家操作推送8
@@ -621,7 +723,7 @@ type CatchbugsOpenCardPush struct {
 func (x *CatchbugsOpenCardPush) Reset() {
 	*x = CatchbugsOpenCardPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -634,7 +736,7 @@ func (x *CatchbugsOpenCardPush) String() string {
 func (*CatchbugsOpenCardPush) ProtoMessage() {}
 
 func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -647,7 +749,7 @@ func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsOpenCardPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsOpenCardPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *CatchbugsOpenCardPush) GetRoomid() string {
@@ -697,7 +799,7 @@ type CatchbugsHandleEndReq struct {
 func (x *CatchbugsHandleEndReq) Reset() {
 	*x = CatchbugsHandleEndReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -710,7 +812,7 @@ func (x *CatchbugsHandleEndReq) String() string {
 func (*CatchbugsHandleEndReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -723,7 +825,7 @@ func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleEndReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleEndReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *CatchbugsHandleEndReq) GetRoomid() string {
@@ -743,7 +845,7 @@ type CatchbugsHandleEndResp struct {
 func (x *CatchbugsHandleEndResp) Reset() {
 	*x = CatchbugsHandleEndResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -756,7 +858,7 @@ func (x *CatchbugsHandleEndResp) String() string {
 func (*CatchbugsHandleEndResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -769,7 +871,7 @@ func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleEndResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleEndResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16}
 }
 
 //桌面变化推送10 a
@@ -785,7 +887,7 @@ type CatchbugsTablesChangePush struct {
 func (x *CatchbugsTablesChangePush) Reset() {
 	*x = CatchbugsTablesChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -798,7 +900,7 @@ func (x *CatchbugsTablesChangePush) String() string {
 func (*CatchbugsTablesChangePush) ProtoMessage() {}
 
 func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -811,7 +913,7 @@ func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsTablesChangePush.ProtoReflect.Descriptor instead.
 func (*CatchbugsTablesChangePush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *CatchbugsTablesChangePush) GetChangetype() int32 {
@@ -838,7 +940,7 @@ type CatchbugsRoundEndPush struct {
 func (x *CatchbugsRoundEndPush) Reset() {
 	*x = CatchbugsRoundEndPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -851,7 +953,7 @@ func (x *CatchbugsRoundEndPush) String() string {
 func (*CatchbugsRoundEndPush) ProtoMessage() {}
 
 func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -864,7 +966,7 @@ func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsRoundEndPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsRoundEndPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{18}
 }
 
 //游戏结束推送12
@@ -881,7 +983,7 @@ type CatchbugsGameOverPush struct {
 func (x *CatchbugsGameOverPush) Reset() {
 	*x = CatchbugsGameOverPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -894,7 +996,7 @@ func (x *CatchbugsGameOverPush) String() string {
 func (*CatchbugsGameOverPush) ProtoMessage() {}
 
 func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -907,7 +1009,7 @@ func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsGameOverPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsGameOverPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{17}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *CatchbugsGameOverPush) GetWinuid() string {
@@ -943,82 +1045,89 @@ var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{
 	0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x0c, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
+	0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
-	0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61,
+	0x73, 0x50, 0x61, 0x73, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
-	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70,
+	0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
-	0x12, 0x3d, 0x0a, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03,
+	0x76, 0x65, 0x6c, 0x22, 0x4a, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
-	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77,
+	0x50, 0x61, 0x73, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
-	0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70,
+	0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x12,
+	0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18,
-	0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22,
-	0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64,
+	0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72,
-	0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
+	0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3d, 0x0a, 0x08, 0x61,
-	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a,
+	0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65,
-	0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+	0x73, 0x70, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79,
-	0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
+	0x52, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
+	0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
+	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x41,
-	0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e,
+	0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
-	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76,
-	0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63,
-	0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76,
+	0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52,
-	0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18,
+	0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
+	0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52,
-	0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a,
+	0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x43,
-	0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
+	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61,
-	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62,
-	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x12, 0x43, 0x61,
+	0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68,
-	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70,
+	0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18,
-	0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61,
-	0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
+	0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
+	0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f,
-	0x22, 0x53, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75,
+	0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63,
-	0x6e, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72,
+	0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
-	0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e,
-	0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65,
-	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
-	0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
-	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d,
-	0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74,
-	0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x50, 0x75,
-	0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14,
-	0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
-	0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06,
-	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
-	0x73, 0x75, 0x63, 0x63, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
-	0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
 	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
-	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22,
+	0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x61, 0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54, 0x61, 0x62, 0x6c,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a,
+	0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x53, 0x0a, 0x17, 0x43,
-	0x52, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x04,
+	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61,
-	0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43,
+	0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18,
-	0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c,
-	0x72, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52,
+	0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a, 0x15, 0x43,
+	0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
-	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72,
+	0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14,
-	0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
-	0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22,
+	0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03,
-	0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52,
-	0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x65, 0x73, 0x70, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
-	0x6f, 0x33,
+	0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a,
+	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12,
+	0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
+	0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22,
+	0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64,
+	0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
+	0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x61, 0x0a, 0x19, 0x43, 0x61,
+	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x43, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
+	0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x22, 0x17, 0x0a,
+	0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x45,
+	0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62,
+	0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12,
+	0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e,
+	0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65,
+	0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75,
+	0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1033,40 +1142,42 @@ func file_catchbugs_catchbugs_msg_proto_rawDescGZIP() []byte {
 	return file_catchbugs_catchbugs_msg_proto_rawDescData
 }
 
-var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
+var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
 var file_catchbugs_catchbugs_msg_proto_goTypes = []interface{}{
 	(*CatchbugsInfoReq)(nil),          // 0: CatchbugsInfoReq
 	(*CatchbugsInfoResp)(nil),         // 1: CatchbugsInfoResp
-	(*CatchbugsAwardReq)(nil),         // 2: CatchbugsAwardReq
+	(*CatchbugsPassLevelReq)(nil),     // 2: CatchbugsPassLevelReq
-	(*CatchbugsAwardResp)(nil),        // 3: CatchbugsAwardResp
+	(*CatchbugsPassLevelResp)(nil),    // 3: CatchbugsPassLevelResp
-	(*CatchbugsSingleGameReq)(nil),    // 4: CatchbugsSingleGameReq
+	(*CatchbugsAwardReq)(nil),         // 4: CatchbugsAwardReq
-	(*CatchbugsSingleGameResp)(nil),   // 5: CatchbugsSingleGameResp
+	(*CatchbugsAwardResp)(nil),        // 5: CatchbugsAwardResp
-	(*CatchbugsGameReadyPush)(nil),    // 6: CatchbugsGameReadyPush
+	(*CatchbugsSingleGameReq)(nil),    // 6: CatchbugsSingleGameReq
-	(*CatchbugsReadyReq)(nil),         // 7: CatchbugsReadyReq
+	(*CatchbugsSingleGameResp)(nil),   // 7: CatchbugsSingleGameResp
-	(*CatchbugsReadyResp)(nil),        // 8: CatchbugsReadyResp
+	(*CatchbugsGameReadyPush)(nil),    // 8: CatchbugsGameReadyPush
-	(*CatchbugsRoundStartPush)(nil),   // 9: CatchbugsRoundStartPush
+	(*CatchbugsReadyReq)(nil),         // 9: CatchbugsReadyReq
-	(*CatchbugsHandleReq)(nil),        // 10: CatchbugsHandleReq
+	(*CatchbugsReadyResp)(nil),        // 10: CatchbugsReadyResp
-	(*CatchbugsHandleResp)(nil),       // 11: CatchbugsHandleResp
+	(*CatchbugsRoundStartPush)(nil),   // 11: CatchbugsRoundStartPush
-	(*CatchbugsOpenCardPush)(nil),     // 12: CatchbugsOpenCardPush
+	(*CatchbugsHandleReq)(nil),        // 12: CatchbugsHandleReq
-	(*CatchbugsHandleEndReq)(nil),     // 13: CatchbugsHandleEndReq
+	(*CatchbugsHandleResp)(nil),       // 13: CatchbugsHandleResp
-	(*CatchbugsHandleEndResp)(nil),    // 14: CatchbugsHandleEndResp
+	(*CatchbugsOpenCardPush)(nil),     // 14: CatchbugsOpenCardPush
-	(*CatchbugsTablesChangePush)(nil), // 15: CatchbugsTablesChangePush
+	(*CatchbugsHandleEndReq)(nil),     // 15: CatchbugsHandleEndReq
-	(*CatchbugsRoundEndPush)(nil),     // 16: CatchbugsRoundEndPush
+	(*CatchbugsHandleEndResp)(nil),    // 16: CatchbugsHandleEndResp
-	(*CatchbugsGameOverPush)(nil),     // 17: CatchbugsGameOverPush
+	(*CatchbugsTablesChangePush)(nil), // 17: CatchbugsTablesChangePush
-	nil,                               // 18: CatchbugsAwardResp.AwardmapEntry
+	(*CatchbugsRoundEndPush)(nil),     // 18: CatchbugsRoundEndPush
-	(*DBCatchBugs)(nil),               // 19: DBCatchBugs
+	(*CatchbugsGameOverPush)(nil),     // 19: CatchbugsGameOverPush
-	(*UserAtno)(nil),                  // 20: UserAtno
+	nil,                               // 20: CatchbugsAwardResp.AwardmapEntry
-	(*DBCatchBugsRules)(nil),          // 21: DBCatchBugsRules
+	(*DBCatchBugs)(nil),               // 21: DBCatchBugs
-	(*DBCatchBugsRoom)(nil),           // 22: DBCatchBugsRoom
+	(*UserAtno)(nil),                  // 22: UserAtno
-	(*DBCatchBugsCard)(nil),           // 23: DBCatchBugsCard
+	(*DBCatchBugsRules)(nil),          // 23: DBCatchBugsRules
+	(*DBCatchBugsRoom)(nil),           // 24: DBCatchBugsRoom
+	(*DBCatchBugsCard)(nil),           // 25: DBCatchBugsCard
 }
 var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
-	19, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
+	21, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
-	18, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
+	20, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
-	20, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
+	22, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
-	21, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules
+	23, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules
-	22, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
+	24, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
-	23, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
+	25, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
 	6,  // [6:6] is the sub-list for method output_type
 	6,  // [6:6] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
@@ -1107,7 +1218,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsAwardReq); i {
+			switch v := v.(*CatchbugsPassLevelReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1119,7 +1230,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsAwardResp); i {
+			switch v := v.(*CatchbugsPassLevelResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1131,7 +1242,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsSingleGameReq); i {
+			switch v := v.(*CatchbugsAwardReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1143,7 +1254,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsSingleGameResp); i {
+			switch v := v.(*CatchbugsAwardResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1155,7 +1266,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsGameReadyPush); i {
+			switch v := v.(*CatchbugsSingleGameReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1167,7 +1278,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsReadyReq); i {
+			switch v := v.(*CatchbugsSingleGameResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1179,7 +1290,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsReadyResp); i {
+			switch v := v.(*CatchbugsGameReadyPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1191,7 +1302,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsRoundStartPush); i {
+			switch v := v.(*CatchbugsReadyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1203,7 +1314,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleReq); i {
+			switch v := v.(*CatchbugsReadyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1215,7 +1326,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleResp); i {
+			switch v := v.(*CatchbugsRoundStartPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1227,7 +1338,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsOpenCardPush); i {
+			switch v := v.(*CatchbugsHandleReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1239,7 +1350,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleEndReq); i {
+			switch v := v.(*CatchbugsHandleResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1251,7 +1362,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleEndResp); i {
+			switch v := v.(*CatchbugsOpenCardPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1263,7 +1374,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsTablesChangePush); i {
+			switch v := v.(*CatchbugsHandleEndReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1275,7 +1386,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsRoundEndPush); i {
+			switch v := v.(*CatchbugsHandleEndResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1287,6 +1398,30 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CatchbugsTablesChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_catchbugs_catchbugs_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CatchbugsRoundEndPush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_catchbugs_catchbugs_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsGameOverPush); i {
 			case 0:
 				return &v.state
@@ -1305,7 +1440,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_catchbugs_catchbugs_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   21,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/pay_db.pb.go

@@ -154,6 +154,8 @@ type DBPayOrder struct {
 	State   DBPayOrderState `protobuf:"varint,6,opt,name=state,proto3,enum=DBPayOrderState" json:"state"` //订单状态
 	Ptype   DBPayType       `protobuf:"varint,7,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"`       //订单类型
 	Pid     int32           `protobuf:"varint,8,opt,name=pid,proto3" json:"pid"`                          //商品id
+	Price   int32           `protobuf:"varint,9,opt,name=price,proto3" json:"price"`                      //价格
+	Amount  int32           `protobuf:"varint,10,opt,name=amount,proto3" json:"amount"`                   //数量
 }
 
 func (x *DBPayOrder) Reset() {
@@ -237,6 +239,20 @@ func (x *DBPayOrder) GetPid() int32 {
 	return 0
 }
 
+func (x *DBPayOrder) GetPrice() int32 {
+	if x != nil {
+		return x.Price
+	}
+	return 0
+}
+
+func (x *DBPayOrder) GetAmount() int32 {
+	if x != nil {
+		return x.Amount
+	}
+	return 0
+}
+
 //用户购买记录
 type DBUserPay struct {
 	state         protoimpl.MessageState
@@ -617,7 +633,7 @@ var File_pay_pay_db_proto protoreflect.FileDescriptor
 
 var file_pay_pay_db_proto_rawDesc = []byte{
 	0x0a, 0x10, 0x70, 0x61, 0x79, 0x2f, 0x70, 0x61, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65,
+	0x74, 0x6f, 0x22, 0xf2, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65,
 	0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75,
 	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a,
@@ -629,84 +645,86 @@ var file_pay_pay_db_proto_rawDesc = []byte{
 	0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07,
 	0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65,
 	0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69,
-	0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+	0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63,
+	0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73,
+	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73,
-	0x65, 0x72, 0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
+	0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63,
+	0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
-	0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79,
+	0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b,
+	0x38, 0x01, 0x22, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74,
-	0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
-	0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01,
-	0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a,
+	0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x2c, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16,
+	0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, 0x01, 0x0a,
-	0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d,
+	0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a,
-	0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44,
-	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a,
+	0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49,
-	0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x61, 0x79,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
+	0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
-	0x66, 0x74, 0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f, 0x0a, 0x09,
-	0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a,
+	0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x52, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74,
-	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74,
-	0x6b, 0x65, 0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, 0x52, 0x0a,
-	0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66,
+	0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62,
+	0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+	0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69,
+	0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, 0x74, 0x65,
+	0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x49,
+	0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
+	0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66,
 	0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+	0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76,
-	0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f,
+	0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e,
-	0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16,
-	0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18,
+	0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
-	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69,
+	0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62,
-	0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74,
+	0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d,
+	0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74,
-	0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65,
+	0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c,
-	0x6d, 0x73, 0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, 0x09, 0x44,
-	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+	0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d,
-	0x65, 0x79, 0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x63,
-	0x0b, 0x32, 0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47,
+	0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50,
-	0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, 0x42, 0x61,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74,
+	0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x65,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d,
+	0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+	0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, 0x10, 0x05,
-	0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, 0x67, 0x10,
-	0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61,
+	0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c,
-	0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74,
+	0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79,
-	0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61,
-	0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12,
-	0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a,
+	0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64,
-	0x09, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69,
+	0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46,
-	0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50,
+	0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72,
-	0x61, 0x63, 0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c,
+	0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d,
-	0x79, 0x50, 0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68,
+	0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42,
-	0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d,
+	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-	0x50, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12,
-	0x11, 0x0a, 0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73,
-	0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61,
-	0x67, 0x10, 0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74,
-	0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50,
-	0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f,
-	0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10,
-	0x00, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61,
-	0x69, 0x64, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x5f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11,
-	0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10,
-	0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
 }
 
 var (

pb/pay_msg.pb.go

@@ -582,11 +582,9 @@ type PayDeliveryReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Uid       string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Ptype         DBPayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"`
-	Orderid   string `protobuf:"bytes,2,opt,name=orderid,proto3" json:"orderid"`
+	Pid           int32     `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"`
-	Productid string `protobuf:"bytes,3,opt,name=productid,proto3" json:"productid"`
+	BillingPoints string    `protobuf:"bytes,3,opt,name=BillingPoints,proto3" json:"BillingPoints"`
-	Price     int32  `protobuf:"varint,4,opt,name=price,proto3" json:"price"`
-	Amount    int32  `protobuf:"varint,5,opt,name=amount,proto3" json:"amount"`
 }
 
 func (x *PayDeliveryReq) Reset() {
@@ -621,39 +619,25 @@ func (*PayDeliveryReq) Descriptor() ([]byte, []int) {
 	return file_pay_pay_msg_proto_rawDescGZIP(), []int{11}
 }
 
-func (x *PayDeliveryReq) GetUid() string {
+func (x *PayDeliveryReq) GetPtype() DBPayType {
 	if x != nil {
-		return x.Uid
+		return x.Ptype
 	}
-	return ""
+	return DBPayType_DiamondShop
 }
 
-func (x *PayDeliveryReq) GetOrderid() string {
+func (x *PayDeliveryReq) GetPid() int32 {
 	if x != nil {
-		return x.Orderid
+		return x.Pid
-	}
-	return ""
-}
-
-func (x *PayDeliveryReq) GetProductid() string {
-	if x != nil {
-		return x.Productid
-	}
-	return ""
-}
-
-func (x *PayDeliveryReq) GetPrice() int32 {
-	if x != nil {
-		return x.Price
 	}
 	return 0
 }
 
-func (x *PayDeliveryReq) GetAmount() int32 {
+func (x *PayDeliveryReq) GetBillingPoints() string {
 	if x != nil {
-		return x.Amount
+		return x.BillingPoints
 	}
-	return 0
+	return ""
 }
 
 ///支付系统发货请求 回应
@@ -662,9 +646,7 @@ type PayDeliveryResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"s"` //头像
+	Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"`
-	Msg  string    `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"`
-	Data string    `protobuf:"bytes,3,opt,name=data,proto3" json:"data"`
 }
 
 func (x *PayDeliveryResp) Reset() {
@@ -699,25 +681,11 @@ func (*PayDeliveryResp) Descriptor() ([]byte, []int) {
 	return file_pay_pay_msg_proto_rawDescGZIP(), []int{12}
 }
 
-func (x *PayDeliveryResp) GetCode() ErrorCode {
+func (x *PayDeliveryResp) GetOrder() *DBPayOrder {
 	if x != nil {
-		return x.Code
+		return x.Order
 	}
-	return ErrorCode_Success
+	return nil
-}
-
-func (x *PayDeliveryResp) GetMsg() string {
-	if x != nil {
-		return x.Msg
-	}
-	return ""
-}
-
-func (x *PayDeliveryResp) GetData() string {
-	if x != nil {
-		return x.Data
-	}
-	return ""
 }
 
 // 获取礼包信息
@@ -918,6 +886,150 @@ func (x *PayActivityResp) GetItems() []*UserAssets {
 	return nil
 }
 
+///支付系统发货请求
+type HttpPayDeliveryReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Uid       string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
+	Orderid   string `protobuf:"bytes,2,opt,name=orderid,proto3" json:"orderid"`
+	Productid string `protobuf:"bytes,3,opt,name=productid,proto3" json:"productid"`
+	Price     int32  `protobuf:"varint,4,opt,name=price,proto3" json:"price"`
+	Amount    int32  `protobuf:"varint,5,opt,name=amount,proto3" json:"amount"`
+}
+
+func (x *HttpPayDeliveryReq) Reset() {
+	*x = HttpPayDeliveryReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pay_pay_msg_proto_msgTypes[17]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HttpPayDeliveryReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HttpPayDeliveryReq) ProtoMessage() {}
+
+func (x *HttpPayDeliveryReq) ProtoReflect() protoreflect.Message {
+	mi := &file_pay_pay_msg_proto_msgTypes[17]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HttpPayDeliveryReq.ProtoReflect.Descriptor instead.
+func (*HttpPayDeliveryReq) Descriptor() ([]byte, []int) {
+	return file_pay_pay_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *HttpPayDeliveryReq) GetUid() string {
+	if x != nil {
+		return x.Uid
+	}
+	return ""
+}
+
+func (x *HttpPayDeliveryReq) GetOrderid() string {
+	if x != nil {
+		return x.Orderid
+	}
+	return ""
+}
+
+func (x *HttpPayDeliveryReq) GetProductid() string {
+	if x != nil {
+		return x.Productid
+	}
+	return ""
+}
+
+func (x *HttpPayDeliveryReq) GetPrice() int32 {
+	if x != nil {
+		return x.Price
+	}
+	return 0
+}
+
+func (x *HttpPayDeliveryReq) GetAmount() int32 {
+	if x != nil {
+		return x.Amount
+	}
+	return 0
+}
+
+///支付系统发货请求 回应
+type HttpPayDeliveryResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"s"` //头像
+	Msg  string    `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"`
+	Data string    `protobuf:"bytes,3,opt,name=data,proto3" json:"data"`
+}
+
+func (x *HttpPayDeliveryResp) Reset() {
+	*x = HttpPayDeliveryResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_pay_pay_msg_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HttpPayDeliveryResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HttpPayDeliveryResp) ProtoMessage() {}
+
+func (x *HttpPayDeliveryResp) ProtoReflect() protoreflect.Message {
+	mi := &file_pay_pay_msg_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HttpPayDeliveryResp.ProtoReflect.Descriptor instead.
+func (*HttpPayDeliveryResp) Descriptor() ([]byte, []int) {
+	return file_pay_pay_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *HttpPayDeliveryResp) GetCode() ErrorCode {
+	if x != nil {
+		return x.Code
+	}
+	return ErrorCode_Success
+}
+
+func (x *HttpPayDeliveryResp) GetMsg() string {
+	if x != nil {
+		return x.Msg
+	}
+	return ""
+}
+
+func (x *HttpPayDeliveryResp) GetData() string {
+	if x != nil {
+		return x.Data
+	}
+	return ""
+}
+
 var File_pay_pay_msg_proto protoreflect.FileDescriptor
 
 var file_pay_pay_msg_proto_rawDesc = []byte{
@@ -965,36 +1077,47 @@ var file_pay_pay_msg_proto_rawDesc = []byte{
 	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
 	0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e,
 	0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
-	0x72, 0x50, 0x61, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x88, 0x01, 0x0a, 0x0e, 0x50,
+	0x72, 0x50, 0x61, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61,
-	0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a,
+	0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05,
-	0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
+	0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42,
-	0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10,
-	0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f,
+	0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64,
-	0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72,
+	0x12, 0x24, 0x0a, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74,
-	0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65,
+	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a,
+	0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c,
-	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61,
+	0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x57, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69,
+	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79,
-	0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f,
+	0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65,
-	0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18,
+	0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61,
+	0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65,
-	0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x29,
+	0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a,
-	0x0a, 0x11, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
+	0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63,
-	0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65,
-	0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79,
+	0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63,
-	0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02,
-	0x28, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f,
-	0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49,
+	0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
-	0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79,
+	0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
-	0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e,
+	0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02,
-	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
-	0x0a, 0x0f, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73,
+	0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74,
-	0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x70, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12,
-	0x52, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
+	0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
+	0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69,
+	0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50,
+	0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
+	0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45,
+	0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10,
+	0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67,
+	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1009,7 +1132,7 @@ func file_pay_pay_msg_proto_rawDescGZIP() []byte {
 	return file_pay_pay_msg_proto_rawDescData
 }
 
-var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
+var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
 var file_pay_pay_msg_proto_goTypes = []interface{}{
 	(*PayCreateOrderReq)(nil),    // 0: PayCreateOrderReq
 	(*PayCreateOrderResp)(nil),   // 1: PayCreateOrderResp
@@ -1028,33 +1151,37 @@ var file_pay_pay_msg_proto_goTypes = []interface{}{
 	(*PayGetActivityResp)(nil),   // 14: PayGetActivityResp
 	(*PayActivityBuyReq)(nil),    // 15: PayActivityBuyReq
 	(*PayActivityResp)(nil),      // 16: PayActivityResp
-	(DBPayType)(0),               // 17: DBPayType
+	(*HttpPayDeliveryReq)(nil),   // 17: HttpPayDeliveryReq
-	(*DBPayOrder)(nil),           // 18: DBPayOrder
+	(*HttpPayDeliveryResp)(nil),  // 18: HttpPayDeliveryResp
-	(DBPayOrderState)(0),         // 19: DBPayOrderState
+	(DBPayType)(0),               // 19: DBPayType
-	(*DBUserPay)(nil),            // 20: DBUserPay
+	(*DBPayOrder)(nil),           // 20: DBPayOrder
-	(*DBPayDaily)(nil),           // 21: DBPayDaily
+	(DBPayOrderState)(0),         // 21: DBPayOrderState
-	(*UserAssets)(nil),           // 22: UserAssets
+	(*DBUserPay)(nil),            // 22: DBUserPay
-	(ErrorCode)(0),               // 23: ErrorCode
+	(*DBPayDaily)(nil),           // 23: DBPayDaily
-	(*ActivityGiftbagItem)(nil),  // 24: ActivityGiftbagItem
+	(*UserAssets)(nil),           // 24: UserAssets
+	(*ActivityGiftbagItem)(nil),  // 25: ActivityGiftbagItem
+	(ErrorCode)(0),               // 26: ErrorCode
 }
 var file_pay_pay_msg_proto_depIdxs = []int32{
-	17, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType
+	19, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType
-	18, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder
+	20, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder
-	19, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState
+	21, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState
-	20, // 3: PayRecordResp.info:type_name -> DBUserPay
+	22, // 3: PayRecordResp.info:type_name -> DBUserPay
-	21, // 4: PayInfoResp.info:type_name -> DBPayDaily
+	23, // 4: PayInfoResp.info:type_name -> DBPayDaily
-	22, // 5: PayDailyBuyResp.items:type_name -> UserAssets
+	24, // 5: PayDailyBuyResp.items:type_name -> UserAssets
-	18, // 6: PayShippedPush.order:type_name -> DBPayOrder
+	20, // 6: PayShippedPush.order:type_name -> DBPayOrder
-	22, // 7: PayShippedPush.items:type_name -> UserAssets
+	24, // 7: PayShippedPush.items:type_name -> UserAssets
-	20, // 8: PayShippedPush.info:type_name -> DBUserPay
+	22, // 8: PayShippedPush.info:type_name -> DBUserPay
-	23, // 9: PayDeliveryResp.code:type_name -> ErrorCode
+	19, // 9: PayDeliveryReq.ptype:type_name -> DBPayType
-	24, // 10: PayGetActivityResp.info:type_name -> ActivityGiftbagItem
+	20, // 10: PayDeliveryResp.order:type_name -> DBPayOrder
-	22, // 11: PayActivityResp.items:type_name -> UserAssets
+	25, // 11: PayGetActivityResp.info:type_name -> ActivityGiftbagItem
-	12, // [12:12] is the sub-list for method output_type
+	24, // 12: PayActivityResp.items:type_name -> UserAssets
-	12, // [12:12] is the sub-list for method input_type
+	26, // 13: HttpPayDeliveryResp.code:type_name -> ErrorCode
-	12, // [12:12] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for method output_type
-	12, // [12:12] is the sub-list for extension extendee
+	14, // [14:14] is the sub-list for method input_type
-	0,  // [0:12] is the sub-list for field type_name
+	14, // [14:14] is the sub-list for extension type_name
+	14, // [14:14] is the sub-list for extension extendee
+	0,  // [0:14] is the sub-list for field type_name
 }
 
 func init() { file_pay_pay_msg_proto_init() }
@@ -1270,6 +1397,30 @@ func file_pay_pay_msg_proto_init() {
 				return nil
 			}
 		}
+		file_pay_pay_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HttpPayDeliveryReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_pay_pay_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HttpPayDeliveryResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -1277,7 +1428,7 @@ func file_pay_pay_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_pay_pay_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   17,
+			NumMessages:   19,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/shop_db.pb.go

@@ -20,70 +20,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type ShopType int32
-
-const (
-	ShopType_Null         ShopType = 0
-	ShopType_GoldShop     ShopType = 1
-	ShopType_DiamondShop  ShopType = 2
-	ShopType_PVPShop      ShopType = 3
-	ShopType_PVEShop      ShopType = 4
-	ShopType_AllianceShop ShopType = 5
-	ShopType_HeroShop     ShopType = 6
-	ShopType_SmithyShop   ShopType = 7
-)
-
-// Enum value maps for ShopType.
-var (
-	ShopType_name = map[int32]string{
-		0: "Null",
-		1: "GoldShop",
-		2: "DiamondShop",
-		3: "PVPShop",
-		4: "PVEShop",
-		5: "AllianceShop",
-		6: "HeroShop",
-		7: "SmithyShop",
-	}
-	ShopType_value = map[string]int32{
-		"Null":         0,
-		"GoldShop":     1,
-		"DiamondShop":  2,
-		"PVPShop":      3,
-		"PVEShop":      4,
-		"AllianceShop": 5,
-		"HeroShop":     6,
-		"SmithyShop":   7,
-	}
-)
-
-func (x ShopType) Enum() *ShopType {
-	p := new(ShopType)
-	*p = x
-	return p
-}
-
-func (x ShopType) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (ShopType) Descriptor() protoreflect.EnumDescriptor {
-	return file_shop_shop_db_proto_enumTypes[0].Descriptor()
-}
-
-func (ShopType) Type() protoreflect.EnumType {
-	return &file_shop_shop_db_proto_enumTypes[0]
-}
-
-func (x ShopType) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use ShopType.Descriptor instead.
-func (ShopType) EnumDescriptor() ([]byte, []int) {
-	return file_shop_shop_db_proto_rawDescGZIP(), []int{0}
-}
-
 type UserShopGood struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -413,16 +349,8 @@ var file_shop_shop_db_proto_rawDesc = []byte{
 	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61,
 	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72,
 	0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
-	0x02, 0x38, 0x01, 0x2a, 0x7d, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c,
+	0x74, 0x6f, 0x33,
-	0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f,
-	0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53,
-	0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70,
-	0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68,
-	0x6f, 0x70, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70,
-	0x10, 0x06, 0x12, 0x0e, 0x0a, 0x0a, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x53, 0x68, 0x6f, 0x70,
-	0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
 }
 
 var (
@@ -437,27 +365,25 @@ func file_shop_shop_db_proto_rawDescGZIP() []byte {
 	return file_shop_shop_db_proto_rawDescData
 }
 
-var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
 var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_shop_shop_db_proto_goTypes = []interface{}{
-	(ShopType)(0),          // 0: ShopType
+	(*UserShopGood)(nil),   // 0: UserShopGood
-	(*UserShopGood)(nil),   // 1: UserShopGood
+	(*UserShopData)(nil),   // 1: UserShopData
-	(*UserShopData)(nil),   // 2: UserShopData
+	(*UserShopDataEx)(nil), // 2: UserShopDataEx
-	(*UserShopDataEx)(nil), // 3: UserShopDataEx
+	(*DBShop)(nil),         // 3: DBShop
-	(*DBShop)(nil),         // 4: DBShop
+	nil,                    // 4: UserShopData.PreviewEntry
-	nil,                    // 5: UserShopData.PreviewEntry
+	nil,                    // 5: DBShop.ShopsEntry
-	nil,                    // 6: DBShop.ShopsEntry
+	(*DB_Equipment)(nil),   // 6: DB_Equipment
-	(*DB_Equipment)(nil),   // 7: DB_Equipment
+	(*UserAssets)(nil),     // 7: UserAssets
-	(*UserAssets)(nil),     // 8: UserAssets
 }
 var file_shop_shop_db_proto_depIdxs = []int32{
-	1, // 0: UserShopData.Items:type_name -> UserShopGood
+	0, // 0: UserShopData.Items:type_name -> UserShopGood
-	5, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry
+	4, // 1: UserShopData.preview:type_name -> UserShopData.PreviewEntry
-	7, // 2: UserShopDataEx.equipment:type_name -> DB_Equipment
+	6, // 2: UserShopDataEx.equipment:type_name -> DB_Equipment
-	8, // 3: UserShopDataEx.Need:type_name -> UserAssets
+	7, // 3: UserShopDataEx.Need:type_name -> UserAssets
-	6, // 4: DBShop.shops:type_name -> DBShop.ShopsEntry
+	5, // 4: DBShop.shops:type_name -> DBShop.ShopsEntry
-	3, // 5: UserShopData.PreviewEntry.value:type_name -> UserShopDataEx
+	2, // 5: UserShopData.PreviewEntry.value:type_name -> UserShopDataEx
-	2, // 6: DBShop.ShopsEntry.value:type_name -> UserShopData
+	1, // 6: DBShop.ShopsEntry.value:type_name -> UserShopData
 	7, // [7:7] is the sub-list for method output_type
 	7, // [7:7] is the sub-list for method input_type
 	7, // [7:7] is the sub-list for extension type_name
@@ -527,14 +453,13 @@ func file_shop_shop_db_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_shop_shop_db_proto_rawDesc,
-			NumEnums:      1,
+			NumEnums:      0,
 			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
 		GoTypes:           file_shop_shop_db_proto_goTypes,
 		DependencyIndexes: file_shop_shop_db_proto_depIdxs,
-		EnumInfos:         file_shop_shop_db_proto_enumTypes,
 		MessageInfos:      file_shop_shop_db_proto_msgTypes,
 	}.Build()
 	File_shop_shop_db_proto = out.File

pb/shop_msg.pb.go

@@ -122,7 +122,7 @@ type ShopGetListReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SType           ShopType `protobuf:"varint,1,opt,name=sType,proto3,enum=ShopType" json:"sType"`       //商城类型
+	SType           int32 `protobuf:"varint,1,opt,name=sType,proto3" json:"sType"`                     //商城类型
 	IsManualRefresh bool  `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新
 }
 
@@ -158,11 +158,11 @@ func (*ShopGetListReq) Descriptor() ([]byte, []int) {
 	return file_shop_shop_msg_proto_rawDescGZIP(), []int{1}
 }
 
-func (x *ShopGetListReq) GetSType() ShopType {
+func (x *ShopGetListReq) GetSType() int32 {
 	if x != nil {
 		return x.SType
 	}
-	return ShopType_Null
+	return 0
 }
 
 func (x *ShopGetListReq) GetIsManualRefresh() bool {
@@ -178,7 +178,7 @@ type ShopGetListResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	SType              ShopType    `protobuf:"varint,1,opt,name=sType,proto3,enum=ShopType" json:"sType"`             //商城类型
+	SType              int32       `protobuf:"varint,1,opt,name=sType,proto3" json:"sType"`                           //商城类型
 	IsManualRefresh    bool        `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"`       //是否手动刷新
 	Goods              []*ShopItem `protobuf:"bytes,4,rep,name=Goods,proto3" json:"Goods"`                            //商品列表
 	SurplusRefreshNum  int32       `protobuf:"varint,5,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"`   //剩余手动刷新次数
@@ -218,11 +218,11 @@ func (*ShopGetListResp) Descriptor() ([]byte, []int) {
 	return file_shop_shop_msg_proto_rawDescGZIP(), []int{2}
 }
 
-func (x *ShopGetListResp) GetSType() ShopType {
+func (x *ShopGetListResp) GetSType() int32 {
 	if x != nil {
 		return x.SType
 	}
-	return ShopType_Null
+	return 0
 }
 
 func (x *ShopGetListResp) GetIsManualRefresh() bool {
@@ -266,7 +266,7 @@ type ShopBuyReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ShopType ShopType `protobuf:"varint,1,opt,name=ShopType,proto3,enum=ShopType" json:"ShopType"` //商店类型
+	ShopType int32 `protobuf:"varint,1,opt,name=ShopType,proto3" json:"ShopType"` //商店类型
 	Gid      int32 `protobuf:"varint,2,opt,name=gid,proto3" json:"gid"`           //商品Id
 	BuyNum   int32 `protobuf:"varint,3,opt,name=BuyNum,proto3" json:"BuyNum"`     //商品购买数量
 }
@@ -303,11 +303,11 @@ func (*ShopBuyReq) Descriptor() ([]byte, []int) {
 	return file_shop_shop_msg_proto_rawDescGZIP(), []int{3}
 }
 
-func (x *ShopBuyReq) GetShopType() ShopType {
+func (x *ShopBuyReq) GetShopType() int32 {
 	if x != nil {
 		return x.ShopType
 	}
-	return ShopType_Null
+	return 0
 }
 
 func (x *ShopBuyReq) GetGid() int32 {
@@ -376,57 +376,54 @@ var File_shop_shop_msg_proto protoreflect.FileDescriptor
 
 var file_shop_shop_msg_proto_rawDesc = []byte{
 	0x0a, 0x13, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x73, 0x68, 0x6f, 0x70, 0x5f, 0x6d, 0x73, 0x67, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x73, 0x68, 0x6f, 0x70,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e,
+	0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x2f, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72,
+	0xdd, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03,
-	0x6f, 0x74, 0x6f, 0x22, 0xdd, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d,
+	0x67, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x18,
-	0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67,
+	0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20,
+	0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d,
-	0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x05,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73,
-	0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
+	0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x25, 0x0a, 0x07, 0x43,
-	0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12,
+	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55,
-	0x25, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
+	0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x07, 0x43,
+	0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x61, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
-	0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x61, 0x6c, 0x65, 0x18, 0x05,
+	0x52, 0x04, 0x53, 0x61, 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x65, 0x66, 0x74, 0x42, 0x75,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x61, 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x4c, 0x65,
+	0x79, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x4c, 0x65, 0x66, 0x74,
-	0x66, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
+	0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65,
-	0x4c, 0x65, 0x66, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x72,
+	0x77, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75,
-	0x65, 0x76, 0x69, 0x65, 0x77, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x22,
-	0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x70, 0x72, 0x65, 0x76,
+	0x50, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x69, 0x65, 0x77, 0x22, 0x5b, 0x0a, 0x0e, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69,
+	0x71, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
+	0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75,
+	0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x68, 0x22, 0xfa, 0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
-	0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
+	0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01,
-	0x22, 0x85, 0x02, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49,
-	0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02,
-	0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65,
-	0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61,
+	0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04,
-	0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52,
-	0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12,
+	0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75,
-	0x1f, 0x0a, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
+	0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x2e, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73,
+	0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x12, 0x2c, 0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65,
+	0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72,
-	0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72,
+	0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c,
-	0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28,
+	0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2e,
-	0x0a, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d,
+	0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66,
+	0x68, 0x6e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x65, 0x66, 0x74,
-	0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x65, 0x66, 0x74,
+	0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x52,
-	0x66, 0x72, 0x65, 0x65, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x18, 0x07,
+	0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x65, 0x66, 0x74, 0x66, 0x72, 0x65, 0x65, 0x72, 0x65,
+	0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x6e, 0x75, 0x6d, 0x22, 0x5d, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70,
+	0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18,
-	0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75,
-	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54,
+	0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e,
-	0x79, 0x70, 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a,
+	0x75, 0x6d, 0x22, 0x2e, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73,
-	0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12,
+	0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61,
-	0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x2e, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 0x42,
+	0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
+	0x6f, 0x33,
-	0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
-	0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -450,23 +447,19 @@ var file_shop_shop_msg_proto_goTypes = []interface{}{
 	(*ShopBuyResp)(nil),     // 4: ShopBuyResp
 	(*UserAssets)(nil),      // 5: UserAssets
 	(*DB_Equipment)(nil),    // 6: DB_Equipment
-	(ShopType)(0),           // 7: ShopType
+	(*UserAtno)(nil),        // 7: UserAtno
-	(*UserAtno)(nil),        // 8: UserAtno
 }
 var file_shop_shop_msg_proto_depIdxs = []int32{
 	5, // 0: ShopItem.Items:type_name -> UserAssets
 	5, // 1: ShopItem.Consume:type_name -> UserAssets
 	6, // 2: ShopItem.preview:type_name -> DB_Equipment
-	7, // 3: ShopGetListReq.sType:type_name -> ShopType
+	0, // 3: ShopGetListResp.Goods:type_name -> ShopItem
-	7, // 4: ShopGetListResp.sType:type_name -> ShopType
+	7, // 4: ShopBuyResp.award:type_name -> UserAtno
-	0, // 5: ShopGetListResp.Goods:type_name -> ShopItem
+	5, // [5:5] is the sub-list for method output_type
-	7, // 6: ShopBuyReq.ShopType:type_name -> ShopType
+	5, // [5:5] is the sub-list for method input_type
-	8, // 7: ShopBuyResp.award:type_name -> UserAtno
+	5, // [5:5] is the sub-list for extension type_name
-	8, // [8:8] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for extension extendee
-	8, // [8:8] is the sub-list for method input_type
+	0, // [0:5] is the sub-list for field type_name
-	8, // [8:8] is the sub-list for extension type_name
-	8, // [8:8] is the sub-list for extension extendee
-	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_shop_shop_msg_proto_init() }
@@ -474,7 +467,6 @@ func file_shop_shop_msg_proto_init() {
 	if File_shop_shop_msg_proto != nil {
 		return
 	}
-	file_shop_shop_db_proto_init()
 	file_comm_proto_init()
 	file_equipment_equipment_db_proto_init()
 	if !protoimpl.UnsafeEnabled {

sys/configure/structs/Game.AskedRecruitData.go

@@ -13,6 +13,7 @@ import "errors"
 type GameAskedRecruitData struct {
     Key int32
     Type int32
+    TalkPoint int32
     StoryText string
     OptionText1 string
     OptionText2 string
@@ -27,6 +28,7 @@ func (*GameAskedRecruitData) GetTypeId() int32 {
 func (_v *GameAskedRecruitData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["talkPoint"].(float64); !_ok_ { err = errors.New("talkPoint error"); return }; _v.TalkPoint = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["storyText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.StoryText error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.StoryText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["optionText1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.OptionText1 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.OptionText1, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["optionText2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.OptionText2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.OptionText2, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

sys/configure/structs/Game.CatchbugStageData.go

@@ -20,6 +20,7 @@ type GameCatchbugStageData struct {
     Rewardtime []int32
     Stagedetail string
     Stageskill string
+    Points int32
 }
 
 const TypeId_GameCatchbugStageData = -494646541
@@ -90,6 +91,7 @@ func (_v *GameCatchbugStageData)Deserialize(_buf map[string]interface{}) (err er
 
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stagedetail"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stagedetail error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stagedetail, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["stageskill"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Stageskill error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Stageskill, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["points"].(float64); !_ok_ { err = errors.New("points error"); return }; _v.Points = int32(_tempNum_) }
     return
 }
 

sys/configure/structs/Game.TDWeaponData.go

@@ -26,6 +26,7 @@ type GameTDWeaponData struct {
     ExplosionRange float32
     Catapult int32
     Pro int32
+    ExplosionEffect string
 }
 
 const TypeId_GameTDWeaponData = -310580526
@@ -50,6 +51,7 @@ func (_v *GameTDWeaponData)Deserialize(_buf map[string]interface{}) (err error)
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["explosion_Range"].(float64); !_ok_ { err = errors.New("explosion_Range error"); return }; _v.ExplosionRange = float32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["catapult"].(float64); !_ok_ { err = errors.New("catapult error"); return }; _v.Catapult = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) }
+    { var _ok_ bool; if _v.ExplosionEffect, _ok_ = _buf["explosion_effect"].(string); !_ok_ { err = errors.New("explosion_effect error"); return } }
     return
 }
 

sys/configure/structs/Game.TDWeaponRandomData.go

@@ -14,6 +14,7 @@ type GameTDWeaponRandomData struct {
     Id int32
     WeaponId int32
     SkillId int32
+    SubSkillId []int32
 }
 
 const TypeId_GameTDWeaponRandomData = 108801077
@@ -26,6 +27,20 @@ func (_v *GameTDWeaponRandomData)Deserialize(_buf map[string]interface{}) (err e
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weapon_id"].(float64); !_ok_ { err = errors.New("weapon_id error"); return }; _v.WeaponId = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["subSkill_id"].([]interface{}); !_ok_ { err = errors.New("subSkill_id error"); return }
+
+                _v.SubSkillId = make([]int32, 0, len(_arr_))
+                
+                for _, _e_ := range _arr_ {
+                    var _list_v_ int32
+                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    _v.SubSkillId = append(_v.SubSkillId, _list_v_)
+                }
+            }
+
     return
 }
 

sys/configure/structs/Game.TDWeaponSkillData.go

@@ -15,6 +15,8 @@ type GameTDWeaponSkillData struct {
     Icon string
     Name string
     Describe string
+    TriggerType int32
+    TriggerPro int32
     Skilltype []int32
     Value []int32
     Maxlv int32
@@ -32,6 +34,8 @@ func (_v *GameTDWeaponSkillData)Deserialize(_buf map[string]interface{}) (err er
     { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_type"].(float64); !_ok_ { err = errors.New("trigger_type error"); return }; _v.TriggerType = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["trigger_pro"].(float64); !_ok_ { err = errors.New("trigger_pro error"); return }; _v.TriggerPro = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/Tables.go

@@ -292,7 +292,6 @@ type Tables struct {
     PuggsyFight *GamePuggsyFight
     PuggsyScore *GamePuggsyScore
     PuggsySkill *GamePuggsySkill
-    PuggsyPasscheck *GamePuggsyPasscheck
     Catchrabbit *GameCatchrabbit
     Unblanking *GameUnblanking
     CatchbugSset *GameCatchbugSset
@@ -2003,12 +2002,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.PuggsySkill, err = NewGamePuggsySkill(buf) ; err != nil {
         return nil, err
     }
-    if buf, err = loader("game_puggsypasscheck") ; err != nil {
-        return nil, err
-    }
-    if tables.PuggsyPasscheck, err = NewGamePuggsyPasscheck(buf) ; err != nil {
-        return nil, err
-    }
     if buf, err = loader("game_catchrabbit") ; err != nil {
         return nil, err
     }