From 78777a1437c322d033e33d186f943b7462791aaf Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Mon, 27 Feb 2023 21:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(gvg):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=95=E7=9F=B3=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/services/gvg/gvgBattleService.ts      |  16 +-
 shared/db/GVGTeam.ts                          |  28 +-
 shared/pubUtils/dictionary/DicGVGAreaPoint.ts |   2 +
 .../resource/jsons/dic_zyz_GVGAreaPoint.json  | 354 ++++++++++++++++++
 4 files changed, 378 insertions(+), 22 deletions(-)

diff --git a/game-server/app/services/gvg/gvgBattleService.ts b/game-server/app/services/gvg/gvgBattleService.ts
index 09c85bd43..131009af6 100644
--- a/game-server/app/services/gvg/gvgBattleService.ts
+++ b/game-server/app/services/gvg/gvgBattleService.ts
@@ -116,6 +116,7 @@ export async function initRobots(configId: number, groupKey: string, city: GVGCi
     let updateDicPoints: DicGVGAreaPoint[] = [];
     let { areaIds = []} = gameData.gvgCity.get(cityId);
     for(let [_, point] of gameData.gvgAreaPoint) {
+        if(point.type != 1) continue;
         if(areaIds.indexOf(point.areaId) == -1) continue;
         let robotTeam = robotTeams.find(team => team.pointId == point.pointId);
         if(!robotTeam || (!robotTeam.isBroken && robotTeam.configId != configId) ) {
@@ -296,14 +297,17 @@ export async function initCatapult(cityId: number, groupKey: string, leagueCode:
         }
     }
     if(hasCatapult) {
-        let dicCity = gameData.gvgCity.get(cityId);
-        let areaIds = (dicCity?.areaIds||[]).filter(areaId => {
-            let dicArea = gameData.gvgArea.get(areaId);
-            return dicArea && dicArea.areaType == GVG_AREA_TYPE.CATAPULT;
-        });
+        let updateDicPoints: DicGVGAreaPoint[] = [];
+        let { areaIds = []} = gameData.gvgCity.get(cityId);
+        for(let [_, point] of gameData.gvgAreaPoint) {
+
+            if(point.type != 2) continue;
+            if(areaIds.indexOf(point.areaId) == -1) continue;
+            updateDicPoints.push(point);
+        }
 
         let lv = gameData.war.get(GVG.GVG_CATAPULT_WARJSON)?.level||50;
-        let teams = await GVGTeamModel.initCatapult(configId, groupKey, cityId, leagueCode, leagueName, areaIds, atk, durability, lv);
+        let teams = await GVGTeamModel.initCatapult(configId, groupKey, cityId, updateDicPoints, leagueCode, leagueName, atk, durability, lv);
         // 处理内存
         let teamObj = getGVGBattleData(groupKey);
         teamObj.enterCity(...teams);
diff --git a/shared/db/GVGTeam.ts b/shared/db/GVGTeam.ts
index 8b2fa7644..acb8e255d 100644
--- a/shared/db/GVGTeam.ts
+++ b/shared/db/GVGTeam.ts
@@ -229,22 +229,18 @@ export default class GVGTeam extends BaseModel {
     }
 
     // 生成投石车
-    public static async initCatapult(configId: number, groupKey: string, cityId: number, leagueCode: string, leagueName: string, areaIds: number[], atk: number, durability: number, lv: number) {
-        await GVGTeamModel.bulkWrite(areaIds.map(areaId => {
-            return { 
-                updateOne: { 
-                    filter: { groupKey, cityId, areaId }, 
-                    update: { $setOnInsert: { 
-                        teamCode: genCode(8), maxDurability: durability, captapultAtk: atk, leagueCode, leagueName,
-                        roleName: GVG.GVG_CATAPULT_NAME, head: GVG.GVG_CATAPULT_HEAD, spine: GVG.GVG_CATAPULT_SPINE, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: GVG.GVG_CATAPULT_CE, lv,
-                        isRobot: true, isCatapult: true, fromAreaId: areaId,
-                        isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', pointId: 0, roleId: GVG_CATAPULT
-                    }, $set: { configId, durability } }, 
-                    upsert: true
-                } 
-            }
-        }));
-        return await this.findCatapultTeams(groupKey, cityId);
+    public static async initCatapult(configId: number, groupKey: string, cityId: number, dicPoints: DicGVGAreaPoint[], leagueCode: string, leagueName: string, atk: number, durability: number, lv: number) {
+        const teams: GVGTeamType[] = [];
+        for(let { pointId, areaId, name, head, spine, ce } of dicPoints) {
+            let team: GVGTeamType = await GVGTeamModel.findOneAndUpdate({ groupKey, cityId, areaId, pointId }, {
+                $setOnInsert: {
+                    teamCode: genCode(8), maxDurability: durability, roleName: name, head, spine, frame: EXTERIOR.EXTERIOR_FACECASE, lineupCe: ce, lv, leagueCode, leagueName, captapultAtk: atk,
+                    isRobot: true, isCatapult: true, isBroken: false, startMoveTime: 0, stopMoveTime: 0, guildCode: '', fromAreaId: areaId,
+                }, $set: { configId, durability }
+            }, { new: true, upsert: true }).lean();
+            teams.push(team);
+        }
+        return teams
     }
 
     // 攻击方攻击cd
diff --git a/shared/pubUtils/dictionary/DicGVGAreaPoint.ts b/shared/pubUtils/dictionary/DicGVGAreaPoint.ts
index e578f1c28..98458af39 100644
--- a/shared/pubUtils/dictionary/DicGVGAreaPoint.ts
+++ b/shared/pubUtils/dictionary/DicGVGAreaPoint.ts
@@ -7,6 +7,8 @@ export interface DicGVGAreaPoint {
     readonly pointId: number;
     // 区域id
     readonly areaId: number;
+    // 类型 1-守卫者 2-投石车
+    readonly type: number;
     // 积分
     readonly score: number;
     // 位置
diff --git a/shared/resource/jsons/dic_zyz_GVGAreaPoint.json b/shared/resource/jsons/dic_zyz_GVGAreaPoint.json
index 0f1d23ef1..4307c17cc 100644
--- a/shared/resource/jsons/dic_zyz_GVGAreaPoint.json
+++ b/shared/resource/jsons/dic_zyz_GVGAreaPoint.json
@@ -1,6 +1,7 @@
 [
     {
         "pointId": 1021,
+        "type": 1,
         "score": 100,
         "areaId": 102,
         "pointPosition": "0&40",
@@ -15,6 +16,7 @@
     },
     {
         "pointId": 1022,
+        "type": 1,
         "score": 100,
         "areaId": 102,
         "pointPosition": "-80&-80",
@@ -29,6 +31,7 @@
     },
     {
         "pointId": 1023,
+        "type": 1,
         "score": 100,
         "areaId": 102,
         "pointPosition": "80&-80",
@@ -43,6 +46,7 @@
     },
     {
         "pointId": 1031,
+        "type": 1,
         "score": 200,
         "areaId": 103,
         "pointPosition": "0&0",
@@ -57,6 +61,7 @@
     },
     {
         "pointId": 2021,
+        "type": 1,
         "score": 100,
         "areaId": 202,
         "pointPosition": "0&40",
@@ -71,6 +76,7 @@
     },
     {
         "pointId": 2022,
+        "type": 1,
         "score": 100,
         "areaId": 202,
         "pointPosition": "-80&-80",
@@ -85,6 +91,7 @@
     },
     {
         "pointId": 2023,
+        "type": 1,
         "score": 100,
         "areaId": 202,
         "pointPosition": "80&-80",
@@ -99,6 +106,7 @@
     },
     {
         "pointId": 2031,
+        "type": 1,
         "score": 200,
         "areaId": 203,
         "pointPosition": "0&0",
@@ -113,6 +121,7 @@
     },
     {
         "pointId": 3021,
+        "type": 1,
         "score": 200,
         "areaId": 302,
         "pointPosition": "-70&40",
@@ -127,6 +136,7 @@
     },
     {
         "pointId": 3022,
+        "type": 1,
         "score": 200,
         "areaId": 302,
         "pointPosition": "70&40",
@@ -141,6 +151,7 @@
     },
     {
         "pointId": 3023,
+        "type": 1,
         "score": 200,
         "areaId": 302,
         "pointPosition": "-70&-120",
@@ -155,6 +166,7 @@
     },
     {
         "pointId": 3024,
+        "type": 1,
         "score": 200,
         "areaId": 302,
         "pointPosition": "70&-120",
@@ -169,6 +181,7 @@
     },
     {
         "pointId": 3031,
+        "type": 1,
         "score": 200,
         "areaId": 303,
         "pointPosition": "-70&40",
@@ -183,6 +196,7 @@
     },
     {
         "pointId": 3032,
+        "type": 1,
         "score": 200,
         "areaId": 303,
         "pointPosition": "70&40",
@@ -197,6 +211,7 @@
     },
     {
         "pointId": 3033,
+        "type": 1,
         "score": 200,
         "areaId": 303,
         "pointPosition": "-70&-120",
@@ -211,6 +226,7 @@
     },
     {
         "pointId": 3034,
+        "type": 1,
         "score": 200,
         "areaId": 303,
         "pointPosition": "70&-120",
@@ -225,6 +241,7 @@
     },
     {
         "pointId": 3041,
+        "type": 1,
         "score": 200,
         "areaId": 304,
         "pointPosition": "-70&40",
@@ -239,6 +256,7 @@
     },
     {
         "pointId": 3042,
+        "type": 1,
         "score": 200,
         "areaId": 304,
         "pointPosition": "70&40",
@@ -253,6 +271,7 @@
     },
     {
         "pointId": 3043,
+        "type": 1,
         "score": 200,
         "areaId": 304,
         "pointPosition": "-70&-120",
@@ -267,6 +286,7 @@
     },
     {
         "pointId": 3044,
+        "type": 1,
         "score": 200,
         "areaId": 304,
         "pointPosition": "70&-120",
@@ -281,6 +301,7 @@
     },
     {
         "pointId": 3051,
+        "type": 1,
         "score": 600,
         "areaId": 305,
         "pointPosition": "0&40",
@@ -295,6 +316,7 @@
     },
     {
         "pointId": 3052,
+        "type": 1,
         "score": 600,
         "areaId": 305,
         "pointPosition": "-80&-80",
@@ -309,6 +331,7 @@
     },
     {
         "pointId": 3053,
+        "type": 1,
         "score": 600,
         "areaId": 305,
         "pointPosition": "80&-80",
@@ -323,6 +346,7 @@
     },
     {
         "pointId": 4021,
+        "type": 1,
         "score": 100,
         "areaId": 402,
         "pointPosition": "0&40",
@@ -337,6 +361,7 @@
     },
     {
         "pointId": 4022,
+        "type": 1,
         "score": 100,
         "areaId": 402,
         "pointPosition": "-80&-80",
@@ -351,6 +376,7 @@
     },
     {
         "pointId": 4023,
+        "type": 1,
         "score": 100,
         "areaId": 402,
         "pointPosition": "80&-80",
@@ -365,6 +391,7 @@
     },
     {
         "pointId": 4031,
+        "type": 1,
         "score": 200,
         "areaId": 403,
         "pointPosition": "0&0",
@@ -379,6 +406,7 @@
     },
     {
         "pointId": 5021,
+        "type": 1,
         "score": 100,
         "areaId": 502,
         "pointPosition": "0&40",
@@ -393,6 +421,7 @@
     },
     {
         "pointId": 5022,
+        "type": 1,
         "score": 100,
         "areaId": 502,
         "pointPosition": "-80&-80",
@@ -407,6 +436,7 @@
     },
     {
         "pointId": 5023,
+        "type": 1,
         "score": 100,
         "areaId": 502,
         "pointPosition": "80&-80",
@@ -421,6 +451,7 @@
     },
     {
         "pointId": 5031,
+        "type": 1,
         "score": 200,
         "areaId": 503,
         "pointPosition": "0&0",
@@ -435,6 +466,7 @@
     },
     {
         "pointId": 6021,
+        "type": 1,
         "score": 100,
         "areaId": 602,
         "pointPosition": "0&40",
@@ -449,6 +481,7 @@
     },
     {
         "pointId": 6022,
+        "type": 1,
         "score": 100,
         "areaId": 602,
         "pointPosition": "-80&-80",
@@ -463,6 +496,7 @@
     },
     {
         "pointId": 6023,
+        "type": 1,
         "score": 100,
         "areaId": 602,
         "pointPosition": "80&-80",
@@ -477,6 +511,7 @@
     },
     {
         "pointId": 6031,
+        "type": 1,
         "score": 200,
         "areaId": 603,
         "pointPosition": "0&0",
@@ -491,6 +526,7 @@
     },
     {
         "pointId": 7021,
+        "type": 1,
         "score": 100,
         "areaId": 702,
         "pointPosition": "0&40",
@@ -505,6 +541,7 @@
     },
     {
         "pointId": 7022,
+        "type": 1,
         "score": 100,
         "areaId": 702,
         "pointPosition": "-80&-80",
@@ -519,6 +556,7 @@
     },
     {
         "pointId": 7023,
+        "type": 1,
         "score": 100,
         "areaId": 702,
         "pointPosition": "80&-80",
@@ -533,6 +571,7 @@
     },
     {
         "pointId": 7031,
+        "type": 1,
         "score": 200,
         "areaId": 703,
         "pointPosition": "0&0",
@@ -547,6 +586,7 @@
     },
     {
         "pointId": 8021,
+        "type": 1,
         "score": 100,
         "areaId": 802,
         "pointPosition": "0&40",
@@ -561,6 +601,7 @@
     },
     {
         "pointId": 8022,
+        "type": 1,
         "score": 100,
         "areaId": 802,
         "pointPosition": "-80&-80",
@@ -575,6 +616,7 @@
     },
     {
         "pointId": 8023,
+        "type": 1,
         "score": 100,
         "areaId": 802,
         "pointPosition": "80&-80",
@@ -589,6 +631,7 @@
     },
     {
         "pointId": 8031,
+        "type": 1,
         "score": 200,
         "areaId": 803,
         "pointPosition": "0&0",
@@ -603,6 +646,7 @@
     },
     {
         "pointId": 9021,
+        "type": 1,
         "score": 100,
         "areaId": 902,
         "pointPosition": "0&40",
@@ -617,6 +661,7 @@
     },
     {
         "pointId": 9022,
+        "type": 1,
         "score": 100,
         "areaId": 902,
         "pointPosition": "-80&-80",
@@ -631,6 +676,7 @@
     },
     {
         "pointId": 9023,
+        "type": 1,
         "score": 100,
         "areaId": 902,
         "pointPosition": "80&-80",
@@ -645,6 +691,7 @@
     },
     {
         "pointId": 9031,
+        "type": 1,
         "score": 200,
         "areaId": 903,
         "pointPosition": "0&0",
@@ -659,6 +706,7 @@
     },
     {
         "pointId": 10021,
+        "type": 1,
         "score": 200,
         "areaId": 1002,
         "pointPosition": "-70&40",
@@ -673,6 +721,7 @@
     },
     {
         "pointId": 10022,
+        "type": 1,
         "score": 200,
         "areaId": 1002,
         "pointPosition": "70&40",
@@ -687,6 +736,7 @@
     },
     {
         "pointId": 10023,
+        "type": 1,
         "score": 200,
         "areaId": 1002,
         "pointPosition": "-70&-120",
@@ -701,6 +751,7 @@
     },
     {
         "pointId": 10024,
+        "type": 1,
         "score": 200,
         "areaId": 1002,
         "pointPosition": "70&-120",
@@ -715,6 +766,7 @@
     },
     {
         "pointId": 10031,
+        "type": 1,
         "score": 200,
         "areaId": 1003,
         "pointPosition": "-70&40",
@@ -729,6 +781,7 @@
     },
     {
         "pointId": 10032,
+        "type": 1,
         "score": 200,
         "areaId": 1003,
         "pointPosition": "70&40",
@@ -743,6 +796,7 @@
     },
     {
         "pointId": 10033,
+        "type": 1,
         "score": 200,
         "areaId": 1003,
         "pointPosition": "-70&-120",
@@ -757,6 +811,7 @@
     },
     {
         "pointId": 10034,
+        "type": 1,
         "score": 200,
         "areaId": 1003,
         "pointPosition": "70&-120",
@@ -771,6 +826,7 @@
     },
     {
         "pointId": 10041,
+        "type": 1,
         "score": 200,
         "areaId": 1004,
         "pointPosition": "-70&40",
@@ -785,6 +841,7 @@
     },
     {
         "pointId": 10042,
+        "type": 1,
         "score": 200,
         "areaId": 1004,
         "pointPosition": "70&40",
@@ -799,6 +856,7 @@
     },
     {
         "pointId": 10043,
+        "type": 1,
         "score": 200,
         "areaId": 1004,
         "pointPosition": "-70&-120",
@@ -813,6 +871,7 @@
     },
     {
         "pointId": 10044,
+        "type": 1,
         "score": 200,
         "areaId": 1004,
         "pointPosition": "70&-120",
@@ -827,6 +886,7 @@
     },
     {
         "pointId": 10051,
+        "type": 1,
         "score": 600,
         "areaId": 1005,
         "pointPosition": "0&40",
@@ -841,6 +901,7 @@
     },
     {
         "pointId": 10052,
+        "type": 1,
         "score": 600,
         "areaId": 1005,
         "pointPosition": "-80&-80",
@@ -855,6 +916,7 @@
     },
     {
         "pointId": 10053,
+        "type": 1,
         "score": 600,
         "areaId": 1005,
         "pointPosition": "80&-80",
@@ -869,6 +931,7 @@
     },
     {
         "pointId": 11021,
+        "type": 1,
         "score": 200,
         "areaId": 1102,
         "pointPosition": "-70&40",
@@ -883,6 +946,7 @@
     },
     {
         "pointId": 11022,
+        "type": 1,
         "score": 200,
         "areaId": 1102,
         "pointPosition": "70&40",
@@ -897,6 +961,7 @@
     },
     {
         "pointId": 11023,
+        "type": 1,
         "score": 200,
         "areaId": 1102,
         "pointPosition": "-70&-120",
@@ -911,6 +976,7 @@
     },
     {
         "pointId": 11024,
+        "type": 1,
         "score": 200,
         "areaId": 1102,
         "pointPosition": "70&-120",
@@ -925,6 +991,7 @@
     },
     {
         "pointId": 11031,
+        "type": 1,
         "score": 200,
         "areaId": 1103,
         "pointPosition": "-70&40",
@@ -939,6 +1006,7 @@
     },
     {
         "pointId": 11032,
+        "type": 1,
         "score": 200,
         "areaId": 1103,
         "pointPosition": "70&40",
@@ -953,6 +1021,7 @@
     },
     {
         "pointId": 11033,
+        "type": 1,
         "score": 200,
         "areaId": 1103,
         "pointPosition": "-70&-120",
@@ -967,6 +1036,7 @@
     },
     {
         "pointId": 11034,
+        "type": 1,
         "score": 200,
         "areaId": 1103,
         "pointPosition": "70&-120",
@@ -981,6 +1051,7 @@
     },
     {
         "pointId": 11041,
+        "type": 1,
         "score": 200,
         "areaId": 1104,
         "pointPosition": "-70&40",
@@ -995,6 +1066,7 @@
     },
     {
         "pointId": 11042,
+        "type": 1,
         "score": 200,
         "areaId": 1104,
         "pointPosition": "70&40",
@@ -1009,6 +1081,7 @@
     },
     {
         "pointId": 11043,
+        "type": 1,
         "score": 200,
         "areaId": 1104,
         "pointPosition": "-70&-120",
@@ -1023,6 +1096,7 @@
     },
     {
         "pointId": 11044,
+        "type": 1,
         "score": 200,
         "areaId": 1104,
         "pointPosition": "70&-120",
@@ -1037,6 +1111,7 @@
     },
     {
         "pointId": 11051,
+        "type": 1,
         "score": 600,
         "areaId": 1105,
         "pointPosition": "0&40",
@@ -1051,6 +1126,7 @@
     },
     {
         "pointId": 11052,
+        "type": 1,
         "score": 600,
         "areaId": 1105,
         "pointPosition": "-80&-80",
@@ -1065,6 +1141,7 @@
     },
     {
         "pointId": 11053,
+        "type": 1,
         "score": 600,
         "areaId": 1105,
         "pointPosition": "80&-80",
@@ -1079,6 +1156,7 @@
     },
     {
         "pointId": 13021,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "-70&120",
@@ -1093,6 +1171,7 @@
     },
     {
         "pointId": 13022,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "70&120",
@@ -1107,6 +1186,7 @@
     },
     {
         "pointId": 13023,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "-70&0",
@@ -1121,6 +1201,7 @@
     },
     {
         "pointId": 13024,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "70&0",
@@ -1135,6 +1216,7 @@
     },
     {
         "pointId": 13025,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "-70&-120",
@@ -1149,6 +1231,7 @@
     },
     {
         "pointId": 13026,
+        "type": 1,
         "score": 400,
         "areaId": 1302,
         "pointPosition": "70&-120",
@@ -1163,6 +1246,7 @@
     },
     {
         "pointId": 13031,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "-70&120",
@@ -1177,6 +1261,7 @@
     },
     {
         "pointId": 13032,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "70&120",
@@ -1191,6 +1276,7 @@
     },
     {
         "pointId": 13033,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "-70&0",
@@ -1205,6 +1291,7 @@
     },
     {
         "pointId": 13034,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "70&0",
@@ -1219,6 +1306,7 @@
     },
     {
         "pointId": 13035,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "-70&-120",
@@ -1233,6 +1321,7 @@
     },
     {
         "pointId": 13036,
+        "type": 1,
         "score": 400,
         "areaId": 1303,
         "pointPosition": "70&-120",
@@ -1247,6 +1336,7 @@
     },
     {
         "pointId": 13041,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "-70&120",
@@ -1261,6 +1351,7 @@
     },
     {
         "pointId": 13042,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "70&120",
@@ -1275,6 +1366,7 @@
     },
     {
         "pointId": 13043,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "-70&0",
@@ -1289,6 +1381,7 @@
     },
     {
         "pointId": 13044,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "70&0",
@@ -1303,6 +1396,7 @@
     },
     {
         "pointId": 13045,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "-70&-120",
@@ -1317,6 +1411,7 @@
     },
     {
         "pointId": 13046,
+        "type": 1,
         "score": 400,
         "areaId": 1304,
         "pointPosition": "70&-120",
@@ -1331,6 +1426,7 @@
     },
     {
         "pointId": 13051,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "-70&120",
@@ -1345,6 +1441,7 @@
     },
     {
         "pointId": 13052,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "70&120",
@@ -1359,6 +1456,7 @@
     },
     {
         "pointId": 13053,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "-70&0",
@@ -1373,6 +1471,7 @@
     },
     {
         "pointId": 13054,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "70&0",
@@ -1387,6 +1486,7 @@
     },
     {
         "pointId": 13055,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "-70&-120",
@@ -1401,6 +1501,7 @@
     },
     {
         "pointId": 13056,
+        "type": 1,
         "score": 400,
         "areaId": 1305,
         "pointPosition": "70&-120",
@@ -1415,6 +1516,7 @@
     },
     {
         "pointId": 13061,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "-70&120",
@@ -1429,6 +1531,7 @@
     },
     {
         "pointId": 13062,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "70&120",
@@ -1443,6 +1546,7 @@
     },
     {
         "pointId": 13063,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "-70&0",
@@ -1457,6 +1561,7 @@
     },
     {
         "pointId": 13064,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "70&0",
@@ -1471,6 +1576,7 @@
     },
     {
         "pointId": 13065,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "-70&-120",
@@ -1485,6 +1591,7 @@
     },
     {
         "pointId": 13066,
+        "type": 1,
         "score": 1000,
         "areaId": 1306,
         "pointPosition": "70&-120",
@@ -1499,6 +1606,7 @@
     },
     {
         "pointId": 13071,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "-70&120",
@@ -1513,6 +1621,7 @@
     },
     {
         "pointId": 13072,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "70&120",
@@ -1527,6 +1636,7 @@
     },
     {
         "pointId": 13073,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "-70&0",
@@ -1541,6 +1651,7 @@
     },
     {
         "pointId": 13074,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "70&0",
@@ -1555,6 +1666,7 @@
     },
     {
         "pointId": 13075,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "-70&-120",
@@ -1569,6 +1681,7 @@
     },
     {
         "pointId": 13076,
+        "type": 1,
         "score": 1000,
         "areaId": 1307,
         "pointPosition": "70&-120",
@@ -1583,6 +1696,7 @@
     },
     {
         "pointId": 13081,
+        "type": 1,
         "score": 8000,
         "areaId": 1308,
         "pointPosition": "0&0",
@@ -1594,5 +1708,245 @@
         "ce": 5000000,
         "animation": "red",
         "pointIndex": 1
+    },
+    {
+        "pointId": 1041,
+        "type": 2,
+        "score": 0,
+        "areaId": 104,
+        "pointPosition": "0&0",
+        "pointName": "宛城投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 2041,
+        "type": 2,
+        "score": 0,
+        "areaId": 204,
+        "pointPosition": "0&0",
+        "pointName": "弘农投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 3061,
+        "type": 2,
+        "score": 0,
+        "areaId": 306,
+        "pointPosition": "0&0",
+        "pointName": "河东投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 3071,
+        "type": 2,
+        "score": 0,
+        "areaId": 307,
+        "pointPosition": "0&0",
+        "pointName": "河东投石车2",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 4041,
+        "type": 2,
+        "score": 0,
+        "areaId": 404,
+        "pointPosition": "0&0",
+        "pointName": "宛城投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 5041,
+        "type": 2,
+        "score": 0,
+        "areaId": 504,
+        "pointPosition": "0&0",
+        "pointName": "汝南投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 6041,
+        "type": 2,
+        "score": 0,
+        "areaId": 604,
+        "pointPosition": "0&0",
+        "pointName": "弘农投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 7041,
+        "type": 2,
+        "score": 0,
+        "areaId": 704,
+        "pointPosition": "0&0",
+        "pointName": "颍川投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 8041,
+        "type": 2,
+        "score": 0,
+        "areaId": 804,
+        "pointPosition": "0&0",
+        "pointName": "上党投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 9041,
+        "type": 2,
+        "score": 0,
+        "areaId": 904,
+        "pointPosition": "0&0",
+        "pointName": "北地投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 10061,
+        "type": 2,
+        "score": 0,
+        "areaId": 1006,
+        "pointPosition": "0&0",
+        "pointName": "河东投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 10071,
+        "type": 2,
+        "score": 0,
+        "areaId": 1007,
+        "pointPosition": "0&0",
+        "pointName": "河东投石车2",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 11061,
+        "type": 2,
+        "score": 0,
+        "areaId": 1106,
+        "pointPosition": "0&0",
+        "pointName": "河内投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 11071,
+        "type": 2,
+        "score": 0,
+        "areaId": 1107,
+        "pointPosition": "0&0",
+        "pointName": "河内投石车2",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 13091,
+        "type": 2,
+        "score": 0,
+        "areaId": 1309,
+        "pointPosition": "0&0",
+        "pointName": "洛阳投石车1",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
+    },
+    {
+        "pointId": 13101,
+        "type": 2,
+        "score": 0,
+        "areaId": 1310,
+        "pointPosition": "0&0",
+        "pointName": "洛阳投石车2",
+        "durability": 0,
+        "spine": 16002,
+        "head": 15002,
+        "name": "投石车",
+        "ce": 5000000,
+        "animation": "&",
+        "pointIndex": 0
     }
 ]
\ No newline at end of file