导表

assets/json/mergeInfo.json

@@ -1,7 +1,10 @@
 [
   {"id":1001,"formula":[2,10101,2,10102],"item1":[2,10201],"rate1":5000,"item2":[2,10202],"rate2":5000,"item3":null,"rate3":0,"item4":null,"rate4":0},
-  {"id":1002,"formula":[2,10102,2,10103],"item1":[2,10203],"rate1":3333,"item2":[2,10204],"rate2":3333,"item3":[2,10205],"rate3":3333,"item4":null,"rate4":0},
-  {"id":1003,"formula":[2,10103,2,10104],"item1":[2,10207],"rate1":2500,"item2":[2,10208],"rate2":2500,"item3":[2,10209],"rate3":2500,"item4":[2,10210],"rate4":2500},
-  {"id":1004,"formula":[2,10201,2,10202],"item1":[4,11021],"rate1":10000,"item2":null,"rate2":0,"item3":null,"rate3":0,"item4":null,"rate4":0},
-  {"id":1005,"formula":[4,11021,2,10101],"item1":[2,10201],"rate1":3333,"item2":[2,10202],"rate2":3333,"item3":[2,10203],"rate3":3333,"item4":null,"rate4":0}
+  {"id":1002,"formula":[2,10101,2,10101],"item1":[4,11021],"rate1":7000,"item2":[4,12021],"rate2":3000,"item3":null,"rate3":0,"item4":null,"rate4":0},
+  {"id":1003,"formula":[2,10102,2,10102],"item1":[4,11021],"rate1":7000,"item2":[4,13021],"rate2":3000,"item3":null,"rate3":0,"item4":null,"rate4":0},
+  {"id":1004,"formula":[2,10102,2,10103],"item1":[2,10203],"rate1":3333,"item2":[2,10204],"rate2":3333,"item3":[2,10205],"rate3":3333,"item4":null,"rate4":0},
+  {"id":1005,"formula":[2,10103,2,10103],"item1":[4,11021],"rate1":7000,"item2":[4,14021],"rate2":3000,"item3":null,"rate3":0,"item4":null,"rate4":0},
+  {"id":1006,"formula":[2,10103,2,10104],"item1":[2,10207],"rate1":2500,"item2":[2,10208],"rate2":2500,"item3":[2,10209],"rate3":2500,"item4":[2,10210],"rate4":2500},
+  {"id":1007,"formula":[2,10201,2,10202],"item1":[4,11021],"rate1":10000,"item2":null,"rate2":0,"item3":null,"rate3":0,"item4":null,"rate4":0},
+  {"id":1008,"formula":[4,11021,2,10101],"item1":[2,10201],"rate1":3333,"item2":[2,10202],"rate2":3333,"item3":[2,10203],"rate3":3333,"item4":null,"rate4":0}
 ]

assets/script/common/xlsConfig.ts

@@ -54,28 +54,28 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 
 export class XlsConfig {
     xlsEquipInfo: xlsEquipInfo[]
-    xlsItemKind: xlsItemKind[]
-    xlsItemInfo: xlsItemInfo[]
+    xlsAudioInfo: xlsAudioInfo[]
+    xlsDropData: xlsDropData[]
     xlsEmitterInfo: xlsEmitterInfo[]
     xlsEmitterBasicLevel: xlsEmitterBasicLevel[]
-    xlsKaiqiInfo: xlsKaiqiInfo[]
-    xlsDropData: xlsDropData[]
+    xlsItemKind: xlsItemKind[]
+    xlsItemInfo: xlsItemInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
+    xlsKaiqiInfo: xlsKaiqiInfo[]
     xlsLanguageClientText: xlsLanguageClientText[]
-    xlsMathInfo: xlsMathInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsAudioInfo: xlsAudioInfo[]
-    xlsMergeInfo: xlsMergeInfo[]
+    xlsLevelLevel: xlsLevelLevel[]
     xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
     xlsPingbiciInfo: xlsPingbiciInfo[]
     xlsNameName: xlsNameName[]
-    xlsPackageInfo: xlsPackageInfo[]
-    xlsLevelLevel: xlsLevelLevel[]
+    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
-    xlsMergePropInfo: xlsMergePropInfo[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsPackageInfo: xlsPackageInfo[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

assets/script/shared/hc/PtlHcInfo.ts

@@ -25,7 +25,7 @@ export interface HcInfoList {
 
 export interface HcInfoGeziInfo {
     unlock:HcUnlock  //格子解锁状态
-    type:HcType   //具体物品类型 0:无物品 1:发射器 2:怪物 3:装备 4:材料
+    type:HcType   //具体物品类型
     correlationId:number  //物品ID
     emitter?:HcInfoGeziEmitter //发射器专属
 }