协议调整

assets/json/emitterInfo.json

@@ -1,4 +1,4 @@
 [
-  {"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":10001,"name":"基础发射器","icon":"merge_20108","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","type":2,"upLimit":10,"restoreInterval":0,"restoreNum":0,"prop":null,"demand":null,"chargingType":0,"chargingCost":null,"expiryTime":0}
 ]

assets/json/itemInfo.json

@@ -1,3 +1,27 @@
 [
-  {"id":"101","name":"金币","icon":"item_101","desc":"可以用来升级翅膀","pinzhi":1,"type":"1","detailType":"","param":0,"from":null,"produce":""}
+  {"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":"200","name":"体力","icon":"item_200","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":"202","name":"羽毛","icon":"item_202","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"203","name":"神羽","icon":"item_203","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"204","name":"天赋书","icon":"item_204","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"205","name":"鱼币","icon":"item_205","desc":"","pinzhi":0,"type":"","detailType":"","param":0,"from":null,"produce":""},
+  {"id":"206","name":"珍珠","icon":"item_206","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":"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":""}
 ]

assets/json/mergeInfo.json

@@ -2,6 +2,6 @@
   {"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":[3,11021],"rate1":10000,"item2":null,"rate2":0,"item3":null,"rate3":0,"item4":null,"rate4":0},
-  {"id":1005,"formula":[3,11021,2,10101],"item1":[2,10201],"rate1":3333,"item2":[2,10202],"rate2":3333,"item3":[2,10203],"rate3":3333,"item4":null,"rate4":0}
+  {"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}
 ]

assets/script/common/xlsConfig.ts

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

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

@@ -2,8 +2,8 @@ import { gameMethod } from "../../../common/gameMethod";
 import Config from "../../../Config";
 import GameController from "../../../GameController";
 import EventMng from "../../../manager/EventMng";
-import { ReqLogin } from "../../../shared/player/PtlLogin";
-import { ReqLogin as ReqLogin_1 } from "../../../shared/plat/PtlLogin";
+import { ReqPlatLogin } from "../../../shared/plat/PtlPlatLogin";
+import { ReqPlayerLogin } from "../../../shared/player/PtlPlayerLogin";
 import ThinkingDataMgr from "../../../utils/ThinkingDataMgr";
 import { GameEvent, LoadEvent, NetworkEvent } from "../../const/EventConst";
 import { DayTipsKey, GameErrCode, PlatformType, ReportRoleType } from "../../const/TypeConst";
@@ -49,7 +49,7 @@ export default class LoginModel extends LoginModelData {
     }
 
     // 平台登录
-    async sendPlatLoginGame(param: ReqLogin_1) {
+    async sendPlatLoginGame(param: ReqPlatLogin) {
         let ret = await GameDataCenter.loginServer.ReqApi("plat/PlatLogin", param);
         if (ret.isSucc) {
             EventMng.emit(LoadEvent.LOAD_PROGRESS, 0.5, "login")
@@ -65,7 +65,7 @@ export default class LoginModel extends LoginModelData {
     }
 
     // 账号登录
-    async sendLoginGame(param: ReqLogin) {
+    async sendLoginGame(param: ReqPlayerLogin) {
         let ret = await GameDataCenter.loginServer.ReqApi("player/PlayerLogin", param);
         if (ret.isSucc) {
             CC_PREVIEW && console.log("玩家登录成功", ret);

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

@@ -15,6 +15,7 @@ import { GameServerConfig } from "../../../../network/GameServerConfig";
 import { TsrpcNet } from "../../../../network/TsrpcNet";
 import AssetMgr from "../../../../utils/AssetMgr";
 import AssetsBundleMgr from "../../../../utils/AssetsBundleMgr";
+import { GridEvent } from "../../../gridMap/GridEvent";
 import UEGridMap from "../../../gridMap/UEGridMap";
 import UEMergeTip from "../../../gridMap/UEMergeTip";
 import { BattleMainView } from "../../Battle/BattleMain/BattleMainView";
@@ -63,6 +64,7 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
     private AddListeners(): void {
         this.RegisterClick(this.VM.BtnPlays, this.OnClickBtnPlays);
         this.RegisterClick(this.VM.BtnWing, this.OnClickBtnWing);
+        this.initEvent(GridEvent.HC_MERGE_TIP, this.OnHcMergeTip);
     }
     private RemoveListeners(): void {
         // <#UIEventsRemoveArea>
@@ -80,4 +82,8 @@ export class HomeCtrl extends FguiViewCtrl<HomeVM> {
         FguiMgr.Instance.closeUI(HomeView);
     }
     //#endregion
+
+    private OnHcMergeTip(isShow: boolean): void {
+        this.VM.MergeGroup.visible = isShow;
+    }
 }

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

@@ -35,6 +35,7 @@ export class HomeVM extends FguiViewModel {
     readonly HeadTopCom: fgui.GComponent;
     readonly HdList: fgui.GList;
     readonly Top: fgui.GGroup;
+    readonly MergeGroup: fgui.GGroup;
 
     constructor(panel: fgui.GComponent) {
         super(panel);
@@ -64,6 +65,7 @@ export class HomeVM extends FguiViewModel {
         this.HeadTopCom = panel.getChild("HeadTopCom") as fgui.GComponent;
         this.HdList = panel.getChild("hdList") as fgui.GList;
         this.Top = panel.getChild("top") as fgui.GGroup;
+        this.MergeGroup = panel.getChild("mergeGroup") as fgui.GGroup;
 
     }
 }

assets/script/logic/gridMap/GridEvent.ts

@@ -5,4 +5,5 @@ export class GridEvent {
     static readonly HC_MERGE_RSP = "HC_MERGE_RSP";//接收棋盘合成结果
     static readonly TRIGGER_EMITTER = "TRIGGER_EMITTER";//触发发射器生成道具
     static readonly HC_SP_UP = "HC_SP_UP";//体力刷新
+    static readonly HC_MERGE_TIP = "HC_MERGE_TIP";//合成提示
 }

assets/script/logic/gridMap/UEGridMap.ts

@@ -212,6 +212,8 @@ export default class UEGridMap extends UEBase {
                         ueCube1: this.selectedCell.GetCube(),
                         ueCube2: targetCell.GetCube()
                     });
+                } else {
+                    this.ueMergeTip.Hide();
                 }
             }
         }
@@ -219,7 +221,7 @@ export default class UEGridMap extends UEBase {
 
     private OnTouchEnd(event: cc.Event.EventTouch): void {
         this.dragStartPos = null;
-        this.ueMergeTip.node.active = false;
+        this.ueMergeTip.Hide();
         if (!this.selectedCell) return;
         const touchPos = this.gridLayer.convertToNodeSpaceAR(event.getLocation());
         const targetCell = this.GetCellByPos(touchPos);

assets/script/logic/gridMap/UEMergeTip.ts

@@ -4,7 +4,9 @@ import GameDataCenter from "../../data/GameDataCenter";
 import { MergeItem } from "../../data/model/GridMap/GridMapModel";
 import ResSprite from "../../frameWork/compment/ResSprite";
 import UEBase from "../../frameWork/compment/UEBase";
+import EventMng from "../../manager/EventMng";
 import AssetMgr from "../../utils/AssetMgr";
+import { GridEvent } from "./GridEvent";
 import UECube, { E_CubeType } from "./UECube";
 import UEMergeTipItem from "./UEMergeTipItem";
 
@@ -28,12 +30,12 @@ export default class UEMergeTip extends UEBase {
     data: I_MergeTipData = null!;
     Init(data: I_MergeTipData) {
         //检测是否重复位置和重复合成链
-        if (this.data && data.idx == this.data.idx) {
-
-            return;
-        }
+        // this.node.active = true;
+        // EventMng.emit(GridEvent.HC_MERGE_TIP, true);
+        // if (this.data && data.idx == this.data.idx) {
+        //     return;
+        // }
         this.data = data;
-
         let mergeArr = GameDataCenter.gridMap.GetMergeItems(data.ueCube1, data.ueCube2);
         if (mergeArr.length > 0) {
             this.node.active = true;
@@ -47,12 +49,19 @@ export default class UEMergeTip extends UEBase {
                 itemNode.setPosition(pos);
                 itemNode.getComponent(UEMergeTipItem).Init({ data: mergeArr[i - 1] });
             }
+            EventMng.emit(GridEvent.HC_MERGE_TIP, true);
         } else {
             this.node.active = false;
+            EventMng.emit(GridEvent.HC_MERGE_TIP, false);
         }
     }
 
 
+    Hide() {
+        this.node.active = false;
+        EventMng.emit(GridEvent.HC_MERGE_TIP, false);
+    }
+
     /** 计算圆上的位置 */
     private GetCirclePosition(index: number, total: number): cc.Vec2 {
         const radius = 100; // 圆的半径

assets/script/logic/gridMap/UEMergeTipItem.ts

@@ -51,5 +51,4 @@ export default class UEMergeTipItem extends UEBase {
     }
 
 
-
 }

assets/script/shared/base.ts

@@ -9,3 +9,13 @@ export interface BaseResponse {
 export interface BaseMessage {
 
 }
+
+
+/**
+ * code返回类型
+ */
+export enum Code {
+    succ = 0, //成功
+    fail = 1, //错误
+    over = 2, //返回登录界面
+}

assets/script/shared/mail/PtlMailDelAll.ts

@@ -0,0 +1,24 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqMailDelAll {
+
+}
+
+/**
+* 返回信息
+*/
+export interface ResMailDelAll {
+    [id:string]:{
+        ets: number  //过期时间 小于等于当前时间要隐藏
+    }
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/mail/PtlMailDelAll.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "c6328de8-4e6d-4c45-ba93-5c50c5b3cb54",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/mail/PtlMailDelOne.ts

@@ -0,0 +1,24 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqMailDelOne {
+    id:string //邮件ID
+}
+
+/**
+* 返回信息
+*/
+export interface ResMailDelOne {
+    [id:string]:{
+        ets: number  //过期时间 小于等于当前时间要隐藏
+    }
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/mail/PtlMailDelOne.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "f3eddf46-4e0f-4865-8881-a1c698f2f9da",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/mail/PtlMailInfo.ts

@@ -1,23 +1,15 @@
 
 
-<<<<<<< Updated upstream
 /**
  * 请求邮件信息
  */
-=======
-// 定义请求参数
->>>>>>> Stashed changes
 export interface ReqMailInfo {
 
 }
 
-<<<<<<< Updated upstream
 /**
  * 返回邮件信息列表
  */
-=======
-// 定义返回字段
->>>>>>> Stashed changes
 export interface ResMailInfo {
     [id:string]:MailInfo
 }
@@ -29,8 +21,8 @@ export interface MailInfo {
     items: number[][] //道具列表
     fts: number //发送时间
     rts: number //读取时间
-    ets: number  //过期时间
-    dts: number  //删除时间
+    ets: number  //过期时间 小于等于当前时间要隐藏
+    dts: number  //删除时间  
 }
 
 export const conf = {

assets/script/shared/mail/PtlMailRwdAll.ts

@@ -0,0 +1,24 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqMailRwdAll {
+
+}
+
+/**
+* 返回信息
+*/
+export interface ResMailRwdAll {
+    [id:string]:{
+        rts:number //领取时间
+    }
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/mail/PtlMailRwdAll.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "a4c2f959-f1a5-4556-ae97-b749b3beadac",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/mail/PtlMailRwdOne.ts

@@ -0,0 +1,24 @@
+
+
+/**
+* 请求接口
+*/
+export interface ReqMailRwdOne {
+    id:string //邮件ID
+}
+
+/**
+* 返回信息
+*/
+export interface ResMailRwdOne {
+    [id:string]:{
+        rts:number //领取时间
+    }
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/mail/PtlMailRwdOne.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "5f21f2fb-8391-45e1-a7a5-60f74bb8768a",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/shared/plat/PtlPlatLogin.ts

@@ -12,8 +12,14 @@ export interface ReqPlatLogin {
  * 返回平台登录信息
  */
 export interface ResPlatLogin {
-    openId:string
-    token:string
+    openId:string  //唯一标识
+    token:string   //唯一标识对应的token
+    noticeWais:Notices[]  //登陆界面公告
+}
+export interface Notices {
+    type: number; //公告类型
+    title: string; //这里是公告标题
+    content: string; //这里是公告内容
 }
 
 export const conf = {

assets/script/shared/player/PtlPlayerLogin.ts

@@ -23,6 +23,12 @@ export interface ResPlayerLogin {
 	qufuList:{
 		[sid:string]:qufuInfo
 	}
+	switch:{  //开关配置
+		[key: string]: any
+	}
+    orderList: {  //充值档次配置
+		[dc: string]: OrderList 
+	}; 
 	wsUrl:string //ws地址
 }
 /**
@@ -34,6 +40,13 @@ export interface ResLoginList {
 	level: number; //等级
 	lastlogin: number; //最后一次登录时间
 }
+export interface OrderList {
+    rmb: number;
+    money: number;
+    desc: string;
+    iid: string;
+    daibi: number;
+}
 
 /**
  * 区服信息

assets/script/shared/serviceProto.ts

@@ -30,15 +30,21 @@ import { ReqHcInfo, ResHcInfo } from './hc/PtlHcInfo';
 import { ReqHcMerge, ResHcMerge } from './hc/PtlHcMerge';
 import { ReqItemInfo, ResItemInfo } from './item/PtlItemInfo';
 import { MsgItemChange_s } from './item/server/MsgItemChange_s';
+import { ReqMailDelAll, ResMailDelAll } from './mail/PtlMailDelAll';
+import { ReqMailDelOne, ResMailDelOne } from './mail/PtlMailDelOne';
 import { ReqMailInfo, ResMailInfo } from './mail/PtlMailInfo';
+import { ReqMailRwdAll, ResMailRwdAll } from './mail/PtlMailRwdAll';
+import { ReqMailRwdOne, ResMailRwdOne } from './mail/PtlMailRwdOne';
 import { MsgMailNew_s } from './mail/server/MsgMailNew_s';
 import { ReqPlatLogin, ResPlatLogin } from './plat/PtlPlatLogin';
 import { ReqPlayerLogin, ResPlayerLogin } from './player/PtlPlayerLogin';
 import { ReqTaskInfo, ResTaskInfo } from './task/PtlTaskInfo';
 import { ReqTaskRwd, ResTaskRwd } from './task/PtlTaskRwd';
+import { MsgTaskCons_s } from './task/server/MsgTaskCons_s';
 import { ReqUserFight, ResUserFight } from './user/PtlUserFight';
 import { ReqUserLogin, ResUserLogin } from './user/PtlUserLogin';
 import { ReqUserSetName, ResUserSetName } from './user/PtlUserSetName';
+import { ReqUserUseCode, ResUserUseCode } from './user/PtlUserUseCode';
 import { MsgUserUplevel_s } from './user/server/MsgUserUplevel_s';
 
 export interface ServiceType {
@@ -151,10 +157,26 @@ export interface ServiceType {
             req: ReqItemInfo,
             res: ResItemInfo
         },
+        "mail/MailDelAll": {
+            req: ReqMailDelAll,
+            res: ResMailDelAll
+        },
+        "mail/MailDelOne": {
+            req: ReqMailDelOne,
+            res: ResMailDelOne
+        },
         "mail/MailInfo": {
             req: ReqMailInfo,
             res: ResMailInfo
         },
+        "mail/MailRwdAll": {
+            req: ReqMailRwdAll,
+            res: ResMailRwdAll
+        },
+        "mail/MailRwdOne": {
+            req: ReqMailRwdOne,
+            res: ResMailRwdOne
+        },
         "plat/PlatLogin": {
             req: ReqPlatLogin,
             res: ResPlatLogin
@@ -182,6 +204,10 @@ export interface ServiceType {
         "user/UserSetName": {
             req: ReqUserSetName,
             res: ResUserSetName
+        },
+        "user/UserUseCode": {
+            req: ReqUserUseCode,
+            res: ResUserUseCode
         }
     },
     msg: {
@@ -190,12 +216,13 @@ export interface ServiceType {
         "eps/server/EpsChange_s": MsgEpsChange_s,
         "item/server/ItemChange_s": MsgItemChange_s,
         "mail/server/MailNew_s": MsgMailNew_s,
+        "task/server/TaskCons_s": MsgTaskCons_s,
         "user/server/UserUplevel_s": MsgUserUplevel_s
     }
 }
 
 export const serviceProto: ServiceProto<ServiceType> = {
-    "version": 50,
+    "version": 53,
     "services": [
         {
             "id": 39,
@@ -434,6 +461,22 @@ export const serviceProto: ServiceProto<ServiceType> = {
             "type": "msg"
         },
         {
+            "id": 79,
+            "name": "mail/MailDelAll",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 80,
+            "name": "mail/MailDelOne",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 77,
             "name": "mail/MailInfo",
             "type": "api",
@@ -442,6 +485,22 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 81,
+            "name": "mail/MailRwdAll",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
+            "id": 82,
+            "name": "mail/MailRwdOne",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 78,
             "name": "mail/server/MailNew_s",
             "type": "msg"
@@ -479,6 +538,11 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 83,
+            "name": "task/server/TaskCons_s",
+            "type": "msg"
+        },
+        {
             "id": 68,
             "name": "user/UserFight",
             "type": "api",
@@ -503,6 +567,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         {
+            "id": 84,
+            "name": "user/UserUseCode",
+            "type": "api",
+            "conf": {
+                "connet": "ws"
+            }
+        },
+        {
             "id": 73,
             "name": "user/server/UserUplevel_s",
             "type": "msg"
@@ -1195,10 +1267,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "value": 0
                 },
                 {
-                    "id": 1,
-                    "value": 1
-                },
-                {
                     "id": 2,
                     "value": 2
                 },
@@ -1207,6 +1275,10 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "value": 3
                 },
                 {
+                    "id": 5,
+                    "value": 50
+                },
+                {
                     "id": 4,
                     "value": 4
                 }
@@ -1275,10 +1347,10 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             }
         },
-        "mail/PtlMailInfo/ReqMailInfo": {
+        "mail/PtlMailDelAll/ReqMailDelAll": {
             "type": "Interface"
         },
-        "mail/PtlMailInfo/ResMailInfo": {
+        "mail/PtlMailDelAll/ResMailDelAll": {
             "type": "Interface",
             "indexSignature": {
                 "keyType": "String",
@@ -1287,59 +1359,168 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "properties": [
                         {
                             "id": 0,
-                            "name": "id",
-                            "type": {
-                                "type": "String"
-                            }
-                        },
-                        {
-                            "id": 1,
-                            "name": "title",
-                            "type": {
-                                "type": "String"
-                            }
-                        },
-                        {
-                            "id": 2,
-                            "name": "content",
-                            "type": {
-                                "type": "String"
-                            }
-                        },
-                        {
-                            "id": 3,
-                            "name": "items",
+                            "name": "ets",
                             "type": {
-                                "type": "Array",
-                                "elementType": {
-                                    "type": "Number"
-                                }
+                                "type": "Number"
                             }
-                        },
+                        }
+                    ]
+                }
+            }
+        },
+        "mail/PtlMailDelOne/ReqMailDelOne": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "id",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "mail/PtlMailDelOne/ResMailDelOne": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Interface",
+                    "properties": [
                         {
-                            "id": 4,
-                            "name": "fts",
+                            "id": 0,
+                            "name": "ets",
                             "type": {
                                 "type": "Number"
                             }
-                        },
-                        {
-                            "id": 5,
-                            "name": "rts",
-                            "type": {
+                        }
+                    ]
+                }
+            }
+        },
+        "mail/PtlMailInfo/ReqMailInfo": {
+            "type": "Interface"
+        },
+        "mail/PtlMailInfo/ResMailInfo": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Reference",
+                    "target": "mail/PtlMailInfo/MailInfo"
+                }
+            }
+        },
+        "mail/PtlMailInfo/MailInfo": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "id",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "title",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "content",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "items",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Array",
+                            "elementType": {
                                 "type": "Number"
                             }
-                        },
+                        }
+                    }
+                },
+                {
+                    "id": 4,
+                    "name": "fts",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 5,
+                    "name": "rts",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 6,
+                    "name": "ets",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 7,
+                    "name": "dts",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
+        "mail/PtlMailRwdAll/ReqMailRwdAll": {
+            "type": "Interface"
+        },
+        "mail/PtlMailRwdAll/ResMailRwdAll": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Interface",
+                    "properties": [
                         {
-                            "id": 6,
-                            "name": "ets",
+                            "id": 0,
+                            "name": "rts",
                             "type": {
                                 "type": "Number"
                             }
-                        },
+                        }
+                    ]
+                }
+            }
+        },
+        "mail/PtlMailRwdOne/ReqMailRwdOne": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "id",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "mail/PtlMailRwdOne/ResMailRwdOne": {
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Interface",
+                    "properties": [
                         {
-                            "id": 7,
-                            "name": "dts",
+                            "id": 0,
+                            "name": "rts",
                             "type": {
                                 "type": "Number"
                             }
@@ -1349,7 +1530,14 @@ export const serviceProto: ServiceProto<ServiceType> = {
             }
         },
         "mail/server/MsgMailNew_s/MsgMailNew_s": {
-            "type": "Interface"
+            "type": "Interface",
+            "indexSignature": {
+                "keyType": "String",
+                "type": {
+                    "type": "Reference",
+                    "target": "mail/PtlMailInfo/MailInfo"
+                }
+            }
         },
         "plat/PtlPlatLogin/ReqPlatLogin": {
             "type": "Interface",
@@ -1389,6 +1577,43 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "type": {
                         "type": "String"
                     }
+                },
+                {
+                    "id": 2,
+                    "name": "noticeWais",
+                    "type": {
+                        "type": "Array",
+                        "elementType": {
+                            "type": "Reference",
+                            "target": "plat/PtlPlatLogin/Notices"
+                        }
+                    }
+                }
+            ]
+        },
+        "plat/PtlPlatLogin/Notices": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "type",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "title",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "content",
+                    "type": {
+                        "type": "String"
+                    }
                 }
             ]
         },
@@ -1495,6 +1720,33 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     }
                 },
                 {
+                    "id": 6,
+                    "name": "switch",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Any"
+                            }
+                        }
+                    }
+                },
+                {
+                    "id": 7,
+                    "name": "orderList",
+                    "type": {
+                        "type": "Interface",
+                        "indexSignature": {
+                            "keyType": "String",
+                            "type": {
+                                "type": "Reference",
+                                "target": "player/PtlPlayerLogin/OrderList"
+                            }
+                        }
+                    }
+                },
+                {
                     "id": 5,
                     "name": "wsUrl",
                     "type": {
@@ -1597,6 +1849,46 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "player/PtlPlayerLogin/OrderList": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "rmb",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 1,
+                    "name": "money",
+                    "type": {
+                        "type": "Number"
+                    }
+                },
+                {
+                    "id": 2,
+                    "name": "desc",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 3,
+                    "name": "iid",
+                    "type": {
+                        "type": "String"
+                    }
+                },
+                {
+                    "id": 4,
+                    "name": "daibi",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
         "task/PtlTaskInfo/ReqTaskInfo": {
             "type": "Interface"
         },
@@ -1641,6 +1933,18 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "task/server/MsgTaskCons_s/MsgTaskCons_s": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "cons",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
         "user/PtlUserFight/ReqUserFight": {
             "type": "Interface"
         },
@@ -2015,6 +2319,21 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "user/PtlUserUseCode/ReqUserUseCode": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "key",
+                    "type": {
+                        "type": "String"
+                    }
+                }
+            ]
+        },
+        "user/PtlUserUseCode/ResUserUseCode": {
+            "type": "Interface"
+        },
         "user/server/MsgUserUplevel_s/MsgUserUplevel_s": {
             "type": "Interface",
             "properties": [

assets/script/shared/user/PtlUserUseCode.ts

@@ -0,0 +1,22 @@
+
+
+/**
+* 请求接口 使用兑换码
+*/
+export interface ReqUserUseCode {
+    key:string  //兑换码
+}
+
+/**
+* 返回信息
+*/
+export interface ResUserUseCode {
+
+}
+
+export const conf = {
+    connet: "ws"
+}
+
+
+

assets/script/shared/user/PtlUserUseCode.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "10e0bdab-5878-44a4-b26c-19a25481b4da",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

fgui-project/assets/Home/Home.xml

@@ -59,6 +59,13 @@
     <group id="n26_miq9" name="top" xy="0,0" size="750,203" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
+    <image id="n30_tt6a" name="n30" src="miq99" fileName="Images/NeiRongDi.png" xy="375,1183" pivot="0.5,0.5" anchor="true" size="750,302" group="n31_tt6a">
+      <relation target="" sidePair="center-center,bottom-bottom"/>
+    </image>
+    <loader id="n32_tt6a" name="n32" xy="238,1188" pivot="0.5,0.5" anchor="true" size="50,50" group="n31_tt6a"/>
+    <group id="n31_tt6a" name="mergeGroup" xy="0,1032" size="750,302" visible="false" advanced="true">
+      <relation target="" sidePair="bottom-bottom"/>
+    </group>
   </displayList>
   <scriptData gencodez3qm0="1"/>
 </component>