From b02ea8c70373ae47565d648886ff002e136bdcfe Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Wed, 19 Jul 2023 14:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_battleready.json |   4 +-
 bin/json/game_cardpool.json    | 516 +++++++++++++++++++++++++++++++++
 bin/json/game_global.json      |   2 +-
 bin/json/game_rdtasknpc.json   |  90 ++++--
 bin/json/game_skillbuff.json   |   4 +-
 5 files changed, 581 insertions(+), 35 deletions(-)

diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json
index fd947a339..6a741fc73 100644
--- a/bin/json/game_battleready.json
+++ b/bin/json/game_battleready.json
@@ -339,7 +339,7 @@
     "LockSlots": [],
     "AssistTeam": 0,
     "CanFriendHelp": 0,
-    "Numrounds": 0
+    "Numrounds": 100
   },
   {
     "id": 118,
@@ -480,7 +480,7 @@
     "HeroCount": 5,
     "readyScene": "scenesfight_role_interface_02",
     "battleScenes": [
-      "bossfight_chef_02"
+      "bossfight_translate_01"
     ],
     "disableAiCamera": 1,
     "ChoseCamp": [],
diff --git a/bin/json/game_cardpool.json b/bin/json/game_cardpool.json
index 5f0e5cab6..62b3a81fb 100644
--- a/bin/json/game_cardpool.json
+++ b/bin/json/game_cardpool.json
@@ -1648,5 +1648,521 @@
     "card_pool_type": "camp4_pool",
     "id": "45004",
     "weight": 1000
+  },
+  {
+    "key": 277,
+    "card_pool_type": "pro_pool70003",
+    "id": "24002",
+    "weight": 36
+  },
+  {
+    "key": 278,
+    "card_pool_type": "pro_pool70003",
+    "id": "13003",
+    "weight": 36
+  },
+  {
+    "key": 279,
+    "card_pool_type": "pro_pool70003",
+    "id": "43006",
+    "weight": 9
+  },
+  {
+    "key": 280,
+    "card_pool_type": "pro_pool70003",
+    "id": "43001",
+    "weight": 9
+  },
+  {
+    "key": 281,
+    "card_pool_type": "pro_pool70003",
+    "id": "13001",
+    "weight": 36
+  },
+  {
+    "key": 282,
+    "card_pool_type": "pro_pool70003",
+    "id": "33002",
+    "weight": 36
+  },
+  {
+    "key": 283,
+    "card_pool_type": "pro_pool70003",
+    "id": "13005",
+    "weight": 36
+  },
+  {
+    "key": 284,
+    "card_pool_type": "pro_pool70003",
+    "id": "23004",
+    "weight": 36
+  },
+  {
+    "key": 285,
+    "card_pool_type": "pro_pool70003",
+    "id": "13004",
+    "weight": 36
+  },
+  {
+    "key": 286,
+    "card_pool_type": "pro_pool70003",
+    "id": "43003",
+    "weight": 9
+  },
+  {
+    "key": 287,
+    "card_pool_type": "pro_pool70003",
+    "id": "13002",
+    "weight": 36
+  },
+  {
+    "key": 288,
+    "card_pool_type": "pro_pool70003",
+    "id": "33003",
+    "weight": 36
+  },
+  {
+    "key": 289,
+    "card_pool_type": "pro_pool70003",
+    "id": "43002",
+    "weight": 9
+  },
+  {
+    "key": 290,
+    "card_pool_type": "pro_pool70004",
+    "id": "24004",
+    "weight": 27
+  },
+  {
+    "key": 291,
+    "card_pool_type": "pro_pool70004",
+    "id": "24008",
+    "weight": 27
+  },
+  {
+    "key": 292,
+    "card_pool_type": "pro_pool70004",
+    "id": "24003",
+    "weight": 27
+  },
+  {
+    "key": 293,
+    "card_pool_type": "pro_pool70004",
+    "id": "24005",
+    "weight": 27
+  },
+  {
+    "key": 294,
+    "card_pool_type": "pro_pool70004",
+    "id": "14001",
+    "weight": 27
+  },
+  {
+    "key": 295,
+    "card_pool_type": "pro_pool70004",
+    "id": "34007",
+    "weight": 27
+  },
+  {
+    "key": 296,
+    "card_pool_type": "pro_pool70004",
+    "id": "14003",
+    "weight": 27
+  },
+  {
+    "key": 297,
+    "card_pool_type": "pro_pool70004",
+    "id": "14007",
+    "weight": 27
+  },
+  {
+    "key": 298,
+    "card_pool_type": "pro_pool70004",
+    "id": "34006",
+    "weight": 27
+  },
+  {
+    "key": 299,
+    "card_pool_type": "pro_pool70004",
+    "id": "34002",
+    "weight": 27
+  },
+  {
+    "key": 300,
+    "card_pool_type": "pro_pool70004",
+    "id": "44005",
+    "weight": 16
+  },
+  {
+    "key": 301,
+    "card_pool_type": "pro_pool70004",
+    "id": "44006",
+    "weight": 16
+  },
+  {
+    "key": 302,
+    "card_pool_type": "pro_pool70004",
+    "id": "14005",
+    "weight": 27
+  },
+  {
+    "key": 303,
+    "card_pool_type": "pro_pool70004",
+    "id": "24001",
+    "weight": 27
+  },
+  {
+    "key": 304,
+    "card_pool_type": "pro_pool70004",
+    "id": "34008",
+    "weight": 27
+  },
+  {
+    "key": 305,
+    "card_pool_type": "pro_pool70004",
+    "id": "34003",
+    "weight": 27
+  },
+  {
+    "key": 306,
+    "card_pool_type": "pro_pool70004",
+    "id": "24009",
+    "weight": 27
+  },
+  {
+    "key": 307,
+    "card_pool_type": "pro_pool70004",
+    "id": "34005",
+    "weight": 27
+  },
+  {
+    "key": 308,
+    "card_pool_type": "pro_pool70004",
+    "id": "44004",
+    "weight": 16
+  },
+  {
+    "key": 309,
+    "card_pool_type": "pro_pool70005",
+    "id": "25001",
+    "weight": 100
+  },
+  {
+    "key": 310,
+    "card_pool_type": "pro_pool70005",
+    "id": "25004",
+    "weight": 100
+  },
+  {
+    "key": 311,
+    "card_pool_type": "pro_pool70005",
+    "id": "15005",
+    "weight": 100
+  },
+  {
+    "key": 312,
+    "card_pool_type": "pro_pool70005",
+    "id": "35006",
+    "weight": 100
+  },
+  {
+    "key": 313,
+    "card_pool_type": "pro_pool70005",
+    "id": "45003",
+    "weight": 0
+  },
+  {
+    "key": 314,
+    "card_pool_type": "pro_pool70005",
+    "id": "35001",
+    "weight": 100
+  },
+  {
+    "key": 315,
+    "card_pool_type": "pro_pool70005",
+    "id": "15004",
+    "weight": 100
+  },
+  {
+    "key": 316,
+    "card_pool_type": "pro_pool70005",
+    "id": "45001",
+    "weight": 0
+  },
+  {
+    "key": 317,
+    "card_pool_type": "pro_pool70005",
+    "id": "35005",
+    "weight": 100
+  },
+  {
+    "key": 318,
+    "card_pool_type": "pro_pool70005",
+    "id": "15002",
+    "weight": 100
+  },
+  {
+    "key": 319,
+    "card_pool_type": "pro_pool70005",
+    "id": "15003",
+    "weight": 100
+  },
+  {
+    "key": 320,
+    "card_pool_type": "base_pool70003",
+    "id": "24002",
+    "weight": 36
+  },
+  {
+    "key": 321,
+    "card_pool_type": "base_pool70003",
+    "id": "13003",
+    "weight": 36
+  },
+  {
+    "key": 322,
+    "card_pool_type": "base_pool70003",
+    "id": "43006",
+    "weight": 9
+  },
+  {
+    "key": 323,
+    "card_pool_type": "base_pool70003",
+    "id": "43001",
+    "weight": 9
+  },
+  {
+    "key": 324,
+    "card_pool_type": "base_pool70003",
+    "id": "13001",
+    "weight": 36
+  },
+  {
+    "key": 325,
+    "card_pool_type": "base_pool70003",
+    "id": "33002",
+    "weight": 36
+  },
+  {
+    "key": 326,
+    "card_pool_type": "base_pool70003",
+    "id": "13005",
+    "weight": 36
+  },
+  {
+    "key": 327,
+    "card_pool_type": "base_pool70003",
+    "id": "23004",
+    "weight": 36
+  },
+  {
+    "key": 328,
+    "card_pool_type": "base_pool70003",
+    "id": "13004",
+    "weight": 36
+  },
+  {
+    "key": 329,
+    "card_pool_type": "base_pool70003",
+    "id": "43003",
+    "weight": 9
+  },
+  {
+    "key": 330,
+    "card_pool_type": "base_pool70003",
+    "id": "13002",
+    "weight": 36
+  },
+  {
+    "key": 331,
+    "card_pool_type": "base_pool70003",
+    "id": "33003",
+    "weight": 36
+  },
+  {
+    "key": 332,
+    "card_pool_type": "base_pool70003",
+    "id": "43002",
+    "weight": 9
+  },
+  {
+    "key": 333,
+    "card_pool_type": "base_pool70004",
+    "id": "24004",
+    "weight": 27
+  },
+  {
+    "key": 334,
+    "card_pool_type": "base_pool70004",
+    "id": "24008",
+    "weight": 27
+  },
+  {
+    "key": 335,
+    "card_pool_type": "base_pool70004",
+    "id": "24003",
+    "weight": 27
+  },
+  {
+    "key": 336,
+    "card_pool_type": "base_pool70004",
+    "id": "24005",
+    "weight": 27
+  },
+  {
+    "key": 337,
+    "card_pool_type": "base_pool70004",
+    "id": "14001",
+    "weight": 27
+  },
+  {
+    "key": 338,
+    "card_pool_type": "base_pool70004",
+    "id": "34007",
+    "weight": 27
+  },
+  {
+    "key": 339,
+    "card_pool_type": "base_pool70004",
+    "id": "14003",
+    "weight": 27
+  },
+  {
+    "key": 340,
+    "card_pool_type": "base_pool70004",
+    "id": "14007",
+    "weight": 27
+  },
+  {
+    "key": 341,
+    "card_pool_type": "base_pool70004",
+    "id": "34006",
+    "weight": 27
+  },
+  {
+    "key": 342,
+    "card_pool_type": "base_pool70004",
+    "id": "34002",
+    "weight": 27
+  },
+  {
+    "key": 343,
+    "card_pool_type": "base_pool70004",
+    "id": "44005",
+    "weight": 16
+  },
+  {
+    "key": 344,
+    "card_pool_type": "base_pool70004",
+    "id": "44006",
+    "weight": 16
+  },
+  {
+    "key": 345,
+    "card_pool_type": "base_pool70004",
+    "id": "14005",
+    "weight": 27
+  },
+  {
+    "key": 346,
+    "card_pool_type": "base_pool70004",
+    "id": "24001",
+    "weight": 27
+  },
+  {
+    "key": 347,
+    "card_pool_type": "base_pool70004",
+    "id": "34008",
+    "weight": 27
+  },
+  {
+    "key": 348,
+    "card_pool_type": "base_pool70004",
+    "id": "34003",
+    "weight": 27
+  },
+  {
+    "key": 349,
+    "card_pool_type": "base_pool70004",
+    "id": "24009",
+    "weight": 27
+  },
+  {
+    "key": 350,
+    "card_pool_type": "base_pool70004",
+    "id": "34005",
+    "weight": 27
+  },
+  {
+    "key": 351,
+    "card_pool_type": "base_pool70004",
+    "id": "44004",
+    "weight": 16
+  },
+  {
+    "key": 352,
+    "card_pool_type": "base_pool70005",
+    "id": "25001",
+    "weight": 18
+  },
+  {
+    "key": 353,
+    "card_pool_type": "base_pool70005",
+    "id": "25004",
+    "weight": 18
+  },
+  {
+    "key": 354,
+    "card_pool_type": "base_pool70005",
+    "id": "15005",
+    "weight": 18
+  },
+  {
+    "key": 355,
+    "card_pool_type": "base_pool70005",
+    "id": "35006",
+    "weight": 18
+  },
+  {
+    "key": 356,
+    "card_pool_type": "base_pool70005",
+    "id": "45003",
+    "weight": 9
+  },
+  {
+    "key": 357,
+    "card_pool_type": "base_pool70005",
+    "id": "35001",
+    "weight": 18
+  },
+  {
+    "key": 358,
+    "card_pool_type": "base_pool70005",
+    "id": "15004",
+    "weight": 18
+  },
+  {
+    "key": 359,
+    "card_pool_type": "base_pool70005",
+    "id": "45001",
+    "weight": 9
+  },
+  {
+    "key": 360,
+    "card_pool_type": "base_pool70005",
+    "id": "35005",
+    "weight": 18
+  },
+  {
+    "key": 361,
+    "card_pool_type": "base_pool70005",
+    "id": "15002",
+    "weight": 18
+  },
+  {
+    "key": 362,
+    "card_pool_type": "base_pool70005",
+    "id": "15003",
+    "weight": 18
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 807ed7b7c..b0d432f51 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -43,7 +43,7 @@
     "load_chat": 10,
     "channel_allocation_max": 2000,
     "channel_switching_max": 3000,
-    "draw_toplimit": 20,
+    "draw_toplimit": 9999,
     "draw10_star4_max": 8,
     "draw10_star5_max": 2,
     "draw_floor_star4": 20,
diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json
index a260fbfb2..9de568279 100644
--- a/bin/json/game_rdtasknpc.json
+++ b/bin/json/game_rdtasknpc.json
@@ -5251,7 +5251,8 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
-      "武馆的老虎"
+      "武馆的老虎",
+      "137"
     ],
     "event": [
       2,
@@ -5263,7 +5264,8 @@
     "id": 300018,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5274,7 +5276,8 @@
     "id": 300019,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5286,7 +5289,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "烹饪处的阿宝"
+      "烹饪处的阿宝",
+      "901"
     ],
     "event": [
       2,
@@ -5299,7 +5303,8 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
-      "武馆的老虎"
+      "武馆的老虎",
+      "137"
     ],
     "event": [
       2,
@@ -5312,7 +5317,8 @@
     "heroid": 25001,
     "datas": [
       "WuGuanScene",
-      "武馆的老虎"
+      "武馆的老虎",
+      "137"
     ],
     "event": [
       2,
@@ -5325,7 +5331,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "功能入口-维京远征"
+      "功能入口-维京远征",
+      "901"
     ],
     "event": [
       2,
@@ -5338,7 +5345,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "装木炭的箱子"
+      "装木炭的箱子",
+      "901"
     ],
     "event": [],
     "goto": 0
@@ -5348,7 +5356,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "功能入口-维京远征"
+      "功能入口-维京远征",
+      "901"
     ],
     "event": [
       2,
@@ -5361,7 +5370,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "希卡普旁的亚丝翠"
+      "希卡普旁的亚丝翠",
+      "901"
     ],
     "event": [
       2,
@@ -5374,7 +5384,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "亚丝翠旁的鼻涕粗"
+      "亚丝翠旁的鼻涕粗",
+      "901"
     ],
     "event": [
       1,
@@ -5386,7 +5397,8 @@
     "id": 300049,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5398,7 +5410,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "亚丝翠旁的鼻涕粗"
+      "亚丝翠旁的鼻涕粗",
+      "901"
     ],
     "event": [
       2,
@@ -5411,7 +5424,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "亚丝翠旁的鼻涕粗"
+      "亚丝翠旁的鼻涕粗",
+      "901"
     ],
     "event": [
       1,
@@ -5423,7 +5437,8 @@
     "id": 300059,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5435,7 +5450,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "亚丝翠旁的鼻涕粗"
+      "亚丝翠旁的鼻涕粗",
+      "901"
     ],
     "event": [
       2,
@@ -5447,7 +5463,8 @@
     "id": 300068,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5458,7 +5475,8 @@
     "id": 300069,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5470,7 +5488,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "车站旁的鼻涕粗"
+      "车站旁的鼻涕粗",
+      "901"
     ],
     "event": [
       2,
@@ -5482,7 +5501,8 @@
     "id": 300618,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5493,7 +5513,8 @@
     "id": 300619,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5505,7 +5526,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "希卡普旁的亚丝翠"
+      "希卡普旁的亚丝翠",
+      "901"
     ],
     "event": [
       2,
@@ -5517,7 +5539,8 @@
     "id": 300628,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5528,7 +5551,8 @@
     "id": 300629,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5540,7 +5564,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "功能入口-烹饪"
+      "功能入口-烹饪",
+      "901"
     ],
     "event": [
       2,
@@ -5552,7 +5577,8 @@
     "id": 300078,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5563,7 +5589,8 @@
     "id": 300079,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5575,7 +5602,8 @@
     "heroid": 25001,
     "datas": [
       "GameMain",
-      "铁匠铺门口的暴芙那特"
+      "铁匠铺门口的暴芙那特",
+      "901"
     ],
     "event": [
       2,
@@ -5587,7 +5615,8 @@
     "id": 300088,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
@@ -5598,7 +5627,8 @@
     "id": 300089,
     "heroid": 25001,
     "datas": [
-      "GameMain"
+      "GameMain",
+      "901"
     ],
     "event": [
       0
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index 9d583b0ee..f3d681fdb 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -6,7 +6,7 @@
       "text": "[color=#37d8a9]攻击提升[/color] "
     },
     "Desc": {
-      "key": "skill_skill_buff_Desc_390001001",
+      "key": "780002904",
       "text": "攻击提升60%。"
     },
     "BuffType": 1,
@@ -324,7 +324,7 @@
     },
     "BuffType": 30,
     "EffectArgu": [
-      -1,
+      14,
       100
     ],
     "BufParNum": 1,