diff --git a/game-server/app/services/guildActivity/guildActivityService.ts b/game-server/app/services/guildActivity/guildActivityService.ts index 4ec15d7fc..c46f9cd70 100644 --- a/game-server/app/services/guildActivity/guildActivityService.ts +++ b/game-server/app/services/guildActivity/guildActivityService.ts @@ -784,13 +784,9 @@ export async function getCityActivityGateHp(serverId: number, cityId: number) { if(serverRecord.activePlayers?.length > 0) activeTopPlayerCnt = serverRecord.activePlayers?.length; if(serverRecord.activeGuildCodes?.length > 0) activeGuildCnt = serverRecord.activeGuildCodes?.length; } - console.log(`getCityActivityGateHp: activePlayerCnt ${activePlayerCnt}, activePlayerCe ${activePlayerCe}, activeTopPlayerCnt ${activeTopPlayerCnt} activeGuildCnt ${activeGuildCnt}`); - let dicWarJson = gameData.warJson.get(dicCityActivity.warid); - let dicDoor = dicWarJson.find(cur => cur.actorId == CITY_ACTIVITY_DOOR); - let attribute = dicDoor.attribute.find(cur => cur.id == ABI_TYPE.ABI_ATK); - let atk = attribute? attribute.val: 0; + let atk = dicCityActivity.atkTemplate||0; console.log(`getCityActivityGateHp: atk ${atk}`); let A = activePlayerCe/activeTopPlayerCnt/6/GUILDACTIVITY.GATEACTIVITY_ENEMYCE; diff --git a/shared/pubUtils/dictionary/DicCityActivity.ts b/shared/pubUtils/dictionary/DicCityActivity.ts index 92c73067f..0b4322dc8 100644 --- a/shared/pubUtils/dictionary/DicCityActivity.ts +++ b/shared/pubUtils/dictionary/DicCityActivity.ts @@ -22,6 +22,8 @@ export interface DicCityActivity { readonly hp: number; // 城门倍率 readonly hpN: number; + // 城门用于计算血量的攻击值模板 + readonly atkTemplate: number; } export const dicCityActivity = new Map(); diff --git a/shared/resource/jsons/dic_zyz_cityActivity.json b/shared/resource/jsons/dic_zyz_cityActivity.json index 4b7b2847b..7fcc6c78e 100644 --- a/shared/resource/jsons/dic_zyz_cityActivity.json +++ b/shared/resource/jsons/dic_zyz_cityActivity.json @@ -9,7 +9,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 2, @@ -21,7 +22,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 3, @@ -33,7 +35,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 4, @@ -45,7 +48,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 5, @@ -57,7 +61,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 6, @@ -69,7 +74,8 @@ "warid": 7002, "hp": 5000000, "week": "2&4&6", - "hpN": 40 + "hpN": 40, + "atkTemplate": 3000 }, { "id": 7, @@ -81,7 +87,8 @@ "warid": 7003, "hp": 10000000, "week": "4&6", - "hpN": 50 + "hpN": 50, + "atkTemplate": 3000 }, { "id": 8, @@ -93,7 +100,8 @@ "warid": 7003, "hp": 10000000, "week": "4&6", - "hpN": 50 + "hpN": 50, + "atkTemplate": 3000 }, { "id": 9, @@ -105,7 +113,8 @@ "warid": 7003, "hp": 10000000, "week": "4&6", - "hpN": 50 + "hpN": 50, + "atkTemplate": 3000 }, { "id": 10, @@ -117,6 +126,7 @@ "warid": 7004, "hp": 30000000, "week": "6&", - "hpN": 60 + "hpN": 60, + "atkTemplate": 3000 } ] \ No newline at end of file diff --git a/shared/resource/warJsons/7002.json b/shared/resource/warJsons/7002.json index 59b346ba9..9e41b53b3 100644 --- a/shared/resource/warJsons/7002.json +++ b/shared/resource/warJsons/7002.json @@ -145,7 +145,7 @@ "lv": 40, "hide": 1, "initial_ai": 0, - "attribute": "2&3000", + "attribute": "&", "skill": 0, "seid": 0, "star": 0, @@ -166,7 +166,7 @@ "var": 2002, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&3202|2&1100|4&520|5&440", "skill": 0, "seid": 0, @@ -188,7 +188,7 @@ "var": 2003, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&3202|2&1100|4&520|5&440", "skill": 0, "seid": 0, @@ -210,7 +210,7 @@ "var": 2004, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&2245|2&1550|4&330|5&470", "skill": 0, "seid": 0, @@ -232,7 +232,7 @@ "var": 2005, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&2245|2&1550|4&330|5&470", "skill": 0, "seid": 0, @@ -254,7 +254,7 @@ "var": 2006, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&2080|2&1620|4&400|5&380", "skill": 0, "seid": 0, @@ -276,7 +276,7 @@ "var": 2007, "lv": 40, "hide": 0, - "initial_ai": 3, + "initial_ai": 1, "attribute": "1&2080|2&1620|4&400|5&380", "skill": 0, "seid": 0, diff --git a/shared/resource/warJsons/7003.json b/shared/resource/warJsons/7003.json index bd91b941b..b611045f5 100644 --- a/shared/resource/warJsons/7003.json +++ b/shared/resource/warJsons/7003.json @@ -145,7 +145,7 @@ "lv": 45, "hide": 1, "initial_ai": 0, - "attribute": "2&3000", + "attribute": "&", "skill": 0, "seid": 0, "star": 0, diff --git a/shared/resource/warJsons/7004.json b/shared/resource/warJsons/7004.json index 7d23336e9..a5b394905 100644 --- a/shared/resource/warJsons/7004.json +++ b/shared/resource/warJsons/7004.json @@ -145,7 +145,7 @@ "lv": 45, "hide": 1, "initial_ai": 0, - "attribute": "2&3000", + "attribute": "&", "skill": 0, "seid": 0, "star": 0,