上传代码

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,
@@ -2959,5 +2959,33 @@
       "key": "",
       "text": ""
     }
+  },
+  {
+    "id": "buzkashi",
+    "name": {
+      "key": "opencond_opencond_name_107",
+      "text": "捕羊大赛"
+    },
+    "main": [
+      {
+        "key": 2,
+        "param": 1101030
+      }
+    ],
+    "wkqbx": 0,
+    "img": "icon_sytj",
+    "prompt": {
+      "key": "opencond_opencond_prompt_88",
+      "text": "继续完成更多主线任务开启"
+    },
+    "uiid": 0,
+    "activateType": 0,
+    "notify": [],
+    "kqbx": 0,
+    "kqbx_ui": "",
+    "kqbx_text": {
+      "key": "",
+      "text": ""
+    }
   }
 ]

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_privilegecard.json

@@ -1,6 +1,5 @@
 [
   {
-    "id": "yueka_lv1",
     "pType": 1,
     "name": "经典月卡",
     "assert_day": 30,
@@ -26,10 +25,10 @@
     ],
     "privilege_id": [
       20201
-    ]
+    ],
+    "id": "yueka_lv1"
   },
   {
-    "id": "yueka_lv2",
     "pType": 2,
     "name": "典藏月卡",
     "assert_day": 30,
@@ -55,16 +54,7 @@
     ],
     "privilege_id": [
       20201
-    ]
+    ],
-  },
+    "id": "yueka_lv2"
-  {
-    "id": "passcheck_1",
-    "pType": 3,
-    "name": "爬塔战令",
-    "assert_day": 30,
-    "renew_day": 0,
-    "day_reward": [],
-    "disposable_reward": [],
-    "privilege_id": []
   }
 ]

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": []
   },
   {
@@ -569,7 +569,7 @@
     "auto_accept": 1,
     "tasktips": 0,
     "deliver_task": 0,
-    "lock_add": 0,
+    "lock_add": 1,
     "finish": [],
     "finishparameter": "",
     "fnishipoint": [],

modules/robot/configure.go

@@ -28,6 +28,8 @@ const (
 	game_horoscope = "game_horoscope.json" //星阵图
 
 	game_combatlevel = "game_combatlevel.json" //关卡编辑器
+
+	hero_talentbox = "game_talentbox.json" // 天赋详细数据
 )
 
 type configureComp struct {

modules/robot/modulerobot_hero.go

@@ -223,7 +223,29 @@ func (this *ModuleRobot_Hero) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskDa
 			err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
 			return
 		}
+	case comm.Rtype33:
+		req := &pb.HeroAwakenReq{}
+		for _, v := range this.heros {
+			data, _ := this.GMGetTalentByHeroId(v.HeroID)
+			if int(v.JuexingLv) > 1 && 0 < len(data) {
+				req.HeroObjID = v.Id
+				break
+			}
+			if this.GetHeroTalentMaxLv(v.HeroID) > 10 {
+				continue
+			}
 
+			req.HeroObjID = v.Id
+			break
+		}
+		if req.HeroObjID == "" {
+			err = errors.New(fmt.Sprintf("code:%d message:not found hero", errdata.Code))
+			return
+		}
+		if _, errdata = robot.SendTaskMessage(taskconf.Key, condconf.Id, "hero", "awaken", req); errdata != nil {
+			err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message))
+			return
+		}
 	}
 	return
 }
@@ -310,3 +332,12 @@ func (this *ModuleRobot_Hero) GetHeroAwalenConf(hid string) (data []*cfg.GameHer
 	}
 	return
 }
+func (this *ModuleRobot_Hero) GetHeroTalentMaxLv(heroid string) (maxlv int32) {
+	if v, err := configure.GetConfigure(hero_talentbox); err == nil {
+		if configure, ok := v.(*cfg.GameTalentBox); ok {
+			return int32(len(configure.GetDataList()))
+		}
+	}
+
+	return 0
+}

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/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,8 +122,8 @@ 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"` //是否手动刷新
+	IsManualRefresh bool  `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新
 }
 
 func (x *ShopGetListReq) Reset() {
@@ -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,9 +266,9 @@ 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
+	Gid      int32 `protobuf:"varint,2,opt,name=gid,proto3" json:"gid"`           //商品Id
-	BuyNum   int32    `protobuf:"varint,3,opt,name=BuyNum,proto3" json:"BuyNum"`                   //商品购买数量
+	BuyNum   int32 `protobuf:"varint,3,opt,name=BuyNum,proto3" json:"BuyNum"`     //商品购买数量
 }
 
 func (x *ShopBuyReq) Reset() {
@@ -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.OpencondType.go

@@ -14,4 +14,5 @@ const (
     GameOpencondType_Maxmapid = 2
     GameOpencondType_Worldtaskid = 3
     GameOpencondType_Friend = 4
+    GameOpencondType_MoonLevel = 5
 )

sys/configure/structs/Game.PrivilegeCard.go

@@ -9,25 +9,25 @@
 package cfg
 
 type GamePrivilegeCard struct {
-    _dataMap map[string]*GamePrivilegeCardData
+    _dataMap map[int32]*GamePrivilegeCardData
     _dataList []*GamePrivilegeCardData
 }
 
 func NewGamePrivilegeCard(_buf []map[string]interface{}) (*GamePrivilegeCard, error) {
 	_dataList := make([]*GamePrivilegeCardData, 0, len(_buf))
-	dataMap := make(map[string]*GamePrivilegeCardData)
+	dataMap := make(map[int32]*GamePrivilegeCardData)
 	for _, _ele_ := range _buf {
 		if _v, err2 := DeserializeGamePrivilegeCardData(_ele_); err2 != nil {
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Id] = _v
+			dataMap[_v.PType] = _v
 		}
 	}
 	return &GamePrivilegeCard{_dataList:_dataList, _dataMap:dataMap}, nil
 }
 
-func (table *GamePrivilegeCard) GetDataMap() map[string]*GamePrivilegeCardData {
+func (table *GamePrivilegeCard) GetDataMap() map[int32]*GamePrivilegeCardData {
     return table._dataMap
 }
 
@@ -35,7 +35,7 @@ func (table *GamePrivilegeCard) GetDataList() []*GamePrivilegeCardData {
     return table._dataList
 }
 
-func (table *GamePrivilegeCard) Get(key string) *GamePrivilegeCardData {
+func (table *GamePrivilegeCard) Get(key int32) *GamePrivilegeCardData {
     return table._dataMap[key]
 }
 

sys/configure/structs/Game.PrivilegeCardData.go

@@ -11,7 +11,6 @@ package cfg
 import "errors"
 
 type GamePrivilegeCardData struct {
-    Id string
     PType int32
     Name string
     AssertDay int32
@@ -19,6 +18,7 @@ type GamePrivilegeCardData struct {
     DayReward []*Gameatn
     DisposableReward []*Gameatn
     PrivilegeId []int32
+    Id string
 }
 
 const TypeId_GamePrivilegeCardData = 1735553455
@@ -28,7 +28,6 @@ func (*GamePrivilegeCardData) GetTypeId() int32 {
 }
 
 func (_v *GamePrivilegeCardData)Deserialize(_buf map[string]interface{}) (err error) {
-    { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pType"].(float64); !_ok_ { err = errors.New("pType error"); return }; _v.PType = int32(_tempNum_) }
     { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["assert_day"].(float64); !_ok_ { err = errors.New("assert_day error"); return }; _v.AssertDay = int32(_tempNum_) }
@@ -75,6 +74,7 @@ func (_v *GamePrivilegeCardData)Deserialize(_buf map[string]interface{}) (err er
                 }
             }
 
+    { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
     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
     }