装备

2020-12-18 21:32:10 +08:00
parent e5af16be8e
commit 8bbee53433
10 changed files with 597 additions and 126 deletions
--- a/game-server/app/servers/role/handler/equipHandler.ts
+++ b/game-server/app/servers/role/handler/equipHandler.ts
@@ -1,13 +1,13 @@
 import { Application, BackendSession } from "pinus";
 import { STATUS, EQUIP_STRENGTHEN_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, HERO_SYSTEM_TYPE, CONSUME_TYPE, GOOD_TYPE, HERO_GROW_MAX } from "../../../consts";
 import { ItemInter } from "../../../pubUtils/interface";
-import { resResult, parseReward, getRandomByLen } from "../../../pubUtils/util";
+import { resResult, parseReward, getRandomByLen, getItems } from "../../../pubUtils/util";
 import { addItems, handleCost } from "../../../services/rewardService";
 import { EquipModel, RandSe } from "../../../db/Equip";
 import { HeroModel, EPlace } from "../../../db/Hero";
 import Role from "../../../db/Role";
 import { calPlayerCeAndSave } from "../../../services/playerCeService";
-import { getGoodById, gameData, getJewelById } from "../../../pubUtils/data";
+import { getHeroJob, getGoodById, gameData, getJewelById, getHeroEquipByClassId } from "../../../pubUtils/data";
 import { EQUIP } from "../../../pubUtils/dicParam";
 import { ITID, SPEICAL_ITEM } from "../../../consts/constModules/itemConst";

@@ -346,13 +346,21 @@ export class EquipHandler {
        let obj = ITID.get(goodInfo.itid);
        let ePlaceId = obj.type;
        let curEquips:Array<{seqId: number, hid: number, ePlaceId: number }> = [];
+        let hero = await HeroModel.findByHidAndRole(hid, roleId);
+        if (!hero)
+            return resResult(STATUS.HERO_NOT_FIND);
        if (type == 1) {
+            let { jobid } = gameData.hero.get(hid);
+            let { job_class } = getHeroJob(jobid);
+            let { classId } = getHeroEquipByClassId(goodInfo.itid);
+            // if (_.indexOf(classId, job_class) < 0) 
+            //     return resResult(STATUS.EQUIP_NOT_EQUIPED_HERO);
            if (!!equip.hid) 
                return resResult(STATUS.EQUIP_IS_EQUIPED);
            let ePlace = await HeroModel.getHeroEquip(roleId, hid);
            if (!ePlace) 
                return resResult(STATUS.HERO_NOT_FIND);
-            let index = _.findIndex(ePlace, {id: ePlaceId});
+            let index = _.findIndex(hero.ePlace, {id: ePlaceId});
            if (index < 0)
                return resResult(STATUS.WRONG_PARMS); 
            if (!!ePlace[index].equip) {
@@ -483,7 +491,7 @@ export class EquipHandler {
        if (index > 0)
            return resResult(STATUS.EQUIP_HOLE_NOT_FIND); 
        if (!equip.holes[index].jewel)
-            return resResult(STATUS.JEWEL_IS_NOT_FIND);
+            return resResult(STATUS.EQUIP_NOT_FILL_HOLE);
        goods.push({id: equip.holes[index].jewel, count: 1});
        equip.holes[index].jewel = 0;
        await EquipModel.updateEquipInfo(eid, {holes: equip.holes});
--- a/game-server/config/serverProtos.ts
+++ b/game-server/config/serverProtos.ts
@@ -4,4 +4,94 @@ module.exports = {
        'required string from': 2,
        'required string target': 3
    },
+    'onItemUpdate': {
+        "message Data": {
+            'required uInt32 id': 1,
+            'required uInt32 count': 2,
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    },
+    'onPlayerCeUpdate': {
+        "message Data": {
+            "message Hero": {
+                'required uInt32 hid': 1,
+                'required uInt32 ce': 2,
+            },
+            'required uInt32 ce': 1,
+            'repeated Hero heros': 2,
+            'required uInt32 topFiveCe': 3
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    },
+    'onPlayerDataChange': {
+        "message Data": {
+            'optional uInt32 coin': 1,
+            'optional uInt32 giftGold': 2,
+            'optional uInt32 gold': 3,
+            'optional uInt32 ap': 4
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    },
+    'onHeroSkinChange': {
+        "message Data": {
+            "message SkinInfo": {
+                "message Skin": {
+                    'required uInt32 id': 1,
+                    'required bool enable': 2
+                },
+                'repeated Skin skins': 1,
+            },
+            'repeated SkinInfo skinInfos': 1
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    },
+    'onEquipAdd': {
+        "message Data": {
+            "message EquipInfo": {
+                "message RandSe": {
+                    'required uInt32 id': 1,
+                    'required uInt32 seid': 2,
+                    'required uInt32 rand': 3,
+                    'required uInt32 locked': 4
+                },
+                "message Hole": {
+                    'required uInt32 id': 1,
+                    'required bool enable': 2,
+                    'required bool jewel': 3
+                },
+                'repeated Hole holes': 1,
+                'repeated RandSe randSe': 2,
+                'required uInt32 seqId': 3,
+                'required uInt32 id': 4,
+                'required uInt32 name': 5,
+                'required uInt32 hid': 6,
+                'required uInt32 count': 7,
+                'required uInt32 quality': 8,
+                'required uInt32 type': 9,
+                'required uInt32 wearLv': 10,
+                'required uInt32 suitId': 11,
+                'required uInt32 randRange': 12  
+            },
+            'repeated EquipInfo equipInfos': 1
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    },
+    'onEquipDel': {
+        "message Data": {
+            'repeated uInt32 equips': 1
+        },
+        'required string msg': 1,
+        'required uInt32 code': 2,
+        'required Data data': 3
+    }
 };
--- a/shared/consts/constModules/sysConst.ts
+++ b/shared/consts/constModules/sysConst.ts
@@ -85,7 +85,8 @@ export const FILENAME = {
  DIC_QUESTION: 'Questions',
  DIC_RANDOM_EFFECT_POOL: 'dic_zyz_randomEffectPool',
  DIC_STRENGTHEN_COST: 'dic_zyz_enhancementCost',
-  DIC_REFINE: 'dic_zyz_jinglian'
+  DIC_REFINE: 'dic_zyz_jinglian',
+  DIC_HERO_EQUIP: 'dic_zyz_heroEquip'
 }

 export const WAR_RELATE_TABLES = [
--- a/shared/consts/statusCode.ts
+++ b/shared/consts/statusCode.ts
@@ -161,6 +161,8 @@ export const STATUS = {
    EQUIP_HOLE_IS_DUG: {code: 30505, simStr: '装备已经打过孔' },
    EQUIP_HOLE_IS_NOT_DUG: {code: 30505, simStr: '装备未打过孔' },
    JEWEL_IS_NOT_FIND: {code: 30506, simStr: '宝石不存在' },
+    EQUIP_NOT_FILL_HOLE: {code: 30506, simStr: '未穿戴宝石' },
+    EQUIP_NOT_EQUIPED_HERO: {code: 30502, simStr: '装备不能被该武将穿戴'},

    // 社交相关状态 40000 - 49999
    // 运营模块相关状态 50000 - 59999
--- a/shared/pubUtils/data.ts
+++ b/shared/pubUtils/data.ts
@@ -28,7 +28,7 @@ import { dicHeroWake } from "./dictionary/DicHeroWake";
 import { dicRandomEffectPool } from './dictionary/DicRandomEffectPool';
 import { dicStrengthenCost } from './dictionary/DicStrengthenCost';
 import { dicRefine } from './dictionary/DicRefine';
-
+import { dicHeroEquip } from './dictionary/DicHeroEquip';
 export const gameData = {
    blurprtCompose: dicBlueprtCompose,
    blueprtPossibility: dicBlueprtPossibility,
@@ -67,7 +67,8 @@ export const gameData = {
    randomEffectPool: dicRandomEffectPool,
    strengthenCost: dicStrengthenCost,
    refine: dicRefine,
-    jewels: jewels
+    jewels: jewels,
+    dicHeroEquip: dicHeroEquip
 };

 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -181,6 +182,16 @@ export function getFriendShipById(shipId: number, level: number) {
 export function getGoodById(gid:number) {
    return gameData.goods.get(gid);
 }
+
 export function getJewelById(gid:number) {
    return gameData.jewels.get(gid);
 }
+
+export function getHeroEquipByClassId(classId:number) {
+    return gameData.dicHeroEquip.get(classId);
+}
+
+export function getHeroJob(jobId: number) {
+    const job = gameData.job.get(jobId);
+    return job;
+}
--- a/shared/pubUtils/dictionary/DicHeroEquip.ts
+++ b/shared/pubUtils/dictionary/DicHeroEquip.ts
@@ -0,0 +1,24 @@
+// 藏宝图合成表
+import { readJsonFile, parseNumberList } from '../util'
+import { FILENAME } from '../../consts'
+const _ = require('lodash');
+
+export interface DicHeroEquip {
+    readonly itId: number;
+    readonly classId: Array<number>;
+}
+
+const str = readJsonFile(FILENAME.DIC_HERO_EQUIP);
+let arr = JSON.parse(str);
+type KeysEnum<T> = { [P in keyof Required<T>]: true };
+const DicHeroEquipKeys: KeysEnum<DicHeroEquip> = {
+    itId: true, 
+    classId: true
+}
+export const dicHeroEquip = new Map<number, DicHeroEquip>();
+arr.forEach(o => {
+    o.classId = parseNumberList(o.classId);
+    dicHeroEquip.set(o.itId, _.pick(o, Object.keys(DicHeroEquipKeys)));
+});
+
+arr = undefined;
--- a/shared/pubUtils/dictionary/DicJob.ts
+++ b/shared/pubUtils/dictionary/DicJob.ts
@@ -59,4 +59,6 @@ arr.forEach(o => {
    }
    jobClassAndgrades.set(o.job_class+'_'+o.grade,{unlockLevel:o.unlockLevel, jobid:o.jobid});

-});
+});
+
+arr = undefined;
--- a/shared/resource/jsons/const.json
+++ b/shared/resource/jsons/const.json
@@ -1,4 +1,4 @@
-[
+[
  {
    "IsTestService":true,
    "OpenIosAliPay":false,
--- a/shared/resource/jsons/dic_goods.json
+++ b/shared/resource/jsons/dic_goods.json
@@ -152,9 +152,9 @@
        "itid": 1,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42005,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50001&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -332,9 +332,9 @@
        "itid": 2,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42010,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50002&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -512,9 +512,9 @@
        "itid": 3,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42015,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50003&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -692,9 +692,9 @@
        "itid": 4,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42020,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50004&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -872,9 +872,9 @@
        "itid": 5,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42025,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50005&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1052,9 +1052,9 @@
        "itid": 6,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42030,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50006&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1232,9 +1232,9 @@
        "itid": 7,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42035,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50007&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1412,9 +1412,9 @@
        "itid": 8,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42040,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50008&1|17047&500",
+        "sepcialMaterial": "4&104&204&304&404&504&604&704|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1592,9 +1592,9 @@
        "itid": 9,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42045,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50009&1|17049&500",
+        "sepcialMaterial": "2004&2009&2014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1772,9 +1772,9 @@
        "itid": 10,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42050,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50010&1|17049&500",
+        "sepcialMaterial": "2004&2009&2014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -1952,9 +1952,9 @@
        "itid": 11,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42055,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50011&1|17049&500",
+        "sepcialMaterial": "2004&2009&2014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -2132,9 +2132,9 @@
        "itid": 12,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42060,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50012&1|17048&500",
+        "sepcialMaterial": "3004&3009&3014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -2312,9 +2312,9 @@
        "itid": 13,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42065,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50013&1|17048&500",
+        "sepcialMaterial": "3004&3009&3014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -2492,9 +2492,9 @@
        "itid": 14,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42070,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50014&1|17048&500",
+        "sepcialMaterial": "3004&3009&3014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -2672,9 +2672,9 @@
        "itid": 15,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42075,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50015&1|17052&500",
+        "sepcialMaterial": "4004&4009&4014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -2852,9 +2852,9 @@
        "itid": 16,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42080,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50016&1|17052&500",
+        "sepcialMaterial": "4004&4009&4014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3032,9 +3032,9 @@
        "itid": 17,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42085,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50017&1|17052&500",
+        "sepcialMaterial": "4004&4009&4014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3212,9 +3212,9 @@
        "itid": 18,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42090,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50018&1|17050&500",
+        "sepcialMaterial": "5004|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3392,9 +3392,9 @@
        "itid": 19,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42095,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50019&1|17050&500",
+        "sepcialMaterial": "5009|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3572,9 +3572,9 @@
        "itid": 20,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42100,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50020&1|17050&500",
+        "sepcialMaterial": "5014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3752,9 +3752,9 @@
        "itid": 21,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42105,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50021&1|17051&500",
+        "sepcialMaterial": "6004&6009&6014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -3932,9 +3932,9 @@
        "itid": 22,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42110,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50022&1|17051&500",
+        "sepcialMaterial": "6004&6009&6014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -4112,9 +4112,9 @@
        "itid": 23,
        "goodType": 2,
        "pieces": 10,
-        "pieceId": 42115,
-        "composeMaterial": "&",
-        "sepcialMaterial": "&",
+        "pieceId": 0,
+        "composeMaterial": "50023&1|17051&500",
+        "sepcialMaterial": "6004&6009&6014|1",
        "decomposeItem": "&",
        "hole": 2,
        "randomEffect": "1&2&3&4&5&6&7&8&9&10&11&12&13&14&15&16&17&18&19&20",
@@ -6299,6 +6299,222 @@
        "value": 0,
        "info": "&"
    },
+    {
+        "good_id": 17047,
+        "name": "神兵精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 1,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
+    {
+        "good_id": 17048,
+        "name": "宝甲精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 2,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
+    {
+        "good_id": 17049,
+        "name": "冠冕精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 3,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
+    {
+        "good_id": 17050,
+        "name": "行具精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 4,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
+    {
+        "good_id": 17051,
+        "name": "礼器精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 5,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
+    {
+        "good_id": 17052,
+        "name": "典籍精魄",
+        "lvLimted": 1,
+        "quality": 1,
+        "image_id": 1,
+        "itid": 38,
+        "goodType": 1,
+        "pieces": 0,
+        "pieceId": 0,
+        "composeMaterial": "&",
+        "sepcialMaterial": "&",
+        "decomposeItem": "&",
+        "hole": 6,
+        "randomEffect": "&",
+        "hid": 0,
+        "hp": 0,
+        "atk": 0,
+        "matk": 0,
+        "def": 0,
+        "mdef": 0,
+        "agi": 0,
+        "luk": 0,
+        "hp_up": 0,
+        "atk_up": 0,
+        "matk_up": 0,
+        "def_up": 0,
+        "mdef_up": 0,
+        "agi_up": 0,
+        "luk_up": 0,
+        "specialAttr": "&",
+        "suitId": 0,
+        "getWays": "1&0",
+        "value": 0,
+        "info": "&"
+    },
    {
        "good_id": 20001,
        "name": "精致宝箱",
@@ -22941,7 +23157,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60001&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -22977,7 +23193,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60002&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23013,7 +23229,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60003&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23049,7 +23265,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60004&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23085,7 +23301,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60005&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23121,7 +23337,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60006&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23157,7 +23373,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60007&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23193,7 +23409,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60008&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23265,7 +23481,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60011&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23301,7 +23517,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60012&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23337,7 +23553,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60013&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23373,7 +23589,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60014&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23409,7 +23625,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60015&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23445,7 +23661,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60016&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23481,7 +23697,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60017&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23517,7 +23733,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60018&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23589,7 +23805,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60021&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23625,7 +23841,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60022&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23661,7 +23877,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60023&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23697,7 +23913,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60024&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23733,7 +23949,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60025&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23769,7 +23985,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60026&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23805,7 +24021,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60027&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23841,7 +24057,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60028&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23913,7 +24129,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60031&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23949,7 +24165,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60032&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -23985,7 +24201,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60033&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24021,7 +24237,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60034&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24057,7 +24273,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60035&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24093,7 +24309,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60036&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24129,7 +24345,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60037&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24165,7 +24381,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60038&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24237,7 +24453,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60041&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24273,7 +24489,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60042&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24309,7 +24525,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60043&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24345,7 +24561,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60044&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24381,7 +24597,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60045&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24417,7 +24633,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60046&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24453,7 +24669,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60047&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24489,7 +24705,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60048&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24561,7 +24777,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60051&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24597,7 +24813,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60052&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24633,7 +24849,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60053&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24669,7 +24885,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60054&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24705,7 +24921,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60055&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24741,7 +24957,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60056&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24777,7 +24993,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60057&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
@@ -24813,7 +25029,7 @@
        "goodType": 5,
        "pieces": 0,
        "pieceId": 0,
-        "composeMaterial": "&",
+        "composeMaterial": "60058&3",
        "sepcialMaterial": "&",
        "decomposeItem": "&",
        "hole": 0,
--- a/shared/resource/jsons/dic_zyz_heroEquip.json
+++ b/shared/resource/jsons/dic_zyz_heroEquip.json
@@ -0,0 +1,117 @@
+[
+    {
+        "id": 1,
+        "itId": 1,
+        "classId": "1&"
+    },
+    {
+        "id": 2,
+        "itId": 2,
+        "classId": "2&"
+    },
+    {
+        "id": 3,
+        "itId": 3,
+        "classId": "3&"
+    },
+    {
+        "id": 4,
+        "itId": 4,
+        "classId": "4&"
+    },
+    {
+        "id": 5,
+        "itId": 5,
+        "classId": "5&"
+    },
+    {
+        "id": 6,
+        "itId": 6,
+        "classId": "6&"
+    },
+    {
+        "id": 7,
+        "itId": 7,
+        "classId": "7&"
+    },
+    {
+        "id": 8,
+        "itId": 8,
+        "classId": "8&"
+    },
+    {
+        "id": 9,
+        "itId": 9,
+        "classId": "1&3"
+    },
+    {
+        "id": 10,
+        "itId": 10,
+        "classId": "2&4&5"
+    },
+    {
+        "id": 11,
+        "itId": 11,
+        "classId": "6&7&8"
+    },
+    {
+        "id": 12,
+        "itId": 12,
+        "classId": "1&3"
+    },
+    {
+        "id": 13,
+        "itId": 13,
+        "classId": "2&4&5"
+    },
+    {
+        "id": 14,
+        "itId": 14,
+        "classId": "6&7&8"
+    },
+    {
+        "id": 15,
+        "itId": 15,
+        "classId": "1&2&3&4"
+    },
+    {
+        "id": 16,
+        "itId": 16,
+        "classId": "5&7"
+    },
+    {
+        "id": 17,
+        "itId": 17,
+        "classId": "6&8"
+    },
+    {
+        "id": 18,
+        "itId": 18,
+        "classId": "3&5"
+    },
+    {
+        "id": 19,
+        "itId": 19,
+        "classId": "1&2&4"
+    },
+    {
+        "id": 20,
+        "itId": 20,
+        "classId": "6&7&8"
+    },
+    {
+        "id": 21,
+        "itId": 21,
+        "classId": "7&8"
+    },
+    {
+        "id": 22,
+        "itId": 22,
+        "classId": "1&2&3&4"
+    },
+    {
+        "id": 23,
+        "itId": 23,
+        "classId": "5&6"
+    }
+]