发射器逻辑

assets/script/common/xlsConfig.ts

@@ -50,28 +50,28 @@ export type xlsTaskMain = {id:string,nextid:string,kind:string,need:number,item:
 // type for wing.excel
 
 export class XlsConfig {
-    xlsAttrAttr: xlsAttrAttr[]
     xlsAudioInfo: xlsAudioInfo[]
+    xlsEquipInfo: xlsEquipInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsAttrAttr: xlsAttrAttr[]
+    xlsLanguageClientText: xlsLanguageClientText[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsKaiqiInfo: xlsKaiqiInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsEmitterInfo: xlsEmitterInfo[]
-    xlsEquipInfo: xlsEquipInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
     xlsItemKind: xlsItemKind[]
     xlsItemInfo: xlsItemInfo[]
-    xlsLevelLevel: xlsLevelLevel[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
-    xlsLanguageClientText: xlsLanguageClientText[]
-    xlsKaiqiInfo: xlsKaiqiInfo[]
-    xlsMathInfo: xlsMathInfo[]
     xlsMergePropInfo: xlsMergePropInfo[]
+    xlsLevelLevel: xlsLevelLevel[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
-    xlsLanguageLang: xlsLanguageLang[]
-    xlsPackageInfo: xlsPackageInfo[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
-    xlsMergeInfo: xlsMergeInfo[]
     xlsNameName: xlsNameName[]
+    xlsGuideInfo: xlsGuideInfo[]
+    xlsMathInfo: xlsMathInfo[]
+    xlsMergeInfo: xlsMergeInfo[]
+    xlsPackageInfo: xlsPackageInfo[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {
         cc.assetManager.loadBundle(bundleName, (err, bundle) => {

assets/script/data/model/GridMap/GridMapModel.ts

@@ -9,6 +9,7 @@ import UECell from "../../../logic/gridMap/UECell";
 import UEGridMap from "../../../logic/gridMap/UEGridMap";
 import { gameMethod } from "../../../common/gameMethod";
 import UECube from "../../../logic/gridMap/UECube";
+import { ReqHcEmit } from "../../../shared/hc/PtlHcEmit";
 
 /** 合成物品数据 */
 export interface MergeItem {
@@ -81,10 +82,13 @@ export default class GridMapModel extends GridMapModelData {
         return ret;
     }
 
-    sendEmitter(idx: number) {
-        // let ret = await GameDataCenter.gameServer.ReqApi("hc/HcEmitter", param);
-        // return ret;
-        EventMng.emit(GridEvent.TRIGGER_EMITTER, { idx: idx, item: { type: 2, id: 10101 } });
+    async sendEmitter(gzid: number) {
+        let ret = await GameDataCenter.gameServer.ReqApi("hc/HcEmit", { gzid: gzid.toString() });
+        if (ret?.res) {
+            for (let key in ret.res) {
+                EventMng.emit(GridEvent.TRIGGER_EMITTER, { idx: gzid, targetIdx: Number(key), item: ret.res[key] });
+            }
+        }
 
     }
 

assets/script/logic/gridMap/UEGridMap.ts

@@ -284,22 +284,17 @@ export default class UEGridMap extends UEBase {
     }
 
     /** 发射出新的物品 */
-    private TriggerEmitter(data: { idx: number, item: { type: number, id: number }, targetIdx: number }) {
-        let emptyCell = null;
-        if (!data.targetIdx) {
-            emptyCell = this.GetEmptyCell();
-            if (!emptyCell) return;
-            data.targetIdx = emptyCell.GetZIndex();
-        }
+    private TriggerEmitter(data: { idx: number, item: HcInfoGeziInfo, targetIdx: number }) {
+        let targetCell = this.cellMap[data.targetIdx];
         let startPos = GameDataCenter.gridMap.TranIdxToPos(data.idx);
         let mergeCube = this.CreateCube(startPos.y, startPos.x);
         mergeCube.Init({
             type: data.item.type,
-            id: data.item.id,
+            id: data.item.correlationId,
             zIndex: data.idx,
             unlock: 0
         });
-        emptyCell.SetCube(mergeCube);
+        targetCell.SetCube(mergeCube);
         mergeCube.SetZIndex(1000);
         let targetPos = GameDataCenter.gridMap.TranIdxToPos(data.targetIdx);
 

assets/script/server/GameServerModel.ts

@@ -11,6 +11,7 @@ import { I18n } from "../utils/I18nUtil";
 import { NetworkEvent } from "../data/const/EventConst";
 import EventMng from "../manager/EventMng";
 import GameDataCenter from "../data/GameDataCenter";
+import { Code } from "../shared/base";
 
 
 /** 游戏服 */
@@ -83,11 +84,13 @@ export class GameServerModel extends IDataModel {
 
     /** 错误处理 */
     private ErrorHandler(err: TsrpcError) {
-        if (!err) {
+        if (err) {
             UIHelp.ShowTips(err.message);
-            // switch (err.code) {
-
-            // }
+            switch (err.code) {
+                case Code.fail:
+                    UIHelp.ShowTips(err.message);
+                    break;
+            }
             return null;
         }
     }

assets/script/shared/admin/PtlDeleteSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "0fefe9c4-336c-4e13-b978-8d983a5c7911",
+  "uuid": "6e637c21-6dea-4e77-b38c-3e5929271340",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e3cfe35b-9f0f-403e-a349-70041f07d039",
+  "uuid": "55e587a4-eecd-4c8f-ba82-cfd73120b94d",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetVer.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "27266220-8b3a-4555-a852-d098deb51b7d",
+  "uuid": "187c1865-5b67-4736-8c59-b14cded36ccd",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlHuodongFind.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "bd93040e-0b65-4ef7-bf46-26e640cfd622",
+  "uuid": "b6954a91-c996-4cc9-869f-e794720aad79",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlUpdateSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e2871d7d-5a81-45bb-ae71-d2561976ba01",
+  "uuid": "b87314b3-8e04-453f-893a-fc5a2e9ce6fb",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/hc/PtlHcEmit.ts

@@ -1,17 +1,18 @@
+import { HcInfoGeziInfo } from "./PtlHcInfo";
 
 
 /**
-* 请求接口
+* 请求接口 点击发射器
 */
 export interface ReqHcEmit {
-
+    gzid:string
 }
 
 /**
 * 返回信息
 */
 export interface ResHcEmit {
-
+    [gzid: string]: HcInfoGeziInfo;
 }
 
 export const conf = {

assets/script/shared/serviceProto.ts

@@ -232,7 +232,7 @@ export interface ServiceType {
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 56,
+    "version": 57,
     "services": [
         {
             "id": 39,
@@ -1439,49 +1439,18 @@ export const serviceProto: ServiceProto<ServiceType> = {
             ]
         },
         "hc/PtlHcEmit/ReqHcEmit": {
-            "type": "Interface"
-        },
-        "hc/PtlHcEmit/ResHcEmit": {
-            "type": "Interface"
-        },
-        "hc/PtlHcInfo/ReqHcInfo": {
-            "type": "Interface"
-        },
-        "hc/PtlHcInfo/ResHcInfo": {
             "type": "Interface",
             "properties": [
                 {
                     "id": 0,
-                    "name": "chapterId",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "tili",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 2,
-                    "name": "lastTime",
+                    "name": "gzid",
                     "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 3,
-                    "name": "list",
-                    "type": {
-                        "type": "Reference",
-                        "target": "hc/PtlHcInfo/HcInfoList"
+                        "type": "String"
                     }
                 }
             ]
         },
-        "hc/PtlHcInfo/HcInfoList": {
+        "hc/PtlHcEmit/ResHcEmit": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -1557,6 +1526,53 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "hc/PtlHcInfo/ReqHcInfo": {
+            "type": "Interface"
+        },
+        "hc/PtlHcInfo/ResHcInfo": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "chapterId",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "tili",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "lastTime",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "list",
+                    "type": {
+                        "type": "Reference",
+                        "target": "hc/PtlHcInfo/HcInfoList"
+                    }
+                }
+            ]
+        },
+        "hc/PtlHcInfo/HcInfoList": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Reference",
+                    "target": "hc/PtlHcInfo/HcInfoGeziInfo"
+                }
+            }
+        },
         "hc/PtlHcMerge/ReqHcMerge": {
             "type": "Interface",
             "properties": [