Revert "revert 50867e88 to a1aabfdd"

This reverts commit a112732226.

shared/consts/constModules/abilityConst.ts

@@ -9,15 +9,15 @@ export enum ABI_TYPE{
     ABI_HP = 1,
     /**物攻 */
     ABI_ATK = 2,
-    /**策攻 */
+    /**策攻  (废弃)*/
     ABI_MATK = 3,
     /**物防 */
     ABI_DEF = 4,
     /**策防 */
     ABI_MDEF = 5,
-    /**敏捷 */
+    /**敏捷  (废弃)*/
     ABI_AGI = 6,
-    /**幸运 */
+    /**幸运  (废弃)*/
     ABI_LUK = 7,
     /**移动 */
     ABI_SPEED = 8,
@@ -30,9 +30,9 @@ export enum ABI_TYPE{
     ABI_FLEE = 11,
     /**抗暴等级 */
     ABI_ANT_CRI = 12,
-    /**伤害加深等级 */
+    /**伤害加深等级  (废弃) */
     ABI_DAMAGE_INCREASE = 13,
-    /**伤害减免等级 */
+    /**伤害减免等级  (废弃) */
     ABI_DAMAGE_DECREASE = 14,
     /**忽视防御等级 */
     ABI_DEF_IGNORE = 15,
@@ -42,6 +42,16 @@ export enum ABI_TYPE{
     ABI_AP = 17,
     /**暴击伤害 */
     ABI_DAMAGE_CRI = 18,
+    /**物伤加深 */
+    ABI_PDAMAGE_INC = 19,
+    /**法伤加深 */
+    ABI_MDAMAGE_INC = 20,
+    /**物伤减免 */
+    ABI_PDAMAGE_DEC = 21,
+    /**法伤减免 */
+    ABI_MDAMAGE_DEC = 22,
+    /**反击伤害 */
+    ABI_STRIKE_BACK = 23,
 
     ABI_MAX,
 }
@@ -84,6 +94,10 @@ export enum ABI_STAGE {
     END = 4
 }
 
+export enum ABI_JOB_STAGE {
+    START = 0,
+    END = 6
+}
 export const ATTR = {}
 
 export const HERO_ATTR = {
@@ -103,8 +117,13 @@ export const HERO_ATTR = {
     14: "damageDecrease",  // 伤害减免等级
     15: "defIngnore",  // 忽视防御等级
     16: "bloodSuck",   // 吸血等级
-    17: "damageCri",    // 暴击伤害
-    18: "ap"    // 暴击伤害
+    17: "ap",    // 怒气
+    18: "damageCri",    // 暴击伤害
+    19: "pdamageInc",   // 物伤加深
+    20: "mdamageInc",   // 法伤加深
+    21: "pdamageDec",   // 物伤减免
+    22: "mdamageDec",   // 法伤减免
+    23: "strikeBack",   // 反击伤害
 };
 
 export const ABI_TYPE_TO_STAGE = new Map<number,  number>([

shared/consts/constModules/itemConst.ts

@@ -1,3 +1,5 @@
+import { ABI_TYPE } from "./abilityConst";
+
 export const IT_TYPE = {
     BLUEPRT: 28,
     EQUIP_PIECE: 40,
@@ -67,6 +69,15 @@ export enum EQUIP_TYPE {
     END = 6
 }
 
+export const equipTypeToSortAttr = new Map([
+    [ EQUIP_TYPE.WEAPON, ABI_TYPE.ABI_ATK ],
+    [ EQUIP_TYPE.CLOTHES, ABI_TYPE.ABI_HP ],
+    [ EQUIP_TYPE.SHOES, ABI_TYPE.ABI_ATK ],
+    [ EQUIP_TYPE.CAP, ABI_TYPE.ABI_HP ],
+    [ EQUIP_TYPE.ACCESSORY, ABI_TYPE.ABI_DEF ],
+    [ EQUIP_TYPE.BOOK, ABI_TYPE.ABI_MDEF ]
+]);
+
 export enum JEWEL_TYPE {
     WEAPON = 42,      // 神兵（武器）
     CLOTHES = 43,     // 宝甲（上装）