From 99f48b3e43fa042924c3b5fb2136231061756051 Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Tue, 6 Sep 2022 19:09:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E6=96=97=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/json/game_monster.json         | 175 ++++------
 bin/json/game_monsterformat.json   | 511 ++++++++++++++++-------------
 modules/battle/modelBattle.go      |  13 +-
 modules/battle/module.go           |  29 +-
 modules/moonfantasy/api_ask.go     |   2 +-
 modules/moonfantasy/api_battle.go  |  42 +--
 modules/moonfantasy/api_receive.go |   4 +-
 7 files changed, 408 insertions(+), 368 deletions(-)

diff --git a/bin/json/game_monster.json b/bin/json/game_monster.json
index 34b6d8a4c..aa385c3af 100644
--- a/bin/json/game_monster.json
+++ b/bin/json/game_monster.json
@@ -7,9 +7,8 @@
       "text": "阿宝"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250012,
@@ -19,9 +18,8 @@
       "text": "阿宝"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250013,
@@ -31,9 +29,8 @@
       "text": "阿宝"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250014,
@@ -43,9 +40,8 @@
       "text": "阿宝"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250015,
@@ -55,9 +51,8 @@
       "text": "阿宝"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 340061,
@@ -67,9 +62,8 @@
       "text": "冰霜杰克"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 340062,
@@ -79,9 +73,8 @@
       "text": "冰霜杰克"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 340063,
@@ -91,9 +84,8 @@
       "text": "冰霜杰克"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 340064,
@@ -103,9 +95,8 @@
       "text": "冰霜杰克"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 340065,
@@ -115,9 +106,8 @@
       "text": "冰霜杰克"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 440051,
@@ -127,9 +117,8 @@
       "text": "小伊"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 440052,
@@ -139,9 +128,8 @@
       "text": "小伊"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 440053,
@@ -151,9 +139,8 @@
       "text": "小伊"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 440054,
@@ -163,9 +150,8 @@
       "text": "小伊"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 440055,
@@ -175,9 +161,8 @@
       "text": "小伊"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 240031,
@@ -187,9 +172,8 @@
       "text": "睡神沙人"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 240032,
@@ -199,9 +183,8 @@
       "text": "睡神沙人"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 240033,
@@ -211,9 +194,8 @@
       "text": "睡神沙人"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 240034,
@@ -223,9 +205,8 @@
       "text": "睡神沙人"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 240035,
@@ -235,9 +216,8 @@
       "text": "睡神沙人"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350021,
@@ -247,9 +227,8 @@
       "text": "希卡普"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350022,
@@ -259,9 +238,8 @@
       "text": "希卡普"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350023,
@@ -271,9 +249,8 @@
       "text": "希卡普"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350024,
@@ -283,9 +260,8 @@
       "text": "希卡普"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350025,
@@ -295,9 +271,8 @@
       "text": "希卡普"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350011,
@@ -307,9 +282,8 @@
       "text": "师父"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350012,
@@ -319,9 +293,8 @@
       "text": "师父"
     },
     "star": 2,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350013,
@@ -331,9 +304,8 @@
       "text": "师父"
     },
     "star": 3,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350014,
@@ -343,9 +315,8 @@
       "text": "师父"
     },
     "star": 4,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 350015,
@@ -355,9 +326,8 @@
       "text": "师父"
     },
     "star": 5,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250041,
@@ -367,9 +337,8 @@
       "text": "波比"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250042,
@@ -379,9 +348,8 @@
       "text": "波比"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250043,
@@ -391,9 +359,8 @@
       "text": "波比"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250044,
@@ -403,9 +370,8 @@
       "text": "波比"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   },
   {
     "monster_id": 250045,
@@ -415,8 +381,7 @@
       "text": "波比"
     },
     "star": 1,
-    "equip": [
-      1
-    ]
+    "equip2": 101,
+    "equip4": 1
   }
 ]
\ No newline at end of file
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index 04b51a228..583495670 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -1,9 +1,13 @@
 [
   {
     "Id": 101011,
-    "captainId": 250011,
+    "captainId": 3,
     "monsterList": [
-      250011
+      -1,
+      -1,
+      250011,
+      -1,
+      -1
     ],
     "lv": 1,
     "hppro": 1,
@@ -12,10 +16,13 @@
   },
   {
     "Id": 101021,
-    "captainId": 340061,
+    "captainId": 4,
     "monsterList": [
+      -1,
       250011,
-      340061
+      -1,
+      340061,
+      -1
     ],
     "lv": 1,
     "hppro": 1.4,
@@ -24,10 +31,13 @@
   },
   {
     "Id": 101031,
-    "captainId": 340061,
+    "captainId": 4,
     "monsterList": [
+      -1,
       250011,
-      340061
+      -1,
+      340061,
+      -1
     ],
     "lv": 2,
     "hppro": 1.2,
@@ -36,12 +46,13 @@
   },
   {
     "Id": 101032,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       440051,
       440051,
-      240031
+      240031,
+      -1
     ],
     "lv": 2,
     "hppro": 1,
@@ -50,12 +61,13 @@
   },
   {
     "Id": 101041,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
       340061,
-      440051
+      440051,
+      -1
     ],
     "lv": 3,
     "hppro": 1,
@@ -64,12 +76,13 @@
   },
   {
     "Id": 101042,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       440051,
       440051,
-      240031
+      240031,
+      -1
     ],
     "lv": 3,
     "hppro": 1,
@@ -78,7 +91,7 @@
   },
   {
     "Id": 101051,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -93,7 +106,7 @@
   },
   {
     "Id": 101052,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -108,7 +121,7 @@
   },
   {
     "Id": 101061,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -123,7 +136,7 @@
   },
   {
     "Id": 101062,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -138,7 +151,7 @@
   },
   {
     "Id": 101071,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -153,7 +166,7 @@
   },
   {
     "Id": 101072,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -168,7 +181,7 @@
   },
   {
     "Id": 101081,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -183,7 +196,7 @@
   },
   {
     "Id": 101082,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -198,7 +211,7 @@
   },
   {
     "Id": 101091,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -213,7 +226,7 @@
   },
   {
     "Id": 101092,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -228,7 +241,7 @@
   },
   {
     "Id": 101101,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       250011,
@@ -242,7 +255,7 @@
   },
   {
     "Id": 101102,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       340061,
       340061,
@@ -257,7 +270,7 @@
   },
   {
     "Id": 101103,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -272,7 +285,7 @@
   },
   {
     "Id": 102011,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -287,7 +300,7 @@
   },
   {
     "Id": 102021,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -302,7 +315,7 @@
   },
   {
     "Id": 102031,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -317,7 +330,7 @@
   },
   {
     "Id": 102032,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -332,7 +345,7 @@
   },
   {
     "Id": 102041,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -347,7 +360,7 @@
   },
   {
     "Id": 102042,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -362,7 +375,7 @@
   },
   {
     "Id": 102051,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -377,7 +390,7 @@
   },
   {
     "Id": 102052,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -392,7 +405,7 @@
   },
   {
     "Id": 102061,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -407,7 +420,7 @@
   },
   {
     "Id": 102062,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -422,7 +435,7 @@
   },
   {
     "Id": 102071,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -437,7 +450,7 @@
   },
   {
     "Id": 102072,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -452,7 +465,7 @@
   },
   {
     "Id": 102081,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -467,7 +480,7 @@
   },
   {
     "Id": 102082,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -482,7 +495,7 @@
   },
   {
     "Id": 102091,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -497,7 +510,7 @@
   },
   {
     "Id": 102092,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -512,7 +525,7 @@
   },
   {
     "Id": 102101,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -527,7 +540,7 @@
   },
   {
     "Id": 102102,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -542,7 +555,7 @@
   },
   {
     "Id": 102103,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -557,7 +570,7 @@
   },
   {
     "Id": 103011,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -572,7 +585,7 @@
   },
   {
     "Id": 103021,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -587,7 +600,7 @@
   },
   {
     "Id": 103031,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -602,7 +615,7 @@
   },
   {
     "Id": 103032,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -617,7 +630,7 @@
   },
   {
     "Id": 103041,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -632,7 +645,7 @@
   },
   {
     "Id": 103042,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -647,7 +660,7 @@
   },
   {
     "Id": 103051,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -662,7 +675,7 @@
   },
   {
     "Id": 103052,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -677,7 +690,7 @@
   },
   {
     "Id": 103061,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -692,7 +705,7 @@
   },
   {
     "Id": 103062,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -707,7 +720,7 @@
   },
   {
     "Id": 103071,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -722,7 +735,7 @@
   },
   {
     "Id": 103072,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -737,7 +750,7 @@
   },
   {
     "Id": 103081,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -752,7 +765,7 @@
   },
   {
     "Id": 103082,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -767,7 +780,7 @@
   },
   {
     "Id": 103091,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -782,7 +795,7 @@
   },
   {
     "Id": 103092,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -797,7 +810,7 @@
   },
   {
     "Id": 103101,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -812,7 +825,7 @@
   },
   {
     "Id": 103102,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -827,7 +840,7 @@
   },
   {
     "Id": 103103,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -842,7 +855,7 @@
   },
   {
     "Id": 104011,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -857,7 +870,7 @@
   },
   {
     "Id": 104021,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -872,7 +885,7 @@
   },
   {
     "Id": 104031,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -887,7 +900,7 @@
   },
   {
     "Id": 104032,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -902,7 +915,7 @@
   },
   {
     "Id": 104041,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -917,7 +930,7 @@
   },
   {
     "Id": 104042,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -932,7 +945,7 @@
   },
   {
     "Id": 104051,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -947,7 +960,7 @@
   },
   {
     "Id": 104052,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -962,7 +975,7 @@
   },
   {
     "Id": 104061,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -977,7 +990,7 @@
   },
   {
     "Id": 104062,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -992,7 +1005,7 @@
   },
   {
     "Id": 104071,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1007,7 +1020,7 @@
   },
   {
     "Id": 104072,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1022,7 +1035,7 @@
   },
   {
     "Id": 104081,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1037,7 +1050,7 @@
   },
   {
     "Id": 104082,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1052,7 +1065,7 @@
   },
   {
     "Id": 104091,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1067,7 +1080,7 @@
   },
   {
     "Id": 104092,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1082,7 +1095,7 @@
   },
   {
     "Id": 104101,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1097,7 +1110,7 @@
   },
   {
     "Id": 104102,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1112,7 +1125,7 @@
   },
   {
     "Id": 104103,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1127,7 +1140,7 @@
   },
   {
     "Id": 105011,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1142,7 +1155,7 @@
   },
   {
     "Id": 105021,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1157,7 +1170,7 @@
   },
   {
     "Id": 105031,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1172,7 +1185,7 @@
   },
   {
     "Id": 105032,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1187,7 +1200,7 @@
   },
   {
     "Id": 105041,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1202,7 +1215,7 @@
   },
   {
     "Id": 105042,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1217,7 +1230,7 @@
   },
   {
     "Id": 105051,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1232,7 +1245,7 @@
   },
   {
     "Id": 105052,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1247,7 +1260,7 @@
   },
   {
     "Id": 105061,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1262,7 +1275,7 @@
   },
   {
     "Id": 105062,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1277,7 +1290,7 @@
   },
   {
     "Id": 105071,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1292,7 +1305,7 @@
   },
   {
     "Id": 105072,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1307,7 +1320,7 @@
   },
   {
     "Id": 105081,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1322,7 +1335,7 @@
   },
   {
     "Id": 105082,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1337,7 +1350,7 @@
   },
   {
     "Id": 105091,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1352,7 +1365,7 @@
   },
   {
     "Id": 105092,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1367,7 +1380,7 @@
   },
   {
     "Id": 105101,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1382,7 +1395,7 @@
   },
   {
     "Id": 105102,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1397,7 +1410,7 @@
   },
   {
     "Id": 105103,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1412,7 +1425,7 @@
   },
   {
     "Id": 106011,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1427,7 +1440,7 @@
   },
   {
     "Id": 106021,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1442,7 +1455,7 @@
   },
   {
     "Id": 106031,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1457,7 +1470,7 @@
   },
   {
     "Id": 106032,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1472,7 +1485,7 @@
   },
   {
     "Id": 106041,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1487,7 +1500,7 @@
   },
   {
     "Id": 106042,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1502,7 +1515,7 @@
   },
   {
     "Id": 106051,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1517,7 +1530,7 @@
   },
   {
     "Id": 106052,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1532,7 +1545,7 @@
   },
   {
     "Id": 106061,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1547,7 +1560,7 @@
   },
   {
     "Id": 106062,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1562,7 +1575,7 @@
   },
   {
     "Id": 106071,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1577,7 +1590,7 @@
   },
   {
     "Id": 106072,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1592,7 +1605,7 @@
   },
   {
     "Id": 106081,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1607,7 +1620,7 @@
   },
   {
     "Id": 106082,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1622,7 +1635,7 @@
   },
   {
     "Id": 106091,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1637,7 +1650,7 @@
   },
   {
     "Id": 106092,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1652,7 +1665,7 @@
   },
   {
     "Id": 106101,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1667,7 +1680,7 @@
   },
   {
     "Id": 106102,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1682,7 +1695,7 @@
   },
   {
     "Id": 106103,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1697,7 +1710,7 @@
   },
   {
     "Id": 107011,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1712,7 +1725,7 @@
   },
   {
     "Id": 107021,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1727,7 +1740,7 @@
   },
   {
     "Id": 107031,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1742,7 +1755,7 @@
   },
   {
     "Id": 107032,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1757,7 +1770,7 @@
   },
   {
     "Id": 107041,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1772,7 +1785,7 @@
   },
   {
     "Id": 107042,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1787,7 +1800,7 @@
   },
   {
     "Id": 107051,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1802,7 +1815,7 @@
   },
   {
     "Id": 107052,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1817,7 +1830,7 @@
   },
   {
     "Id": 107061,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1832,7 +1845,7 @@
   },
   {
     "Id": 107062,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1847,7 +1860,7 @@
   },
   {
     "Id": 107071,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1862,7 +1875,7 @@
   },
   {
     "Id": 107072,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1877,7 +1890,7 @@
   },
   {
     "Id": 107081,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1892,7 +1905,7 @@
   },
   {
     "Id": 107082,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1907,7 +1920,7 @@
   },
   {
     "Id": 107091,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1922,7 +1935,7 @@
   },
   {
     "Id": 107092,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1937,7 +1950,7 @@
   },
   {
     "Id": 107101,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1952,7 +1965,7 @@
   },
   {
     "Id": 107102,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1967,7 +1980,7 @@
   },
   {
     "Id": 107103,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1982,7 +1995,7 @@
   },
   {
     "Id": 108011,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -1997,7 +2010,7 @@
   },
   {
     "Id": 108021,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2012,7 +2025,7 @@
   },
   {
     "Id": 108031,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2027,7 +2040,7 @@
   },
   {
     "Id": 108032,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2042,7 +2055,7 @@
   },
   {
     "Id": 108041,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2057,7 +2070,7 @@
   },
   {
     "Id": 108042,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2072,7 +2085,7 @@
   },
   {
     "Id": 108051,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2087,7 +2100,7 @@
   },
   {
     "Id": 108052,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2102,7 +2115,7 @@
   },
   {
     "Id": 108061,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2117,7 +2130,7 @@
   },
   {
     "Id": 108062,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2132,7 +2145,7 @@
   },
   {
     "Id": 108071,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2147,7 +2160,7 @@
   },
   {
     "Id": 108072,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2162,7 +2175,7 @@
   },
   {
     "Id": 108081,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2177,7 +2190,7 @@
   },
   {
     "Id": 108082,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2192,7 +2205,7 @@
   },
   {
     "Id": 108091,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2207,7 +2220,7 @@
   },
   {
     "Id": 108092,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2222,7 +2235,7 @@
   },
   {
     "Id": 108101,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2237,7 +2250,7 @@
   },
   {
     "Id": 108102,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2252,7 +2265,7 @@
   },
   {
     "Id": 108103,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2267,7 +2280,7 @@
   },
   {
     "Id": 109011,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2282,7 +2295,7 @@
   },
   {
     "Id": 109021,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2297,7 +2310,7 @@
   },
   {
     "Id": 109031,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2312,7 +2325,7 @@
   },
   {
     "Id": 109032,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2327,7 +2340,7 @@
   },
   {
     "Id": 109041,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2342,7 +2355,7 @@
   },
   {
     "Id": 109042,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2357,7 +2370,7 @@
   },
   {
     "Id": 109051,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2372,7 +2385,7 @@
   },
   {
     "Id": 109052,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2387,7 +2400,7 @@
   },
   {
     "Id": 109061,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2402,7 +2415,7 @@
   },
   {
     "Id": 109062,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2417,7 +2430,7 @@
   },
   {
     "Id": 109071,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2432,7 +2445,7 @@
   },
   {
     "Id": 109072,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2447,7 +2460,7 @@
   },
   {
     "Id": 109081,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2462,7 +2475,7 @@
   },
   {
     "Id": 109082,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2477,7 +2490,7 @@
   },
   {
     "Id": 109091,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2492,7 +2505,7 @@
   },
   {
     "Id": 109092,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2507,7 +2520,7 @@
   },
   {
     "Id": 109101,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2522,7 +2535,7 @@
   },
   {
     "Id": 109102,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2537,7 +2550,7 @@
   },
   {
     "Id": 109103,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2552,7 +2565,7 @@
   },
   {
     "Id": 110011,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2567,7 +2580,7 @@
   },
   {
     "Id": 110021,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2582,7 +2595,7 @@
   },
   {
     "Id": 110031,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2597,7 +2610,7 @@
   },
   {
     "Id": 110032,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2612,7 +2625,7 @@
   },
   {
     "Id": 110041,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2627,7 +2640,7 @@
   },
   {
     "Id": 110042,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2642,7 +2655,7 @@
   },
   {
     "Id": 110051,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2657,7 +2670,7 @@
   },
   {
     "Id": 110052,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2672,7 +2685,7 @@
   },
   {
     "Id": 110061,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2687,7 +2700,7 @@
   },
   {
     "Id": 110062,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2702,7 +2715,7 @@
   },
   {
     "Id": 110071,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2717,7 +2730,7 @@
   },
   {
     "Id": 110072,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2732,7 +2745,7 @@
   },
   {
     "Id": 110081,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2747,7 +2760,7 @@
   },
   {
     "Id": 110082,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2762,7 +2775,7 @@
   },
   {
     "Id": 110091,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2777,7 +2790,7 @@
   },
   {
     "Id": 110092,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2792,7 +2805,7 @@
   },
   {
     "Id": 110101,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2807,7 +2820,7 @@
   },
   {
     "Id": 110102,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2822,7 +2835,7 @@
   },
   {
     "Id": 110103,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2837,7 +2850,7 @@
   },
   {
     "Id": 111011,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2852,7 +2865,7 @@
   },
   {
     "Id": 111021,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2867,7 +2880,7 @@
   },
   {
     "Id": 111031,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2882,7 +2895,7 @@
   },
   {
     "Id": 111032,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2897,7 +2910,7 @@
   },
   {
     "Id": 111041,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2912,7 +2925,7 @@
   },
   {
     "Id": 111042,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2927,7 +2940,7 @@
   },
   {
     "Id": 111051,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2942,7 +2955,7 @@
   },
   {
     "Id": 111052,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2957,7 +2970,7 @@
   },
   {
     "Id": 111061,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2972,7 +2985,7 @@
   },
   {
     "Id": 111062,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -2987,7 +3000,7 @@
   },
   {
     "Id": 111071,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3002,7 +3015,7 @@
   },
   {
     "Id": 111072,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3017,7 +3030,7 @@
   },
   {
     "Id": 111081,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3032,7 +3045,7 @@
   },
   {
     "Id": 111082,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3047,7 +3060,7 @@
   },
   {
     "Id": 111091,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3062,7 +3075,7 @@
   },
   {
     "Id": 111092,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3077,7 +3090,7 @@
   },
   {
     "Id": 111101,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3092,7 +3105,7 @@
   },
   {
     "Id": 111102,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3107,7 +3120,7 @@
   },
   {
     "Id": 111103,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3122,7 +3135,7 @@
   },
   {
     "Id": 112011,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3137,7 +3150,7 @@
   },
   {
     "Id": 112021,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3152,7 +3165,7 @@
   },
   {
     "Id": 112031,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3167,7 +3180,7 @@
   },
   {
     "Id": 112032,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3182,7 +3195,7 @@
   },
   {
     "Id": 112041,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3197,7 +3210,7 @@
   },
   {
     "Id": 112042,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3212,7 +3225,7 @@
   },
   {
     "Id": 112051,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3227,7 +3240,7 @@
   },
   {
     "Id": 112052,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3242,7 +3255,7 @@
   },
   {
     "Id": 112061,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3257,7 +3270,7 @@
   },
   {
     "Id": 112062,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3272,7 +3285,7 @@
   },
   {
     "Id": 112071,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3287,7 +3300,7 @@
   },
   {
     "Id": 112072,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3302,7 +3315,7 @@
   },
   {
     "Id": 112081,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3317,7 +3330,7 @@
   },
   {
     "Id": 112082,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3332,7 +3345,7 @@
   },
   {
     "Id": 112091,
-    "captainId": 350021,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3347,7 +3360,7 @@
   },
   {
     "Id": 112092,
-    "captainId": 250011,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3362,7 +3375,7 @@
   },
   {
     "Id": 112101,
-    "captainId": 340061,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3377,7 +3390,7 @@
   },
   {
     "Id": 112102,
-    "captainId": 440051,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3392,7 +3405,7 @@
   },
   {
     "Id": 112103,
-    "captainId": 240031,
+    "captainId": 1,
     "monsterList": [
       250011,
       340061,
@@ -3404,5 +3417,35 @@
     "hppro": 1,
     "atkpro": 1,
     "defpro": 1
+  },
+  {
+    "Id": 201011,
+    "captainId": 1,
+    "monsterList": [
+      250011,
+      340061,
+      440051,
+      240031,
+      350021
+    ],
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1
+  },
+  {
+    "Id": 201012,
+    "captainId": 1,
+    "monsterList": [
+      250011,
+      340061,
+      440051,
+      240031,
+      350021
+    ],
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1
   }
 ]
\ No newline at end of file
diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go
index 2a74fa0b5..2a121010b 100644
--- a/modules/battle/modelBattle.go
+++ b/modules/battle/modelBattle.go
@@ -6,6 +6,8 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/db"
+	"time"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -40,7 +42,7 @@ func (this *modelBattleComp) queryrecord(oid string) (record *pb.DBBattleRecord,
 }
 
 //创建pve 战斗记录
-func (this *modelBattleComp) createpve(session comm.IUserSession, btype pb.BattleType, req *pb.BattlePVEReq) (record *pb.DBBattleRecord, code pb.ErrorCode) {
+func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBConn, btype pb.BattleType, req *pb.BattlePVEReq) (record *pb.DBBattleRecord, code pb.ErrorCode) {
 	record = &pb.DBBattleRecord{
 		Id:         primitive.NewObjectID().Hex(),
 		Btype:      btype,
@@ -55,9 +57,14 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, btype pb.Battl
 		Leadpos: req.Leadpos,
 		Team:    make([]*pb.DBHero, len(req.Teamids)),
 	}
+	model := db.NewDBModel(comm.TableHero, time.Hour, conn)
 	for i, v := range req.Teamids {
-		if record.Redflist[0].Team[i], code = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), v); code != pb.ErrorCode_Success {
-			return
+		if v != "" {
+			hero := &pb.DBHero{}
+			if err := model.GetListObj(session.GetUserId(), v, hero); err != nil {
+				return
+			}
+			record.Redflist[0].Team[i] = hero
 		}
 	}
 
diff --git a/modules/battle/module.go b/modules/battle/module.go
index 464a9f425..8289be62e 100644
--- a/modules/battle/module.go
+++ b/modules/battle/module.go
@@ -5,6 +5,7 @@ import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
 	"go_dreamfactory/pb"
+	"go_dreamfactory/sys/db"
 )
 
 /*
@@ -19,6 +20,7 @@ func NewModule() core.IModule {
 
 type Battle struct {
 	modules.ModuleBase
+	service     core.IService
 	api_comp    *apiComp
 	configure   *configureComp
 	modelBattle *modelBattleComp
@@ -32,6 +34,7 @@ func (this *Battle) GetType() core.M_Modules {
 //模块初始化接口 注册用户创建角色事件
 func (this *Battle) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
 	err = this.ModuleBase.Init(service, module, options)
+	this.service = service
 	return
 }
 
@@ -55,7 +58,18 @@ func (this *Battle) QueryBattleRecord(oid string) (code pb.ErrorCode, record *pb
 
 //创建pve战斗
 func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
-	if record, code = this.modelBattle.createpve(session, pb.BattleType_pve, req); code != pb.ErrorCode_Success {
+	var conn *db.DBConn
+	if this.service.GetTag() == session.GetServiecTag() {
+		conn = db.Local()
+	} else {
+		conn = db.ServerDBConn(session.GetServiecTag())
+	}
+	if req.Ptype < 0 || req.Ptype > 4 ||
+		req.Teamids == nil || len(req.Teamids) != 5 {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	if record, code = this.modelBattle.createpve(session, conn, pb.BattleType_pve, req); code != pb.ErrorCode_Success {
 		return
 	}
 	return
@@ -63,7 +77,18 @@ func (this *Battle) CreatePveBattle(session comm.IUserSession, req *pb.BattlePVE
 
 //创建pve战斗
 func (this *Battle) CreatePvbBattle(session comm.IUserSession, req *pb.BattlePVEReq) (code pb.ErrorCode, record *pb.DBBattleRecord) {
-	if record, code = this.modelBattle.createpve(session, pb.BattleType_pvb, req); code != pb.ErrorCode_Success {
+	var conn *db.DBConn
+	if this.service.GetTag() == session.GetServiecTag() {
+		conn = db.Local()
+	} else {
+		conn = db.ServerDBConn(session.GetServiecTag())
+	}
+	if req.Ptype < 0 || req.Ptype > 4 ||
+		req.Teamids == nil || len(req.Teamids) != 5 {
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	if record, code = this.modelBattle.createpve(session, conn, pb.BattleType_pvb, req); code != pb.ErrorCode_Success {
 		return
 	}
 	return
diff --git a/modules/moonfantasy/api_ask.go b/modules/moonfantasy/api_ask.go
index a5fdbac8b..75950619a 100644
--- a/modules/moonfantasy/api_ask.go
+++ b/modules/moonfantasy/api_ask.go
@@ -23,7 +23,7 @@ func (this *apiComp) Ask(session comm.IUserSession, req *pb.MoonfantasyAskReq) (
 		err        error
 	)
 	defer func() {
-		session.SendMsg(string(this.module.GetType()), "dare", &pb.MoonfantasyAskResp{Code: cd})
+		session.SendMsg(string(this.module.GetType()), "ask", &pb.MoonfantasyAskResp{Code: cd})
 	}()
 	if cd = this.AskCheck(session, req); cd != pb.ErrorCode_Success {
 		return
diff --git a/modules/moonfantasy/api_battle.go b/modules/moonfantasy/api_battle.go
index cad35acc7..c9af5cf17 100644
--- a/modules/moonfantasy/api_battle.go
+++ b/modules/moonfantasy/api_battle.go
@@ -20,29 +20,29 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 		globalconf *cfg.GameGlobalData
 		boss       *cfg.GameDreamlandBoosData
 		mdata      *pb.DBMoonfantasy
-		// record     *pb.DBBattleRecord
-		cd  pb.ErrorCode
-		err error
+		record     *pb.DBBattleRecord
+		cd         pb.ErrorCode
+		err        error
 	)
 
 	defer func() {
-		// if cd == pb.ErrorCode_Success {
-		// 	session.SendMsg(string(this.module.GetType()), "dare", &pb.MoonfantasyBattleResp{
-		// 		Code:    cd,
-		// 		Monster: mdata.Monster,
-		// 		Info: &pb.BattleInfo{
-		// 			Id:         record.Id,
-		// 			Btype:      record.Btype,
-		// 			Ptype:      record.Ptype,
-		// 			RedCompId:  record.RedCompId,
-		// 			Redflist:   record.Redflist,
-		// 			BlueCompId: record.BlueCompId,
-		// 			Buleflist:  record.Buleflist,
-		// 		},
-		// 	})
-		// } else {
-		session.SendMsg(string(this.module.GetType()), "dare", &pb.MoonfantasyBattleResp{Code: cd})
-		// }
+		if cd == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), "battle", &pb.MoonfantasyBattleResp{
+				Code:    cd,
+				Monster: mdata.Monster,
+				Info: &pb.BattleInfo{
+					Id:         record.Id,
+					Btype:      record.Btype,
+					Ptype:      record.Ptype,
+					RedCompId:  record.RedCompId,
+					Redflist:   record.Redflist,
+					BlueCompId: record.BlueCompId,
+					Buleflist:  record.Buleflist,
+				},
+			})
+		} else {
+			session.SendMsg(string(this.module.GetType()), "battle", &pb.MoonfantasyBattleResp{Code: cd})
+		}
 
 	}()
 
@@ -84,7 +84,7 @@ func (this *apiComp) Battle(session comm.IUserSession, req *pb.MoonfantasyBattle
 	} else {
 		mdata.Record[session.GetUserId()] = 1
 	}
-	cd, _ = this.module.battle.CreatePvbBattle(session, &pb.BattlePVEReq{
+	cd, record = this.module.battle.CreatePvbBattle(session, &pb.BattlePVEReq{
 		Ptype:   pb.PlayType_moonfantasy,
 		Leadpos: req.Leadpos,
 		Teamids: req.Teamids,
diff --git a/modules/moonfantasy/api_receive.go b/modules/moonfantasy/api_receive.go
index 93ad23a3b..ff5a74d29 100644
--- a/modules/moonfantasy/api_receive.go
+++ b/modules/moonfantasy/api_receive.go
@@ -30,12 +30,12 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MoonfantasyRecei
 	}
 	if boss, err = this.module.configure.GetMonsterById(req.Monster); err != nil {
 		code = pb.ErrorCode_ConfigNoFound
-		return                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
+		return
 	}
 	if code, iswin = this.module.battle.CheckBattleReport(session, req.Report); code != pb.ErrorCode_Success {
 		return
 	}
-	if iswin {
+	if !iswin {
 		code = pb.ErrorCode_MoonfantasyBattleNoWin
 		return
 	}