diff --git a/game-server/app/services/role/calCe.ts b/game-server/app/services/role/calCe.ts index 1954fb4e2..57219a96b 100644 --- a/game-server/app/services/role/calCe.ts +++ b/game-server/app/services/role/calCe.ts @@ -51,7 +51,7 @@ export class CalCe { if(ABI_TYPE_MAIN.indexOf(attrId) != -1) { // {[ hp1 + lv * hp2 ] * ( 1 + hp5 ) + [( hp6 + hp7 ) * ( 1 + hp8 )]} * ( 1 + hp9 ) + hp10 + hp11 val = (( mainBase + job + lv * starUp ) * ( 1 + connect/100 ) + (( equipQuality + equipStrength ) * ( 1 + ( equipStar/100 + equipSuit/100 )))) * ( 1 + jewel/100 + school/100 + talent/100 + skin/100 ) + stone + teraph + title + scroll; - str += `{[${mainBase}+${job}+${lv}*${starUp}]* ( 1 + ${connect}/100) + [(${equipQuality}+${equipStrength}) * ( 1 + ${equipStar}/100+${equipSuit}/100)]} * (1+${jewel}/100+${school}/100+${talent}/100+${skin}/100 )+${stone}+${teraph}+${title}+${scroll}+${skin}`; + str += `{[${mainBase}+${job}+${lv}*${starUp}]* ( 1 + ${connect}/100) + [(${equipQuality}+${equipStrength}) * ( 1 + ${equipStar}/100+${equipSuit}/100)]} * (1+${jewel}/100+${school}/100+${talent}/100+${skin}/100 )+${stone}+${teraph}+${title}+${scroll}`; } else { // attr1 + attr2 + attr4 + attr5 + attr6 + attr7 + attr9 val = subBase + job + teraph + school + title + jewel + equipStar; diff --git a/shared/resource/jsons/dic_zyz_fashions.json b/shared/resource/jsons/dic_zyz_fashions.json index 8564d663e..a5e8b1bd7 100644 --- a/shared/resource/jsons/dic_zyz_fashions.json +++ b/shared/resource/jsons/dic_zyz_fashions.json @@ -5,6 +5,7 @@ "heroId": 1, "globalAttr": "&", "actorId": 1, + "skinQuality": 0, "cv": "赵悦程" }, { @@ -13,6 +14,7 @@ "heroId": 2, "globalAttr": "&", "actorId": 2, + "skinQuality": 0, "cv": "诺辰" }, { @@ -21,6 +23,7 @@ "heroId": 3, "globalAttr": "&", "actorId": 3, + "skinQuality": 0, "cv": "杨超然" }, { @@ -29,6 +32,7 @@ "heroId": 4, "globalAttr": "&", "actorId": 4, + "skinQuality": 0, "cv": "张沛" }, { @@ -37,6 +41,7 @@ "heroId": 5, "globalAttr": "&", "actorId": 5, + "skinQuality": 0, "cv": "林景" }, { @@ -45,6 +50,7 @@ "heroId": 7, "globalAttr": "&", "actorId": 7, + "skinQuality": 0, "cv": "陈润秋" }, { @@ -53,6 +59,7 @@ "heroId": 8, "globalAttr": "&", "actorId": 8, + "skinQuality": 0, "cv": "郑武文杰" }, { @@ -61,6 +68,7 @@ "heroId": 10, "globalAttr": "&", "actorId": 10, + "skinQuality": 0, "cv": "宋国庆" }, { @@ -69,6 +77,7 @@ "heroId": 11, "globalAttr": "&", "actorId": 11, + "skinQuality": 0, "cv": "邵晨" }, { @@ -77,6 +86,7 @@ "heroId": 12, "globalAttr": "&", "actorId": 12, + "skinQuality": 0, "cv": "秦且歌" }, { @@ -85,6 +95,7 @@ "heroId": 13, "globalAttr": "&", "actorId": 13, + "skinQuality": 0, "cv": "子音" }, { @@ -93,6 +104,7 @@ "heroId": 14, "globalAttr": "&", "actorId": 14, + "skinQuality": 0, "cv": "林景" }, { @@ -101,6 +113,7 @@ "heroId": 16, "globalAttr": "&", "actorId": 16, + "skinQuality": 0, "cv": "鱼冻" }, { @@ -109,6 +122,7 @@ "heroId": 17, "globalAttr": "&", "actorId": 17, + "skinQuality": 0, "cv": "赵梓涵" }, { @@ -117,6 +131,7 @@ "heroId": 18, "globalAttr": "&", "actorId": 18, + "skinQuality": 0, "cv": "孟祥龙" }, { @@ -125,14 +140,16 @@ "heroId": 19, "globalAttr": "&", "actorId": 19, + "skinQuality": 0, "cv": "林景" }, { "goodId": 41119, "name": "枪出如龙", "heroId": 41119, - "globalAttr": "1&800|2&400|4&240|5&240", + "globalAttr": "1&1|2&1|4&1|5&1", "actorId": 19, + "skinQuality": 1, "cv": "林景" }, { @@ -141,6 +158,7 @@ "heroId": 20, "globalAttr": "&", "actorId": 20, + "skinQuality": 0, "cv": "初华峥" }, { @@ -149,6 +167,7 @@ "heroId": 21, "globalAttr": "&", "actorId": 21, + "skinQuality": 0, "cv": "许棕哲" }, { @@ -157,14 +176,16 @@ "heroId": 22, "globalAttr": "&", "actorId": 22, + "skinQuality": 0, "cv": "鱼冻" }, { "goodId": 41122, "name": "连弩武侯", "heroId": 41122, - "globalAttr": "1&1200|2&600|4&360|5&360", + "globalAttr": "1&2|2&2|4&2|5&2", "actorId": 22, + "skinQuality": 2, "cv": "鱼冻" }, { @@ -173,6 +194,7 @@ "heroId": 24, "globalAttr": "&", "actorId": 24, + "skinQuality": 0, "cv": "萧翟" }, { @@ -181,6 +203,7 @@ "heroId": 25, "globalAttr": "&", "actorId": 25, + "skinQuality": 0, "cv": "秦且歌" }, { @@ -189,6 +212,7 @@ "heroId": 26, "globalAttr": "&", "actorId": 26, + "skinQuality": 0, "cv": "溯浔" }, { @@ -197,6 +221,7 @@ "heroId": 27, "globalAttr": "&", "actorId": 27, + "skinQuality": 0, "cv": "金娜" }, { @@ -205,6 +230,7 @@ "heroId": 28, "globalAttr": "&", "actorId": 28, + "skinQuality": 0, "cv": "郑武文杰" }, { @@ -213,6 +239,7 @@ "heroId": 30, "globalAttr": "&", "actorId": 30, + "skinQuality": 0, "cv": "诺辰" }, { @@ -221,6 +248,7 @@ "heroId": 31, "globalAttr": "&", "actorId": 31, + "skinQuality": 0, "cv": "张沛" }, { @@ -229,6 +257,7 @@ "heroId": 32, "globalAttr": "&", "actorId": 32, + "skinQuality": 0, "cv": "许棕哲" }, { @@ -237,6 +266,7 @@ "heroId": 33, "globalAttr": "&", "actorId": 33, + "skinQuality": 0, "cv": "杨超然" }, { @@ -245,6 +275,7 @@ "heroId": 34, "globalAttr": "&", "actorId": 34, + "skinQuality": 0, "cv": "秦且歌" }, { @@ -253,6 +284,7 @@ "heroId": 35, "globalAttr": "&", "actorId": 35, + "skinQuality": 0, "cv": "陈润秋" }, { @@ -261,6 +293,7 @@ "heroId": 36, "globalAttr": "&", "actorId": 36, + "skinQuality": 0, "cv": "鹿喑" }, { @@ -269,6 +302,7 @@ "heroId": 37, "globalAttr": "&", "actorId": 37, + "skinQuality": 0, "cv": "邵晨" }, { @@ -277,14 +311,7 @@ "heroId": 38, "globalAttr": "&", "actorId": 38, - "cv": "子音" - }, - { - "goodId": 41138, - "name": "红袖枭姬", - "heroId": 41138, - "globalAttr": "1&1200|2&600|4&360|5&360", - "actorId": 38, + "skinQuality": 0, "cv": "子音" }, { @@ -293,14 +320,16 @@ "heroId": 40, "globalAttr": "&", "actorId": 40, + "skinQuality": 0, "cv": "紫苏" }, { "goodId": 41140, "name": "曲误周顾", "heroId": 41140, - "globalAttr": "1&800|2&400|4&240|5&240", + "globalAttr": "1&1|2&1|4&1|5&1", "actorId": 40, + "skinQuality": 1, "cv": "紫苏" }, { @@ -309,6 +338,7 @@ "heroId": 41, "globalAttr": "&", "actorId": 41, + "skinQuality": 0, "cv": "溯浔" }, { @@ -317,14 +347,16 @@ "heroId": 44, "globalAttr": "&", "actorId": 44, + "skinQuality": 0, "cv": "陈润秋" }, { "goodId": 41144, "name": "无双飞将", "heroId": 41144, - "globalAttr": "1&1200|2&600|4&360|5&360", + "globalAttr": "1&2|2&2|4&2|5&2", "actorId": 44, + "skinQuality": 3, "cv": "陈润秋" }, { @@ -333,6 +365,7 @@ "heroId": 45, "globalAttr": "&", "actorId": 45, + "skinQuality": 0, "cv": "鹿喑" }, { @@ -341,6 +374,7 @@ "heroId": 46, "globalAttr": "&", "actorId": 46, + "skinQuality": 0, "cv": "林景" }, { @@ -349,6 +383,7 @@ "heroId": 47, "globalAttr": "&", "actorId": 47, + "skinQuality": 0, "cv": "鱼冻" }, { @@ -357,6 +392,7 @@ "heroId": 49, "globalAttr": "&", "actorId": 49, + "skinQuality": 0, "cv": "赵梓涵" }, { @@ -365,6 +401,7 @@ "heroId": 50, "globalAttr": "&", "actorId": 50, + "skinQuality": 0, "cv": "赵悦程" }, { @@ -373,6 +410,7 @@ "heroId": 51, "globalAttr": "&", "actorId": 51, + "skinQuality": 0, "cv": "萧翟" }, { @@ -381,6 +419,7 @@ "heroId": 52, "globalAttr": "&", "actorId": 52, + "skinQuality": 0, "cv": "紫苏" }, { @@ -389,14 +428,16 @@ "heroId": 53, "globalAttr": "&", "actorId": 53, + "skinQuality": 0, "cv": "金娜" }, { "goodId": 41153, - "name": "少女无暇", + "name": "甜心喵爪", "heroId": 41153, - "globalAttr": "1&800|2&400|4&240|5&240", + "globalAttr": "1&1|2&1|4&1|5&1", "actorId": 53, + "skinQuality": 1, "cv": "金娜" }, { @@ -405,6 +446,7 @@ "heroId": 54, "globalAttr": "&", "actorId": 54, + "skinQuality": 0, "cv": "张沛" }, { @@ -413,6 +455,7 @@ "heroId": 55, "globalAttr": "&", "actorId": 55, + "skinQuality": 0, "cv": "宋国庆" }, { @@ -421,14 +464,16 @@ "heroId": 56, "globalAttr": "&", "actorId": 56, + "skinQuality": 0, "cv": "溯浔" }, { "goodId": 41156, "name": "有女初成", "heroId": 41156, - "globalAttr": "1&800|2&400|4&240|5&240", + "globalAttr": "1&1|2&1|4&1|5&1", "actorId": 56, + "skinQuality": 1, "cv": "溯浔" }, { @@ -437,6 +482,7 @@ "heroId": 57, "globalAttr": "&", "actorId": 57, + "skinQuality": 0, "cv": "许棕哲" }, { @@ -445,6 +491,7 @@ "heroId": 58, "globalAttr": "&", "actorId": 58, + "skinQuality": 0, "cv": "王宇69" }, { @@ -453,6 +500,7 @@ "heroId": 59, "globalAttr": "&", "actorId": 59, + "skinQuality": 0, "cv": "孟祥龙" }, { @@ -461,6 +509,7 @@ "heroId": 60, "globalAttr": "&", "actorId": 60, + "skinQuality": 0, "cv": "林景" }, { @@ -469,6 +518,7 @@ "heroId": 61, "globalAttr": "&", "actorId": 61, + "skinQuality": 0, "cv": "金娜" }, { @@ -477,6 +527,7 @@ "heroId": 62, "globalAttr": "&", "actorId": 62, + "skinQuality": 0, "cv": "宋国庆" }, { @@ -485,6 +536,7 @@ "heroId": 63, "globalAttr": "&", "actorId": 63, + "skinQuality": 0, "cv": "初华峥" }, { @@ -493,30 +545,25 @@ "heroId": 64, "globalAttr": "&", "actorId": 64, + "skinQuality": 0, "cv": "孟祥龙" }, - { - "goodId": 41200, - "name": "重甲英姿", - "heroId": 41200, - "globalAttr": "1&800|2&400|4&240|5&240", - "actorId": 53, - "cv": "金娜" - }, { "goodId": 41201, "name": "凌波剑意", "heroId": 41201, - "globalAttr": "1&800|2&400|4&240|5&240", + "globalAttr": "1&2|2&2|4&2|5&2", "actorId": 53, + "skinQuality": 2, "cv": "金娜" }, { "goodId": 41202, "name": "银枪白马", "heroId": 41202, - "globalAttr": "1&1200|2&600|4&360|5&360", + "globalAttr": "1&2|2&2|4&2|5&2", "actorId": 19, + "skinQuality": 3, "cv": "林景" } ] \ No newline at end of file