协议修改

assets/bundle/gridMap/mergeProp/merge_20108.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3f42254a-912e-48a8-9293-492ba3600996",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_20108": {
+      "ver": "1.0.6",
+      "uuid": "d93b5766-7836-4d3b-a256-0ad817d103fe",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3f42254a-912e-48a8-9293-492ba3600996",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -3.5,
+      "trimX": 18,
+      "trimY": 21,
+      "width": 89,
+      "height": 89,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_71205.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "cc2fe4b3-af3e-4f69-a916-73557154d499",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_71205": {
+      "ver": "1.0.6",
+      "uuid": "118f518f-dec7-4dc0-84cf-5def0bf256f8",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "cc2fe4b3-af3e-4f69-a916-73557154d499",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 3.5,
+      "offsetY": -1,
+      "trimX": 24,
+      "trimY": 22,
+      "width": 83,
+      "height": 82,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/json/chapterLayout.json

@@ -1,6 +1,6 @@
 [
-  {"id":10001,"infoId":1,"grid":11,"type":3,"correlationId":10001,"unlock":0},
-  {"id":10002,"infoId":1,"grid":12,"type":3,"correlationId":10002,"unlock":0},
+  {"id":10001,"infoId":1,"grid":11,"type":1,"correlationId":10001,"unlock":0},
+  {"id":10002,"infoId":1,"grid":12,"type":1,"correlationId":20001,"unlock":0},
   {"id":10003,"infoId":1,"grid":13,"type":3,"correlationId":10003,"unlock":0},
   {"id":10004,"infoId":1,"grid":15,"type":3,"correlationId":10004,"unlock":0},
   {"id":10005,"infoId":1,"grid":16,"type":3,"correlationId":10005,"unlock":0},

assets/json/emitterInfo.json

@@ -1,3 +1,4 @@
 [
-  {"id":0,"name":"","icon":"","type":0,"upLimit":0,"restoreInterval":0,"restoreNum":0,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
+  {"id":10001,"name":"基础发射器","icon":"merge_20108","type":1,"upLimit":200,"restoreInterval":1800,"restoreNum":40,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0},
+  {"id":20001,"name":"怪物发射器","icon":"merge_71205","type":2,"upLimit":10,"restoreInterval":0,"restoreNum":0,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
 ]

assets/script/common/gameCfg.ts

@@ -1,7 +1,7 @@
 import ConfProxy, { ConfListProxy } from "./confProxy"
 import { XlsConfig, xlsAttrAttr, xlsAudioInfo, xlsChapterInfo, xlsChapterLayout, xlsEmitterInfo, xlsGuideInfo, xlsItemKind
-, xlsItemMoney, xlsKaiqiInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan, xlsMathInfo, xlsMergePropInfo, xlsNameName, xlsPackageInfo
-, xlsPingbiciInfo } from "./xlsConfig"
+, xlsKaiqiInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan, xlsMathInfo, xlsMergePropInfo, xlsNameName, xlsPackageInfo, xlsPingbiciInfo
+ } from "./xlsConfig"
 
 export default class Gamecfg {
     static attrAttr:ConfProxy<xlsAttrAttr>
@@ -12,7 +12,6 @@ export default class Gamecfg {
     static guideInfo:ConfProxy<xlsGuideInfo>
     static guideInfoList:ConfListProxy<xlsGuideInfo>
     static itemKind:ConfProxy<xlsItemKind>
-    static itemMoney:ConfProxy<xlsItemMoney>
     static kaiqiInfo:ConfProxy<xlsKaiqiInfo>
     static languageLang:ConfProxy<xlsLanguageLang>
     static languageClientText:ConfProxy<xlsLanguageClientText>
@@ -48,7 +47,6 @@ export default class Gamecfg {
                Gamecfg.guideInfo = new ConfProxy("guideInfo",xls.xlsGuideInfo ,"id")
                Gamecfg.guideInfoList = new ConfListProxy("guideInfoList",xls.xlsGuideInfo ,"event")
                Gamecfg.itemKind = new ConfProxy("itemKind",xls.xlsItemKind ,"kind")
-               Gamecfg.itemMoney = new ConfProxy("itemMoney",xls.xlsItemMoney ,"id")
                Gamecfg.kaiqiInfo = new ConfProxy("kaiqiInfo",xls.xlsKaiqiInfo ,"id")
                Gamecfg.languageSeverHouduan = new ConfProxy("languageSeverHouduan",xls.xlsLanguageSeverHouduan ,"key")
                Gamecfg.mergePropInfo = new ConfProxy("mergePropInfo",xls.xlsMergePropInfo ,"id")

assets/script/common/xlsConfig.ts

@@ -9,12 +9,12 @@ export type xlsChapterInfo = {id:number,grid:number[],map:string,name:string}
 export type xlsChapterLayout = {id:number,infoId:number,grid:number,type:number,correlationId:number,unlock:number}
 // type for emitter.excel
 export type xlsEmitterInfo = {id:number,name:string,icon:string,type:number,upLimit:number,restoreInterval:number,restoreNum:number,prop:number[],demand:number[],chargingType:number,chargingCost:number[],expiryTime:number}
+// type for equip.excel
 // type for guide.excel
 export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],ytype:number,condition:number[],type:number,pram:any[],pram1:any[]}
 // type for help.excel
 // type for item.excel
 export type xlsItemKind = {kind:string,name:string}
-export type xlsItemMoney = {id:string,name:string,icon:string,pinzhi:number,desc:string,iconshowtype:number,from:number[],produce:string,type:string,detailType:string,param:{"items"?:number[][],"nums"?:number[],"kv"?:{[key:string]:number},"count"?:number},beibao:number,isUse:number,isShowRed:number,openType:string,price:number}
 // 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
@@ -27,7 +27,7 @@ export type xlsLanguageLang = {key:string,cn:string,kr:string,tw:string,jp:strin
 // type for math.excel
 export type xlsMathInfo = {key:string,pram:{"count"?:number,"count1"?:number,"str"?:string,"item"?:number[],"items"?:number[][],"kv"?:{[key:string]:number}}}
 // type for mergeProp.excel
-export type xlsMergePropInfo = {id:number,name:string,icon:string,type:int,quality:number}
+export type xlsMergePropInfo = {id:number,name:string,icon:string,type:number,quality:number}
 // type for name.excel
 export type xlsNameName = {}
 // type for package.excel
@@ -37,22 +37,21 @@ export type xlsPingbiciInfo = {}
 // type for shop.excel
 
 export class XlsConfig {
-    xlsKaiqiInfo: xlsKaiqiInfo[]
     xlsAudioInfo: xlsAudioInfo[]
+    xlsMergePropInfo: xlsMergePropInfo[]
     xlsEmitterInfo: xlsEmitterInfo[]
+    xlsLanguageClientText: xlsLanguageClientText[]
+    xlsAttrAttr: xlsAttrAttr[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
-    xlsAttrAttr: xlsAttrAttr[]
-    xlsNameName: xlsNameName[]
-    xlsLanguageClientText: xlsLanguageClientText[]
     xlsPackageInfo: xlsPackageInfo[]
-    xlsMergePropInfo: xlsMergePropInfo[]
-    xlsGuideInfo: xlsGuideInfo[]
-    xlsPingbiciInfo: xlsPingbiciInfo[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsKaiqiInfo: xlsKaiqiInfo[]
+    xlsNameName: xlsNameName[]
     xlsMathInfo: xlsMathInfo[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsGuideInfo: xlsGuideInfo[]
     xlsItemKind: xlsItemKind[]
-    xlsItemMoney: xlsItemMoney[]
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

assets/script/data/model/Login/LoginModel.ts

@@ -50,7 +50,7 @@ export default class LoginModel extends LoginModelData {
 
     // 平台登录
     async sendPlatLoginGame(param: ReqLogin_1) {
-        let ret = await GameDataCenter.loginServer.ReqApi("plat/Login", param);
+        let ret = await GameDataCenter.loginServer.ReqApi("plat/PlatLogin", param);
         if (ret.isSucc) {
             EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.5, "login")
             GameDataCenter.plat.instance.openId = ret.res.openId;
@@ -66,7 +66,7 @@ export default class LoginModel extends LoginModelData {
 
     // 账号登录
     async sendLoginGame(param: ReqLogin) {
-        let ret = await GameDataCenter.loginServer.ReqApi("player/Login", param);
+        let ret = await GameDataCenter.loginServer.ReqApi("player/PlayerLogin", param);
         if (ret.isSucc) {
             CC_PREVIEW && console.log("玩家登录成功", ret);
             this.playerInfo = ret.res as PlayerInfo
@@ -83,7 +83,7 @@ export default class LoginModel extends LoginModelData {
     }
     // 点击进入游戏按钮,并进入游戏
     async sendEnterGame(sid: string) {
-        let ret = await GameDataCenter.gameServer.ReqApi("user/Login", {
+        let ret = await GameDataCenter.gameServer.ReqApi("user/UserLogin", {
             uid: this.playerInfo.uid,
             sid: sid,
             token: this.playerInfo.token

assets/script/frameWork/compment/UEBase.ts

@@ -1,4 +1,8 @@
+import { AudioConst } from "../../data/const/TypeConst";
+import GameDataCenter from "../../data/GameDataCenter";
 import EventMng from "../../manager/EventMng";
+import { uiCommon } from "../../utils/UICommon";
+import { BtnEvent } from "../fgui/mvc/FguiViewCtrl";
 import { Constructor } from "./Fundation";
 
 declare global {
@@ -46,6 +50,12 @@ export default abstract class UEBase extends cc.Component {
         this._notifyEventList.set(eventName, cb);
     }
 
+    RegisterClick(node: cc.Node, callback, target = null, params: any = [], audio: AudioConst = AudioConst.effect_click) {
+        uiCommon.onRegisterEvent(node, callback, target, params, audio)
+    }
 
+    RemoveAllClick() {
+        uiCommon.unRegisterEvent(this.node)
+    }
 
 }

assets/script/logic/gridMap/GridEvent.ts

@@ -0,0 +1,5 @@
+/** 地图事件 */
+
+export class GridEvent {
+    static readonly TRIGGER_EMITTER = "TRIGGER_EMITTER";//触发发射器生成道具
+}

assets/script/logic/gridMap/GridEvent.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "ce1da3f3-8aec-4227-9376-49d50bd66d0f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/logic/gridMap/UECube.ts

@@ -1,12 +1,20 @@
 import Gamecfg from "../../common/gameCfg";
 import ResSprite from "../../frameWork/compment/ResSprite";
 import UEBase from "../../frameWork/compment/UEBase";
+import EventMng from "../../manager/EventMng";
+import { GridEvent } from "./GridEvent";
 
 const { ccclass, property } = cc._decorator;
 
+enum E_CubeType {
+    None = 0,//无物品
+    Emitter = 1,//发射器
+    Monster = 2,//怪物
+    MergeProp = 3,//合成物品
+}
 export interface I_CubeData {
     /** 物品类型 */
-    type: number;
+    type: E_CubeType;
     /** 物品ID */
     id: number;
     /** 层级 */
@@ -32,13 +40,29 @@ export default class UECube extends UEBase {
         this.cubeData = cubeData;
         this.SetZIndex(cubeData.zIndex);
         this.originalPos = cc.v3(this.node.x, this.node.y);
-        if (cubeData.type == 3) {
+        if (cubeData.type == E_CubeType.Emitter) {
+            let mergePropCfg = Gamecfg.emitterInfo.getItem(cubeData.id.toString());
+            this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+        } else if (cubeData.type == E_CubeType.MergeProp) {
             let mergePropCfg = Gamecfg.mergePropInfo.getItem(cubeData.id.toString());
-            this.sp_item.setSpriteFrame('gridMap', `equipIcon/${mergePropCfg.icon}`);
+            this.sp_item.setSpriteFrame('gridMap', `mergeProp/${mergePropCfg.icon}`);
+        }
+    }
+
+    /** 触发点击 */
+    TriggerClick() {
+        if (this.cubeData.type == E_CubeType.Emitter) {
+            CC_PREVIEW && console.log("触发点击发射器");
+            EventMng.emit(GridEvent.TRIGGER_EMITTER, this.cubeData.zIndex, 10009);
+        } else if (this.cubeData.type == E_CubeType.Monster) {
+            CC_PREVIEW && console.log("点击怪物开始战斗");
+        } else if (this.cubeData.type == E_CubeType.MergeProp) {
+
         }
     }
 
-    getCubeData(): I_CubeData {
+
+    GetCubeData(): I_CubeData {
         return this.cubeData;
     }
 

assets/script/logic/gridMap/UEGridMap.ts

@@ -1,7 +1,10 @@
 import Gamecfg from "../../common/gameCfg";
+import { gameMethod } from "../../common/gameMethod";
 import { xlsChapterLayout } from "../../common/xlsConfig";
 import UEBase from "../../frameWork/compment/UEBase";
+import { uiCommon } from "../../utils/UICommon";
 import { GridConstant } from "./GridConstant";
+import { GridEvent } from "./GridEvent";
 import UECell, { I_CellData } from "./UECell";
 import UECube from "./UECube";
 
@@ -39,6 +42,7 @@ export default class UEGridMap extends UEBase {
         this.gridLayer.on(cc.Node.EventType.TOUCH_MOVE, this.OnTouchMove, this);
         this.gridLayer.on(cc.Node.EventType.TOUCH_END, this.OnTouchEnd, this);
         this.gridLayer.on(cc.Node.EventType.TOUCH_CANCEL, this.OnTouchEnd, this);
+        this.initEvent(GridEvent.TRIGGER_EMITTER, this.TriggerEmitter);
     }
 
 
@@ -82,33 +86,35 @@ export default class UEGridMap extends UEBase {
         }
     }
 
-    /** 创建格子 */
-    private CreateCell(i: number, j: number) {
+    /** 根据索引获取实际像素坐标 */
+    private GetPosByIdx(i: number, j: number): cc.Vec3 {
         const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
         const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
+        return cc.v3(
+            startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
+            startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
+        )
+    }
+
+    /** 创建格子 */
+    private CreateCell(i: number, j: number) {
         let cell = cc.instantiate(this.cellPrefab).getComponent(UECell);
         this.cellLayer.addChild(cell.node);
         cell.node.width = GridConstant.CELL_WIDTH;
         cell.node.height = GridConstant.CELL_HEIGHT;
-        cell.node.setPosition(cc.v2(
-            startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
-            startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
-        ));
+        let pos = this.GetPosByIdx(i, j);
+        cell.node.setPosition(pos);
         return cell;
     }
 
     /** 创建棋子 */
     private CreateCube(i: number, j: number) {
-        const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
-        const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
         let cube = cc.instantiate(this.cubePrefab).getComponent(UECube);
         this.cubeLayer.addChild(cube.node);
         cube.node.width = GridConstant.CELL_WIDTH;
         cube.node.height = GridConstant.CELL_HEIGHT;
-        cube.node.setPosition(cc.v2(
-            startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
-            startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
-        ));
+        let pos = this.GetPosByIdx(i, j);
+        cube.node.setPosition(pos);
         return cube;
     }
 
@@ -162,6 +168,7 @@ export default class UEGridMap extends UEBase {
                 targetCell.GetCube().PlayJellyAnim();
                 if (this.clickCnt >= 2) {
                     console.log("二次点击同一个格子");
+                    targetCell.GetCube().TriggerClick();
                 } else {
                     this.clickCnt++;
                 }
@@ -181,6 +188,7 @@ export default class UEGridMap extends UEBase {
 
     }
 
+    /** 根据像素坐标获取格子 */
     private GetCellByPos(pos: cc.Vec2): UECell | null {
         const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
         const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
@@ -227,7 +235,7 @@ export default class UEGridMap extends UEBase {
     }
 
     private CanMergeItems(fromCell: UECell, toCell: UECell): boolean {
-        if (fromCell.GetCube().getCubeData().type == toCell.GetCube().getCubeData().type) {
+        if (fromCell.GetCube().GetCubeData().type == toCell.GetCube().GetCubeData().type) {
             return true;
         }
 
@@ -244,9 +252,101 @@ export default class UEGridMap extends UEBase {
         fromCube.MoveToNewPos(cc.v3(toCell.node.x, toCell.node.y), 0.05);
     }
 
-    /** 抛出新的物品 */
-    private ThrowNewItem() {
+    private GetEmptyCell(): UECell {
+        for (const key in this.cellMap) {
+            const element = this.cellMap[key];
+            if (element.IsEmpty()) {
+                return element;
+            }
+        }
+        return null;
+    }
+
+    /** 发射出新的物品 */
+    private TriggerEmitter(idx: number, itemId: number, targetIdx: number) {
+        let emptyCell = this.GetEmptyCell();
+        if (!emptyCell) return;
+        targetIdx = emptyCell.GetZIndex();
+        let startPos = this.TranIdxToPos(idx);
+        let mergeCube = this.CreateCube(startPos.y, startPos.x);
+        mergeCube.Init({
+            type: 3,
+            id: itemId,
+            zIndex: idx,
+            unlock: 0
+        });
+        emptyCell.SetCube(mergeCube);
+        mergeCube.SetZIndex(1000);
+        let targetPos = this.TranIdxToPos(targetIdx);
+
+        // 设置动画时间
+        const duration = 0.8;
+        // 设置最大高度（向上弹跳的高度）
+        const maxHeight = 400;
+
+        // 计算起点和终点
+        const startWorldPos = mergeCube.node.getPosition();
+        const endWorldPos = this.GetPosByIdx(targetPos.y, targetPos.x);
+
+        // 计算方向向量和总距离
+        const moveVec = cc.v2(endWorldPos.x - startWorldPos.x, endWorldPos.y - startWorldPos.y);
+        const totalDistance = moveVec.mag();
+        const normalizedDir = moveVec.normalize();
+
+        // 计算最后弹跳的起点（在终点前100像素）
+        const bounceStartPos = cc.v3(
+            endWorldPos.x - normalizedDir.x * 100,
+            endWorldPos.y - normalizedDir.y * 100,
+            0
+        );
+
+        // 创建第一段抛物线（抛向空中然后落到弹跳起点）
+        const bezier1 = [];
+        const midPoint1 = cc.v3(
+            startWorldPos.x + moveVec.x * 0.3,
+            Math.max(startWorldPos.y, bounceStartPos.y) + maxHeight,
+            0
+        );
+        bezier1.push(cc.v2(startWorldPos.x, startWorldPos.y));
+        bezier1.push(cc.v2(midPoint1.x, midPoint1.y));
+        bezier1.push(cc.v2(bounceStartPos.x, bounceStartPos.y));
+
+        // 创建最后的弹跳到终点
+        const bezier2 = [];
+        const bounceHeight = 80; // 弹跳高度
+
+        // 计算弹跳的最高点（在起跳点和终点之间）
+        const bounceTopPoint = cc.v2(
+            (bounceStartPos.x + endWorldPos.x) / 2,  // 水平位置在中间
+            endWorldPos.y + bounceHeight  // 垂直高度为弹跳高度
+        );
+        // const bounceSecondPos = cc.v3(
+        //     endWorldPos.x - normalizedDir.x * 100,
+        //     endWorldPos.y - normalizedDir.y * 100,
+        //     0
+        // );
+
+        // 最后一次弹跳到终点
+        bezier2.push(cc.v2(bounceStartPos.x, bounceStartPos.y)); // 起跳点
+        bezier2.push(bounceTopPoint); // 最高点
+        bezier2.push(cc.v2(endWorldPos.x, endWorldPos.y)); // 终点
+
+        // 创建动作序列
+        const bezierAction1 = cc.bezierTo(duration * 0.8, bezier1);
+        const bezierAction2 = cc.bezierTo(duration * 0.2, bezier2);
+
+
+        // 组合所有动作
+        const seq = cc.sequence(
+            bezierAction1,
+            bezierAction2,
+            cc.callFunc(() => {
+                mergeCube.SetZIndex(targetIdx);
+            })
+        );
 
+        // 执行动画
+        mergeCube.node.runAction(seq);
     }
 
 }

assets/script/shared/admin/PtlDeleteSetting.ts

@@ -1,17 +1,17 @@
 
 
 // 定义请求参数
-export interface ReqDeleteSetting {
+export interface ReqdeleteSetting {
     key: string
 }
 
 // 定义返回字段
-export interface ResDeleteSetting {
+export interface ResdeleteSetting {
     order10Back: any
 }
 
 export const conf = {
-    connet: "ws"
+    connet: "admin"
 }
 
 

assets/script/shared/admin/PtlGetSetting.ts

@@ -1,12 +1,10 @@
-
-
 // 定义请求参数
-export interface ReqGetSetting {
+export interface ReqgetSetting {
 
 }
 
 // 定义返回字段
-export interface ResGetSetting {
+export interface ResgetSetting {
     order10Back:any
 }
 

assets/script/shared/admin/PtlGetVer.ts

@@ -1,17 +1,17 @@
 
 
 // 定义请求参数
-export interface ReqGetVer {
+export interface ReqgetVer {
 
 }
 
 // 定义返回字段
-export interface ResGetVer {
-
+export interface ResgetVer {
+    order10Back:any
 }
 
 export const conf = {
-    connet: "ws"
+    connet: "admin"
 }
 
 

assets/script/shared/admin/PtlHuodongFind.ts

@@ -1,17 +1,18 @@
 
 
 // 定义请求参数
-export interface ReqHuodongFind {
-
+export interface ReqhuodongFind {
+    key: string
+    hdcid: string
 }
 
 // 定义返回字段
-export interface ResHuodongFind {
-
+export interface ReshuodongFind {
+    order10Back: any
 }
 
 export const conf = {
-    connet: "ws"
+    connet: "admin"
 }
 
 

assets/script/shared/admin/PtlUpdateSetting.ts

@@ -1,18 +1,18 @@
 
 
 // 定义请求参数
-export interface ReqUpdateSetting {
+export interface RequpdateSetting {
     key:string
     param:any
 }
 
 // 定义返回字段
-export interface ResUpdateSetting {
+export interface ResupdateSetting {
     order10Back:any
 }
 
 export const conf = {
-    connet: "ws"
+    connet: "admin"
 }
 
 

assets/script/shared/admin/PtladdBuMa.ts

@@ -0,0 +1,20 @@
+
+
+// 定义请求参数
+export interface ReqaddBuMa {
+    id: string,
+    addCount: number,
+
+}
+
+// 定义返回字段
+export interface ResaddBuMa {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "4bbf801f-80b8-4d2d-946a-bba0e79221fd",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtladdCode.ts

@@ -0,0 +1,20 @@
+
+
+// 定义请求参数
+export interface ReqaddCode {
+    param: any
+
+}
+
+// 定义返回字段
+export interface ResaddCode {
+    order10Back: any
+
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "2e34cd79-8072-43de-aaa7-762bf1f93c6b",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtladdMail.ts

@@ -0,0 +1,19 @@
+
+
+// 定义请求参数
+export interface ReqaddMail {
+    params: any
+
+}
+
+// 定义返回字段
+export interface ResaddMail {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "aceee545-8523-4237-87b7-ebec1d8cb4d6",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlcacheVer.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqcacheVer {
+
+}
+
+// 定义返回字段
+export interface RescacheVer {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "f9fc610b-be01-4f25-8f9b-bf906b44f767",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtldeleteCode.ts

@@ -0,0 +1,19 @@
+
+
+// 定义请求参数
+export interface ReqdeleteCode {
+    id : string
+
+}
+
+// 定义返回字段
+export interface ResdeleteCode {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "8295d66a-cabc-46fe-836a-b4558f25d888",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtldeleteMail.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqdeleteMail {
+    id: string
+}
+
+// 定义返回字段
+export interface ResdeleteMail {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "4d1723c0-6a80-474f-9709-04aa53ea631a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlgetCode.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqgetCode {
+
+}
+
+// 定义返回字段
+export interface ResgetCode {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "d8aef45b-d94d-41af-86d1-b87e494c3094",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlgetCodeMa.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqgetCodeMa {
+    id: string
+}
+
+// 定义返回字段
+export interface ResgetCodeMa {
+    order10Back:any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "99c457e5-1af1-45d9-bad4-e92b58e3096c",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlgetMail.ts

@@ -0,0 +1,18 @@
+
+
+// 定义请求参数
+export interface ReqgetMail {
+
+}
+
+// 定义返回字段
+export interface ResgetMail {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "dcb046ef-f962-4fe9-a739-0115de7dbd80",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/PtlupdateMail.ts

@@ -0,0 +1,20 @@
+
+
+// 定义请求参数
+export interface RequpdateMail {
+    id: string,
+    params: any
+
+}
+
+// 定义返回字段
+export interface ResupdateMail {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "0d9e06cf-865a-420b-bf67-179725432a13",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/admin/Ptlxaizai.ts

@@ -0,0 +1,19 @@
+
+
+// 定义请求参数
+export interface Reqxaizai {
+    id: string
+
+}
+
+// 定义返回字段
+export interface Resxaizai {
+    order10Back: any
+}
+
+export const conf = {
+    connet: "admin"
+}
+
+
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "dd6feca8-ffe1-4735-a95c-58e510cd8957",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps/client/MsgEpsInfo_c.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo_c {
+
+}

assets/script/shared/eps/client/MsgEpsInfo_c.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "41e95236-cca4-4ea4-926d-90db3263b000",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps/server/MsgEpsChange_s.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsChange_s {
+    [id: string]: number; //属性信息
+}
+

assets/script/shared/eps/server/MsgEpsChange_s.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "fe2b016b-5e7b-4184-817d-d1c60b7620c1",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/eps/server/MsgEpsInfo_s.ts

@@ -0,0 +1,7 @@
+
+
+// 定义返回字段
+export interface MsgEpsInfo_s {
+    [id: string]: number; //属性信息
+}
+

assets/script/shared/eps/server/MsgEpsInfo_s.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "564b0b45-6f98-4c1a-b13d-3ba743ec2d9e",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/hc.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "0c5b28aa-e354-40b8-a6cf-d9ff591895fd",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/hc/client.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "12e050a1-7c64-4dcd-86a1-0ebdb2672706",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/hc/client/MsgHcInfo_c.ts

@@ -0,0 +1,6 @@
+
+
+// 定义返回字段
+export interface MsgHcInfo_c {
+
+}

assets/script/shared/hc/client/MsgHcInfo_c.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "f3f14465-abf9-4ad5-b12d-b0460fb6e5f0",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/hc/server.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "9b779437-5b4d-4bbb-a6d7-8cd9dda4b244",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/shared/hc/server/MsgHcInfo_s.ts

@@ -0,0 +1,32 @@
+
+
+// 定义返回字段
+export interface MsgHcInfo_s {
+    chapterId:number  //章节ID
+    tili:number  //体力
+    lastTime:number //最后一次结算体力时间
+    list:List //格子列表
+}
+
+
+interface List {
+    [gzid: string]: GeziInfo;
+}
+
+interface GeziInfo {
+    type:Type   //具体物品类型
+    unlock:Unlock  //解锁状态
+    correlationId:number  //物品ID
+}
+//具体物品类型
+export enum Type {
+    wu = "0", //无物品
+    emitter = "1", //发射器
+    monster = "2", //怪物
+    equip = "3", //装备
+}
+//解锁状态
+export enum Unlock {
+    on = "on", //开
+    off = "off", //关
+}

assets/script/shared/hc/server/MsgHcInfo_s.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "e47408bb-1fab-46c8-8cf2-767157dab64c",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/item/client/MsgItemInfo_c.ts

@@ -0,0 +1,8 @@
+
+
+// 请求道具列表
+export interface MsgItemInfo_c {
+
+}
+
+

assets/script/shared/item/client/MsgItemInfo_c.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "9fb8a969-fbd8-4190-bca9-d98046faf20f",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -0,0 +1,7 @@
+
+
+// 道具数量发生改变下发
+export interface MsgItemChange_s {
+    [itemid:string]:number
+}
+

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

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "060d6a9c-0b1e-4666-828e-61dcb6e08261",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -0,0 +1,7 @@
+
+
+// 道具列表
+export interface MsgItemInfo_s {
+    [itemid:string]:number
+}
+