售卖

assets/bundle/FGUI/Home/Home_atlas0.png.meta

@@ -9,7 +9,7 @@
   "genMipmaps": false,
   "packable": true,
   "width": 1024,
-  "height": 512,
+  "height": 1024,
   "platformSettings": {},
   "subMetas": {
     "Home_atlas0": {
@@ -20,14 +20,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0,
+      "offsetX": 0,
+      "offsetY": 185.5,
       "trimX": 1,
       "trimY": 1,
-      "width": 1021,
-      "height": 510,
+      "width": 1022,
+      "height": 651,
       "rawWidth": 1024,
-      "rawHeight": 512,
+      "rawHeight": 1024,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

assets/json/chapterLayout.json

@@ -27,6 +27,7 @@
   {"id":10026,"infoId":1,"grid":55,"type":0,"correlationId":0},
   {"id":10027,"infoId":1,"grid":56,"type":0,"correlationId":0},
   {"id":10028,"infoId":1,"grid":57,"type":0,"correlationId":0},
+  {"id":10029,"infoId":1,"grid":61,"type":50,"correlationId":4},
   {"id":20001,"infoId":2,"grid":11,"type":2,"correlationId":10208},
   {"id":20002,"infoId":2,"grid":12,"type":2,"correlationId":10209},
   {"id":20003,"infoId":2,"grid":13,"type":2,"correlationId":10210},

assets/json/emitterInfo.json

@@ -1,4 +1,8 @@
 [
-  {"id":10001,"name":"基础发射器","icon":"merge_20108","quality":0,"type":1,"upLimit":200,"restoreInterval":1800,"restoreNum":40,"prop":[2,10101,2,10102,2,10103,2,10104],"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0},
-  {"id":20001,"name":"怪物发射器","icon":"merge_71205","quality":0,"type":2,"upLimit":10,"restoreInterval":0,"restoreNum":0,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
+  {"id":10001,"name":"基础发射器","icon":"merge_20108","quality":0,"type":1,"upLimit":200,"restoreInterval":1,"restoreNum":[1800,40],"prop":[2,10101,1,2,10102,2,10103,2,10104],"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0},
+  {"id":20001,"name":"小狗","icon":"","quality":0,"type":2,"upLimit":6,"restoreInterval":0,"restoreNum":null,"prop":[2,10101,2,10102,2,10103,2,10104],"demand":[2,10101,2,10102,2,10103,2,10104],"chargingType":0,"chargingCost":null,"expiryTime":0},
+  {"id":30001,"name":"科学家","icon":"","quality":0,"type":3,"upLimit":1,"restoreInterval":0,"restoreNum":null,"prop":[30001],"demand":[1,101,500,2,10102,2],"chargingType":0,"chargingCost":null,"expiryTime":180},
+  {"id":40001,"name":"井盖","icon":"","quality":0,"type":4,"upLimit":3,"restoreInterval":2,"restoreNum":[180,3],"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0},
+  {"id":40002,"name":"井盖1","icon":"","quality":0,"type":4,"upLimit":5,"restoreInterval":3,"restoreNum":[40001],"prop":[2,10101,2,10102,2,10103,2,10104],"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0},
+  {"id":500001,"name":"怪物发射器","icon":"merge_71205","quality":0,"type":50,"upLimit":10,"restoreInterval":0,"restoreNum":null,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
 ]

assets/json/itemInfo.json

@@ -1,31 +1,31 @@
 [
-  {"id":"101","name":"金币","icon":"item_101","desc":"可以用来升级翅膀","pinzhi":1,"type":"1","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"102","name":"钻石","icon":"item_102","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"103","name":"角色经验","icon":"item_103","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"104","name":"公会贡献","icon":"item_104","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"105","name":"公会经验","icon":"item_105","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"201","name":"体力","icon":"item_201","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"211","name":"羽毛","icon":"item_211","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"212","name":"神羽","icon":"item_212","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"221","name":"宠物币","icon":"item_221","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"222","name":"宠物饼干","icon":"item_222","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"231","name":"天赋书","icon":"item_231","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"241","name":"鱼币","icon":"item_241","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"242","name":"珍珠","icon":"item_242","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1001","name":"竞技场门票","icon":"item_1001","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1002","name":"加速卡","icon":"item_1002","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1003","name":"后悔药","icon":"item_1003","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1101","name":"面团","icon":"item_1101","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1102","name":"臭臭饵","icon":"item_1102","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1103","name":"果子饵","icon":"item_1103","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1104","name":"毒虫饵","icon":"item_1104","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1105","name":"腐肉饵","icon":"item_1105","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1106","name":"丰收饵","icon":"item_1106","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1107","name":"蚯蚓拟饵","icon":"item_1107","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1108","name":"飞蛾拟饵","icon":"item_1108","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1109","name":"红虾拟饵","icon":"item_1109","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1110","name":"蜉蝣饵","icon":"item_1110","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1111","name":"飞蝗饵","icon":"item_1111","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1112","name":"好运星","icon":"item_1112","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
-  {"id":"1113","name":"奇虾饵","icon":"item_1113","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""}
+  {"id":"101","name":"金币","icon":"item_101","desc":"可以用来升级翅膀","pinzhi":1,"type":1,"from":null,"produce":""},
+  {"id":"102","name":"钻石","icon":"item_102","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"103","name":"角色经验","icon":"item_103","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"104","name":"公会贡献","icon":"item_104","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"105","name":"公会经验","icon":"item_105","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"201","name":"体力","icon":"item_201","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"211","name":"羽毛","icon":"item_211","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"212","name":"神羽","icon":"item_212","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"221","name":"宠物币","icon":"item_221","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"222","name":"宠物饼干","icon":"item_222","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"231","name":"天赋书","icon":"item_231","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"241","name":"鱼币","icon":"item_241","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"242","name":"珍珠","icon":"item_242","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1001","name":"竞技场门票","icon":"item_1001","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1002","name":"加速卡","icon":"item_1002","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1003","name":"后悔药","icon":"item_1003","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1101","name":"面团","icon":"item_1101","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1102","name":"臭臭饵","icon":"item_1102","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1103","name":"果子饵","icon":"item_1103","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1104","name":"毒虫饵","icon":"item_1104","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1105","name":"腐肉饵","icon":"item_1105","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1106","name":"丰收饵","icon":"item_1106","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1107","name":"蚯蚓拟饵","icon":"item_1107","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1108","name":"飞蛾拟饵","icon":"item_1108","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1109","name":"红虾拟饵","icon":"item_1109","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1110","name":"蜉蝣饵","icon":"item_1110","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1111","name":"飞蝗饵","icon":"item_1111","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1112","name":"好运星","icon":"item_1112","desc":"","pinzhi":0,"type":0,"from":null,"produce":""},
+  {"id":"1113","name":"奇虾饵","icon":"item_1113","desc":"","pinzhi":0,"type":0,"from":null,"produce":""}
 ]

assets/json/itemKind.json

@@ -3,7 +3,7 @@
   {"kind":"2","name":"合成材料"},
   {"kind":"3","name":"发射器"},
   {"kind":"4","name":"装备"},
-  {"kind":"5","name":""},
+  {"kind":"5","name":"掉落表"},
   {"kind":"6","name":""},
   {"kind":"7","name":""},
   {"kind":"8","name":""},

assets/json/mergePropInfo.json

@@ -1,35 +1,36 @@
 [
-  {"id":10101,"name":"","icon":"merge_11101","type":1,"quality":1},
-  {"id":10102,"name":"","icon":"merge_11102","type":1,"quality":1},
-  {"id":10103,"name":"","icon":"merge_11103","type":1,"quality":1},
-  {"id":10104,"name":"","icon":"merge_11104","type":1,"quality":1},
-  {"id":10105,"name":"","icon":"merge_11105","type":1,"quality":1},
-  {"id":10106,"name":"","icon":"merge_11106","type":1,"quality":1},
-  {"id":10107,"name":"","icon":"merge_11107","type":1,"quality":1},
-  {"id":10108,"name":"","icon":"merge_11108","type":1,"quality":1},
-  {"id":10109,"name":"","icon":"merge_11109","type":1,"quality":1},
-  {"id":10110,"name":"","icon":"merge_11110","type":1,"quality":1},
-  {"id":10201,"name":"","icon":"merge_11201","type":1,"quality":2},
-  {"id":10202,"name":"","icon":"merge_11202","type":1,"quality":2},
-  {"id":10203,"name":"","icon":"merge_11203","type":1,"quality":2},
-  {"id":10204,"name":"","icon":"merge_11204","type":1,"quality":2},
-  {"id":10205,"name":"","icon":"merge_11205","type":1,"quality":2},
-  {"id":10206,"name":"","icon":"merge_11206","type":1,"quality":2},
-  {"id":10207,"name":"","icon":"merge_11207","type":1,"quality":2},
-  {"id":10208,"name":"","icon":"merge_11208","type":1,"quality":2},
-  {"id":10209,"name":"","icon":"merge_11209","type":1,"quality":2},
-  {"id":10210,"name":"","icon":"merge_11210","type":1,"quality":2},
-  {"id":10301,"name":"","icon":"merge_11301","type":1,"quality":3},
-  {"id":10302,"name":"","icon":"merge_11302","type":1,"quality":3},
-  {"id":10303,"name":"","icon":"merge_11303","type":1,"quality":3},
-  {"id":10304,"name":"","icon":"merge_11304","type":1,"quality":3},
-  {"id":10305,"name":"","icon":"merge_11305","type":1,"quality":3},
-  {"id":10306,"name":"","icon":"merge_11306","type":1,"quality":3},
-  {"id":10307,"name":"","icon":"merge_11307","type":1,"quality":3},
-  {"id":10401,"name":"","icon":"merge_31201","type":1,"quality":4},
-  {"id":10402,"name":"","icon":"merge_31202","type":1,"quality":4},
-  {"id":10403,"name":"","icon":"merge_31203","type":1,"quality":4},
-  {"id":10404,"name":"","icon":"merge_31204","type":1,"quality":4},
-  {"id":10405,"name":"","icon":"merge_31205","type":1,"quality":4},
-  {"id":10406,"name":"","icon":"merge_31206","type":1,"quality":4}
+  {"id":10101,"name":"","icon":"merge_11101","type":1,"quality":1,"price":1},
+  {"id":10102,"name":"","icon":"merge_11102","type":1,"quality":1,"price":1},
+  {"id":10103,"name":"","icon":"merge_11103","type":1,"quality":1,"price":1},
+  {"id":10104,"name":"","icon":"merge_11104","type":1,"quality":1,"price":1},
+  {"id":10105,"name":"","icon":"merge_11105","type":1,"quality":1,"price":1},
+  {"id":10106,"name":"","icon":"merge_11106","type":1,"quality":1,"price":1},
+  {"id":10107,"name":"","icon":"merge_11107","type":1,"quality":1,"price":1},
+  {"id":10108,"name":"","icon":"merge_11108","type":1,"quality":1,"price":1},
+  {"id":10109,"name":"","icon":"merge_11109","type":1,"quality":1,"price":1},
+  {"id":10110,"name":"","icon":"merge_11110","type":1,"quality":1,"price":1},
+  {"id":10201,"name":"","icon":"merge_11201","type":1,"quality":2,"price":1},
+  {"id":10202,"name":"","icon":"merge_11202","type":1,"quality":2,"price":1},
+  {"id":10203,"name":"","icon":"merge_11203","type":1,"quality":2,"price":1},
+  {"id":10204,"name":"","icon":"merge_11204","type":1,"quality":2,"price":1},
+  {"id":10205,"name":"","icon":"merge_11205","type":1,"quality":2,"price":1},
+  {"id":10206,"name":"","icon":"merge_11206","type":1,"quality":2,"price":1},
+  {"id":10207,"name":"","icon":"merge_11207","type":1,"quality":2,"price":1},
+  {"id":10208,"name":"","icon":"merge_11208","type":1,"quality":2,"price":1},
+  {"id":10209,"name":"","icon":"merge_11209","type":1,"quality":2,"price":1},
+  {"id":10210,"name":"","icon":"merge_11210","type":1,"quality":2,"price":1},
+  {"id":10301,"name":"","icon":"merge_11301","type":1,"quality":3,"price":1},
+  {"id":10302,"name":"","icon":"merge_11302","type":1,"quality":3,"price":1},
+  {"id":10303,"name":"","icon":"merge_11303","type":1,"quality":3,"price":1},
+  {"id":10304,"name":"","icon":"merge_11304","type":1,"quality":3,"price":1},
+  {"id":10305,"name":"","icon":"merge_11305","type":1,"quality":3,"price":1},
+  {"id":10306,"name":"","icon":"merge_11306","type":1,"quality":3,"price":1},
+  {"id":10307,"name":"","icon":"merge_11307","type":1,"quality":3,"price":1},
+  {"id":10401,"name":"","icon":"merge_31201","type":1,"quality":4,"price":1},
+  {"id":10402,"name":"","icon":"merge_31202","type":1,"quality":4,"price":1},
+  {"id":10403,"name":"","icon":"merge_31203","type":1,"quality":4,"price":1},
+  {"id":10404,"name":"","icon":"merge_31204","type":1,"quality":4,"price":1},
+  {"id":10405,"name":"","icon":"merge_31205","type":1,"quality":4,"price":1},
+  {"id":10406,"name":"","icon":"merge_31206","type":1,"quality":4,"price":1},
+  {"id":40001,"name":"","icon":"merge_31207","type":4,"quality":0,"price":1}
 ]

assets/loadJson/languageClientText.json

@@ -123,5 +123,7 @@
   {"key":"com_eptype_4","cn":"特殊属性","us":"","kr":"","tw":"","jp":""},
   {"key":"com_eptype_5","cn":"pvp属性","us":"","kr":"","tw":"","jp":""},
   {"key":"com_copy_sucess","cn":"复制成功","us":"","kr":"","tw":"","jp":""},
-  {"key":"com_copy_fail","cn":"复制失败","us":"","kr":"","tw":"","jp":""}
+  {"key":"com_copy_fail","cn":"复制失败","us":"","kr":"","tw":"","jp":""},
+  {"key":"hometaskitem_count","cn":"进度({0})","us":"","kr":"","tw":"","jp":""},
+  {"key":"hometaskitem_finish","cn":"[color=#6fdf89](已完成)[/color]","us":"","kr":"","tw":"","jp":""}
 ]

assets/loadJson/languageLang.json

@@ -1,3 +1,7 @@
 [
-  {"key":"","cn":"","kr":"","tw":"","jp":""}
+  {"key":"task_desc_name_101","cn":"在地图上击败{0}个怪物","kr":"","tw":"","jp":""},
+  {"key":"task_desc_name_1001","cn":"解救伙伴-{0}","kr":"","tw":"","jp":""},
+  {"key":"task_desc_name_113","cn":"主角升级{0}次","kr":"","tw":"","jp":""},
+  {"key":"task_desc_name_121","cn":"召唤{0}个装备箱灵","kr":"","tw":"","jp":""},
+  {"key":"task_desc_name_211","cn":"通关{0}-{1}","kr":"","tw":"","jp":""}
 ]

assets/script/common/xlsConfig.ts

@@ -7,8 +7,9 @@ export type xlsAudioInfo = {id:string,name:string,vol:number}
 // type for chapter.excel
 export type xlsChapterInfo = {id:number,grid:number[],map:string,name:string}
 export type xlsChapterLayout = {id:number,infoId:number,grid:number,type:number,correlationId:number}
+// type for drop.excel
 // type for emitter.excel
-export type xlsEmitterInfo = {id:number,name:string,icon:string,quality:number,type:number,upLimit:number,restoreInterval:number,restoreNum:number,prop:number[],demand:number[],chargingType:number,chargingCost:number[],expiryTime:number}
+export type xlsEmitterInfo = {id:number,name:string,icon:string,quality:number,type:number,upLimit:number,restoreInterval:number,restoreNum:number[],prop:number[],demand:number[],chargingType:number,chargingCost:number[],expiryTime:number}
 // type for equip.excel
 export type xlsEquipInfo = {id:number,name:string,icon:string,desc:string,quality:number}
 // type for fish.excel
@@ -17,7 +18,7 @@ export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],
 // type for help.excel
 // type for item.excel
 export type xlsItemKind = {kind:string,name:string}
-export type xlsItemInfo = {id:string,name:string,icon:string,desc:string,pinzhi:number,type:string,detailType:string,param:number,from:number[],produce:string}
+export type xlsItemInfo = {id:string,name:string,icon:string,desc:string,pinzhi:number,type:number,from:number[],produce:string}
 // type for kaiqi.excel
 export type xlsKaiqiInfo = {id:string,name:string,desc:string,icon:string,needGuide:number,type1:number,param1:number,sevOpenDay:number,tip:string,record:number}
 // type for languageClient.excel
@@ -31,7 +32,7 @@ export type xlsLevelLevel = {level:number,exp:number}
 // type for math.excel
 export type xlsMathInfo = {key:string,pram:number[]}
 // type for mergeProp.excel
-export type xlsMergePropInfo = {id:number,name:string,icon:string,type:number,quality:number}
+export type xlsMergePropInfo = {id:number,name:string,icon:string,type:number,quality:number,price:number}
 // type for merge.excel
 export type xlsMergeInfo = {id:number,formula:number[],item1:number[],rate1:number,item2:number[],rate2:number,item3:number[],rate3:number,item4:number[],rate4:number}
 // type for monster.excel
@@ -50,26 +51,26 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 // type for wing.excel
 
 export class XlsConfig {
-    xlsAttrAttr: xlsAttrAttr[]
     xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsEquipInfo: xlsEquipInfo[]
+    xlsAudioInfo: xlsAudioInfo[]
     xlsItemKind: xlsItemKind[]
     xlsItemInfo: xlsItemInfo[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsEquipInfo: xlsEquipInfo[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
     xlsLanguageClientText: xlsLanguageClientText[]
     xlsLevelLevel: xlsLevelLevel[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsAudioInfo: xlsAudioInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
-    xlsMathInfo: xlsMathInfo[]
-    xlsTaskDesc: xlsTaskDesc[]
-    xlsTaskMain: xlsTaskMain[]
-    xlsMergeInfo: xlsMergeInfo[]
-    xlsNameName: xlsNameName[]
     xlsMergePropInfo: xlsMergePropInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsNameName: xlsNameName[]
+    xlsMergeInfo: xlsMergeInfo[]
     xlsPackageInfo: xlsPackageInfo[]
+    xlsTaskDesc: xlsTaskDesc[]
+    xlsTaskMain: xlsTaskMain[]
     xlsPingbiciInfo: xlsPingbiciInfo[]
     xlsLanguageLang: xlsLanguageLang[]
 

assets/script/logic/fgui/Home/Home/HomeMergeSellCom.ts

@@ -1,17 +1,28 @@
+import Gamecfg from "../../../../common/gameCfg";
 import { MergeItem } from "../../../../data/model/GridMap/GridMapModel";
+import ResSprite from "../../../../frameWork/compment/ResSprite";
 import EventMng from "../../../../manager/EventMng";
+import { HcType } from "../../../../shared/hc/PtlHcInfo";
 import { GridEvent } from "../../../gridMap/GridEvent";
+import { I_CubeData } from "../../../gridMap/UECube";
 
 
 export interface MergeSellData {
     isShow: boolean;
-    item: MergeItem;
+    item: I_CubeData;
 }
 export default class HomeMergeSellCom {
     private _vm: fairygui.GComponent;
+    private sp_item: ResSprite;
+    private QualityLoad: fgui.GLoader;
+    private SellBtn: fgui.GButton;
+    private QualityLabel: fgui.GTextField;
     public constructor(vm: fgui.GComponent) {
         this._vm = vm;
-
+        this.sp_item = vm.getChild('IconLoad').node.addComponent(ResSprite);
+        this.QualityLoad = vm.getChild('QualityLoad').asLoader;
+        this.SellBtn = vm.getChild('SellBtn').asButton;
+        this.QualityLabel = vm.getChild('QualityLabel').asTextField;
     }
 
     public onEnable(): void {
@@ -28,6 +39,36 @@ export default class HomeMergeSellCom {
     private OnHcMergeSell(data: MergeSellData): void {
         this._vm.visible = data.isShow;
         if (data.isShow) {
+            let quality = 0;
+            this.SellBtn.visible = false;
+            if (data.item.type == HcType.emitter) {
+                let mergePropCfg = Gamecfg.emitterInfo.getItem(data.item.id.toString());
+                this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+                quality = mergePropCfg.quality;
+            } else if (data.item.type == HcType.material) {
+                let mergePropCfg = Gamecfg.mergePropInfo.getItem(data.item.id.toString());
+                this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+                quality = mergePropCfg.quality;
+                this.SellBtn.title = mergePropCfg.price.toString();
+                this.SellBtn.visible = true;
+            } else if (data.item.type == HcType.equip) {
+                let mergePropCfg = Gamecfg.equipInfo.getItem(data.item.id.toString());
+                this.sp_item.setSpriteFrame('gridMap', `mergeEquip/${mergePropCfg.icon}`);
+                quality = mergePropCfg.quality;
+                // this.SellBtn.title = mergePropCfg.price.toString();
+                this.SellBtn.visible = true;
+            } else if (data.item.type == HcType.user) {
+
+            } else if (data.item.type == HcType.monster) {
+
+            }
+            if (quality > 0) {
+                this.QualityLoad.url = `ui://Home/Img_zjm_xqpinzhi0${quality - 1}`;
+                this.QualityLabel.text = `T${quality}`;
+            } else {
+                this.QualityLoad.url = ``;
+            }
+
         }
     }
 }

assets/script/logic/gridMap/UEGridMap.ts

@@ -186,7 +186,7 @@ export default class UEGridMap extends UEBase {
                 }
                 this.selectedCell = cell;
                 cell.SetSelect(true);
-                EventMng.emit(GridEvent.HC_MERGE_SELL, { isShow: true });
+                EventMng.emit(GridEvent.HC_MERGE_SELL, { isShow: true, item: cell.GetCube().GetCubeData() });
             } else {
                 this.selectedCell = null;
                 this.clickCnt = 0;

assets/script/shared/item/server/MsgItemChange_s.ts

@@ -4,6 +4,6 @@
  * 后端推送道具变化信息
  */
 export interface MsgItemChange_s {
-    items:number[][]
+    [itemId:string]:number
 }
 

assets/script/shared/serviceProto.ts

@@ -256,7 +256,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 64,
+    "version": 65,
     "services": [
         {
             "id": 39,
@@ -2048,21 +2048,12 @@ export const serviceProto: ServiceProto<ServiceType> = {
         },
         "item/server/MsgItemChange_s/MsgItemChange_s": {
             "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "items",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "Array",
-                            "elementType": {
-                                "type": "Number"
-                            }
-                        }
-                    }
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Number"
                 }
-            ]
+            }
         },
         "mail/PtlMailDelAll/ReqMailDelAll": {
             "type": "Interface"

fgui-project/assets/Home/Components/HomeMergeSell.xml

@@ -13,7 +13,7 @@
     <loader id="n43_j5c8" name="IconLoad" xy="100,175" pivot="0.5,0.5" anchor="true" size="50,50" group="n40_j5c8"/>
     <text id="n44_j5c8" name="LvLabel" xy="94,233" pivot="0.5,0.5" anchor="true" size="75,36" group="n40_j5c8" fontSize="26" color="#ffffff" strokeColor="#000000" strokeSize="2" text="300级"/>
     <image id="n45_j5c8" name="n45" src="j5c83p" fileName="Images/home/Img_zjm_pinjiedi.png" xy="144,112" pivot="0.5,0.5" anchor="true" group="n47_j5c8"/>
-    <text id="n46_j5c8" name="QualityLabel" xy="144,111" pivot="0.5,0.5" anchor="true" size="33,34" group="n47_j5c8" fontSize="24" color="#fffca3" strokeColor="#000000" strokeSize="2" text="T3"/>
+    <text id="n46_j5c8" name="QualityLabel" xy="144,111" pivot="0.5,0.5" anchor="true" size="33,34" group="n47_j5c8" fontSize="24" color="#fffca3" align="center" vAlign="middle" strokeColor="#000000" strokeSize="2" text="T3"/>
     <group id="n47_j5c8" name="QualityGroup" xy="116,94" size="56,34" group="n40_j5c8" advanced="true"/>
     <group id="n40_j5c8" name="n40" xy="13,85" size="702,195" group="n31_tt6a" advanced="true"/>
     <group id="n31_tt6a" name="mergeGroup" xy="0,38" size="750,264" advanced="true">

fgui-project/assets/Home/package.xml

@@ -112,11 +112,11 @@
     <component id="ul8q3e" name="PbSpTop.xml" path="/Components/"/>
     <image id="f6x03e" name="Img_zjm_xiangqingdi.png" path="/Images/home/" scale="9grid" scale9grid="44,57,11,15"/>
     <image id="f6x03f" name="主界面013.jpg" path="/NoExports/"/>
-    <image id="j5c83g" name="Img_zjm_xqpinzhi00.png" path="/Images/home/"/>
-    <image id="j5c83h" name="Img_zjm_xqpinzhi01.png" path="/Images/home/"/>
-    <image id="j5c83i" name="Img_zjm_xqpinzhi02.png" path="/Images/home/"/>
-    <image id="j5c83j" name="Img_zjm_xqpinzhi03.png" path="/Images/home/"/>
-    <image id="j5c83k" name="Img_zjm_xqpinzhi04.png" path="/Images/home/"/>
+    <image id="j5c83g" name="Img_zjm_xqpinzhi00.png" path="/Images/home/" exported="true"/>
+    <image id="j5c83h" name="Img_zjm_xqpinzhi01.png" path="/Images/home/" exported="true"/>
+    <image id="j5c83i" name="Img_zjm_xqpinzhi02.png" path="/Images/home/" exported="true"/>
+    <image id="j5c83j" name="Img_zjm_xqpinzhi03.png" path="/Images/home/" exported="true"/>
+    <image id="j5c83k" name="Img_zjm_xqpinzhi04.png" path="/Images/home/" exported="true"/>
     <image id="j5c83l" name="主界面02.jpg" path="/NoExports/"/>
     <image id="j5c83m" name="Img_zjm_xiangqingdi00.png" path="/Images/home/" scale="9grid" scale9grid="24,32,5,64"/>
     <component id="j5c83n" name="MergeYellowBtn.xml" path="/Components/"/>