From 9ebd649f40c20b91e9580d20d00b05a73ffdeb5d Mon Sep 17 00:00:00 2001
From: jingyushiwo <751360932@qq.com>
Date: Wed, 15 Sep 2021 15:35:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=E7=BB=83=E5=85=B5=E5=9C=BA?=
 =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/jsons/dic_army_trainGk_info.json | 282 ++++++++++++++++++
 .../resource/jsons/dic_army_trainJuDian.json  |  24 +-
 2 files changed, 294 insertions(+), 12 deletions(-)
 create mode 100644 shared/resource/jsons/dic_army_trainGk_info.json

diff --git a/shared/resource/jsons/dic_army_trainGk_info.json b/shared/resource/jsons/dic_army_trainGk_info.json
new file mode 100644
index 000000000..c6fe37026
--- /dev/null
+++ b/shared/resource/jsons/dic_army_trainGk_info.json
@@ -0,0 +1,282 @@
+[
+    {
+        "id": 1,
+        "name": "试炼1-初出茅庐",
+        "count": 1,
+        "heroid": 1,
+        "war_id": "8501&8502&8503"
+    },
+    {
+        "id": 2,
+        "name": "试炼1-初出茅庐",
+        "count": 2,
+        "heroid": 44,
+        "war_id": "8501&8502&8503"
+    },
+    {
+        "id": 3,
+        "name": "试炼1-初出茅庐",
+        "count": 3,
+        "heroid": 5,
+        "war_id": "8501&8502&8503"
+    },
+    {
+        "id": 4,
+        "name": "试炼1-初出茅庐",
+        "count": 4,
+        "heroid": 7,
+        "war_id": "8501&8502&8503"
+    },
+    {
+        "id": 5,
+        "name": "试炼2-过关斩将",
+        "count": 1,
+        "heroid": 2,
+        "war_id": "8504&8505&8506"
+    },
+    {
+        "id": 6,
+        "name": "试炼2-过关斩将",
+        "count": 2,
+        "heroid": 44,
+        "war_id": "8504&8505&8506"
+    },
+    {
+        "id": 7,
+        "name": "试炼2-过关斩将",
+        "count": 3,
+        "heroid": 5,
+        "war_id": "8504&8505&8506"
+    },
+    {
+        "id": 8,
+        "name": "试炼2-过关斩将",
+        "count": 4,
+        "heroid": 7,
+        "war_id": "8504&8505&8506"
+    },
+    {
+        "id": 9,
+        "name": "试炼3-黄巾起义",
+        "count": 1,
+        "heroid": 7,
+        "war_id": "8507&8508&8509"
+    },
+    {
+        "id": 10,
+        "name": "试炼3-黄巾起义",
+        "count": 2,
+        "heroid": 8,
+        "war_id": "8507&8508&8509"
+    },
+    {
+        "id": 11,
+        "name": "试炼3-黄巾起义",
+        "count": 3,
+        "heroid": 9,
+        "war_id": "8507&8508&8509"
+    },
+    {
+        "id": 12,
+        "name": "试炼3-黄巾起义",
+        "count": 4,
+        "heroid": 10,
+        "war_id": "8507&8508&8509"
+    },
+    {
+        "id": 13,
+        "name": "试炼4-火烧赤壁",
+        "count": 1,
+        "heroid": 11,
+        "war_id": "8510&8511&8512"
+    },
+    {
+        "id": 14,
+        "name": "试炼4-火烧赤壁",
+        "count": 2,
+        "heroid": 12,
+        "war_id": "8510&8511&8512"
+    },
+    {
+        "id": 15,
+        "name": "试炼4-火烧赤壁",
+        "count": 3,
+        "heroid": 13,
+        "war_id": "8510&8511&8512"
+    },
+    {
+        "id": 16,
+        "name": "试炼4-火烧赤壁",
+        "count": 4,
+        "heroid": 14,
+        "war_id": "8510&8511&8512"
+    },
+    {
+        "id": 17,
+        "name": "试炼5-官渡之战",
+        "count": 1,
+        "heroid": 7,
+        "war_id": "8513&8514&8515"
+    },
+    {
+        "id": 18,
+        "name": "试炼5-官渡之战",
+        "count": 2,
+        "heroid": 8,
+        "war_id": "8513&8514&8515"
+    },
+    {
+        "id": 19,
+        "name": "试炼5-官渡之战",
+        "count": 3,
+        "heroid": 9,
+        "war_id": "8513&8514&8515"
+    },
+    {
+        "id": 20,
+        "name": "试炼5-官渡之战",
+        "count": 4,
+        "heroid": 11,
+        "war_id": "8513&8514&8515"
+    },
+    {
+        "id": 21,
+        "name": "试炼6- 后起之秀",
+        "count": 1,
+        "heroid": 11,
+        "war_id": "8516&8517&8518"
+    },
+    {
+        "id": 22,
+        "name": "试炼6- 后起之秀",
+        "count": 2,
+        "heroid": 12,
+        "war_id": "8516&8517&8518"
+    },
+    {
+        "id": 23,
+        "name": "试炼6- 后起之秀",
+        "count": 3,
+        "heroid": 13,
+        "war_id": "8516&8517&8518"
+    },
+    {
+        "id": 24,
+        "name": "试炼6- 后起之秀",
+        "count": 4,
+        "heroid": 15,
+        "war_id": "8516&8517&8518"
+    },
+    {
+        "id": 25,
+        "name": "试炼7- 分庭抗礼",
+        "count": 1,
+        "heroid": 7,
+        "war_id": "8519&8520&8521"
+    },
+    {
+        "id": 26,
+        "name": "试炼7- 分庭抗礼",
+        "count": 2,
+        "heroid": 8,
+        "war_id": "8519&8520&8521"
+    },
+    {
+        "id": 27,
+        "name": "试炼7- 分庭抗礼",
+        "count": 3,
+        "heroid": 9,
+        "war_id": "8519&8520&8521"
+    },
+    {
+        "id": 28,
+        "name": "试炼7- 分庭抗礼",
+        "count": 4,
+        "heroid": 12,
+        "war_id": "8519&8520&8521"
+    },
+    {
+        "id": 29,
+        "name": "试炼8- 群雄逐鹿",
+        "count": 1,
+        "heroid": 11,
+        "war_id": "8522&8523&8524"
+    },
+    {
+        "id": 30,
+        "name": "试炼8- 群雄逐鹿",
+        "count": 2,
+        "heroid": 12,
+        "war_id": "8522&8523&8524"
+    },
+    {
+        "id": 31,
+        "name": "试炼8- 群雄逐鹿",
+        "count": 3,
+        "heroid": 13,
+        "war_id": "8522&8523&8524"
+    },
+    {
+        "id": 32,
+        "name": "试炼8- 群雄逐鹿",
+        "count": 4,
+        "heroid": 16,
+        "war_id": "8522&8523&8524"
+    },
+    {
+        "id": 33,
+        "name": "试炼9-三足鼎立",
+        "count": 1,
+        "heroid": 7,
+        "war_id": "8525&8526&8527"
+    },
+    {
+        "id": 34,
+        "name": "试炼9-三足鼎立",
+        "count": 2,
+        "heroid": 8,
+        "war_id": "8525&8526&8527"
+    },
+    {
+        "id": 35,
+        "name": "试炼9-三足鼎立",
+        "count": 3,
+        "heroid": 9,
+        "war_id": "8525&8526&8527"
+    },
+    {
+        "id": 36,
+        "name": "试炼9-三足鼎立",
+        "count": 4,
+        "heroid": 13,
+        "war_id": "8525&8526&8527"
+    },
+    {
+        "id": 37,
+        "name": "试炼10-封金挂印",
+        "count": 1,
+        "heroid": 11,
+        "war_id": "8528&8529&8530"
+    },
+    {
+        "id": 38,
+        "name": "试炼10-封金挂印",
+        "count": 2,
+        "heroid": 12,
+        "war_id": "8528&8529&8530"
+    },
+    {
+        "id": 39,
+        "name": "试炼10-封金挂印",
+        "count": 3,
+        "heroid": 13,
+        "war_id": "8528&8529&8530"
+    },
+    {
+        "id": 40,
+        "name": "试炼10-封金挂印",
+        "count": 4,
+        "heroid": 17,
+        "war_id": "8528&8529&8530"
+    }
+]
\ No newline at end of file
diff --git a/shared/resource/jsons/dic_army_trainJuDian.json b/shared/resource/jsons/dic_army_trainJuDian.json
index 2cd66839e..905a50f0a 100644
--- a/shared/resource/jsons/dic_army_trainJuDian.json
+++ b/shared/resource/jsons/dic_army_trainJuDian.json
@@ -3,9 +3,9 @@
         "id": 1,
         "id_1": 1,
         "name": "试炼1-初出茅庐",
-        "count": 4,
-        "heroid": "1&44&5&4",
-        "gkid": "1&8501&800|44&8502&800|5&8503&800|7&8504&800",
+        "count": 1,
+        "heroid": "1&44&5&7",
+        "gkid": "1&1&800|44&2&800|5&3&800|7&4&800",
         "shilianReward": "40005&6000|20001&60|21008&30|42008&10",
         "soloRewardRatio": 1,
         "jinjieReward": "40005&2000|31002&3000"
@@ -16,7 +16,7 @@
         "name": "试炼2-过关斩将",
         "count": 4,
         "heroid": "2&44&5&7",
-        "gkid": "2&8505&800|44&8506&800|5&8507&800|7&8508&800",
+        "gkid": "2&5&800|44&6&800|5&7&800|7&8&800",
         "shilianReward": "40005&4000|20001&60|21008&30|42008&11",
         "soloRewardRatio": 1.1,
         "jinjieReward": "40005&3000|31002&3000"
@@ -27,7 +27,7 @@
         "name": "试炼3-黄巾起义",
         "count": 4,
         "heroid": "7&8&9&10",
-        "gkid": "7&8509&800|8&8510&800|9&8511&800|10&8512&800",
+        "gkid": "7&9&800|8&10&800|9&11&800|10&12&800",
         "shilianReward": "40005&3000|20001&60|21008&30|42008&12",
         "soloRewardRatio": 1.2,
         "jinjieReward": "40005&2000|31002&3001"
@@ -38,7 +38,7 @@
         "name": "试炼4-火烧赤壁",
         "count": 4,
         "heroid": "11&12&13&14",
-        "gkid": "11&8513&800|12&8514&800|13&8515&800|14&8516&800",
+        "gkid": "11&13&800|12&14&800|13&15&800|14&16&800",
         "shilianReward": "40005&2000|20001&60|21008&30|42008&13",
         "soloRewardRatio": 1.3,
         "jinjieReward": "40005&3000|31002&3001"
@@ -49,7 +49,7 @@
         "name": "试炼5-官渡之战",
         "count": 4,
         "heroid": "7&8&9&11",
-        "gkid": "7&8517&800|8&8518&800|9&8519&800|11&8520&800",
+        "gkid": "7&17&800|8&18&800|9&19&800|11&20&800",
         "shilianReward": "40005&1000|20001&60|21008&30|42008&14",
         "soloRewardRatio": 1.4,
         "jinjieReward": "40005&2000|31002&3002"
@@ -60,7 +60,7 @@
         "name": "试炼6- 后起之秀",
         "count": 4,
         "heroid": "11&12&13&15",
-        "gkid": "11&8521&800|12&8522&800|13&8523&800|15&8524&800",
+        "gkid": "11&21&800|12&22&800|13&23&800|15&24&800",
         "shilianReward": "40005&500|20001&60|21008&30|42008&15",
         "soloRewardRatio": 1.5,
         "jinjieReward": "40005&3000|31002&3002"
@@ -71,7 +71,7 @@
         "name": "试炼7- 分庭抗礼",
         "count": 4,
         "heroid": "7&8&9&12",
-        "gkid": "7&8525&800|8&8526&800|9&8527&800|12&8528&800",
+        "gkid": "7&25&800|8&26&800|9&27&800|12&28&800",
         "shilianReward": "40005&6000|20001&60|21008&30|42008&16",
         "soloRewardRatio": 1.6,
         "jinjieReward": "40005&2000|31002&3003"
@@ -82,7 +82,7 @@
         "name": "试炼8- 群雄逐鹿",
         "count": 4,
         "heroid": "11&12&13&16",
-        "gkid": "11&8529&800|12&8530&800|13&8531&800|16&8532&800",
+        "gkid": "11&29&800|12&30&800|13&31&800|16&32&800",
         "shilianReward": "40005&4000|20001&60|21008&30|42008&17",
         "soloRewardRatio": 1.7,
         "jinjieReward": "40005&3000|31002&3003"
@@ -93,7 +93,7 @@
         "name": "试炼9-三足鼎立",
         "count": 4,
         "heroid": "7&8&9&13",
-        "gkid": "7&8533&800|8&8534&800|9&8535&800|13&8536&800",
+        "gkid": "7&33&800|8&34&800|9&35&800|13&36&800",
         "shilianReward": "40005&3000|20001&60|21008&30|42008&18",
         "soloRewardRatio": 1.8,
         "jinjieReward": "40005&2000|31002&3004"
@@ -104,7 +104,7 @@
         "name": "试炼10-封金挂印",
         "count": 4,
         "heroid": "11&12&13&17",
-        "gkid": "11&8537&800|12&8538&800|13&8539&800|17&8540&800",
+        "gkid": "11&37&800|12&38&800|13&39&800|17&40&800",
         "shilianReward": "40005&2000|20001&60|21008&30|42008&19",
         "soloRewardRatio": 2,
         "jinjieReward": "40005&3000|31002&3004"