主界面

assets/script/common/xlsConfig.ts

@@ -58,19 +58,39 @@ export class XlsConfig {
     xlsAudioInfo: xlsAudioInfo[]
     xlsChapterInfo: xlsChapterInfo[]
     xlsChapterLayout: xlsChapterLayout[]
+<<<<<<< Updated upstream
     xlsItemKind: xlsItemKind[]
     xlsItemInfo: xlsItemInfo[]
     xlsAttrAttr: xlsAttrAttr[]
     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[]
+    xlsNameName: xlsNameName[]
+    xlsPingbiciInfo: xlsPingbiciInfo[]
+    xlsMathInfo: xlsMathInfo[]
+>>>>>>> Stashed changes
     xlsPackageInfo: xlsPackageInfo[]
     xlsLevelLevel: xlsLevelLevel[]
     xlsGuideInfo: xlsGuideInfo[]
     xlsMathInfo: xlsMathInfo[]
     xlsTaskDesc: xlsTaskDesc[]
     xlsTaskMain: xlsTaskMain[]
+<<<<<<< Updated upstream
     xlsPingbiciInfo: xlsPingbiciInfo[]
+=======
+    xlsMergePropInfo: xlsMergePropInfo[]
+>>>>>>> Stashed changes
     xlsLanguageLang: xlsLanguageLang[]
 
     constructor(bundleName:string, callback: Function, progressCallback?: Function) {

assets/script/data/GameDataCenter.ts

@@ -17,7 +17,7 @@ import UserModel from "./model/User/UserModel";
 import WindowModel from "./model/WindowModel";
 import BattleModel from "./model/Battle/BattleModel";
 import OrderModel from "./model/OrderModel";
-import ItemModel from "./model/ItemModel";
+import ItemModel from "./model/Item/ItemModel";
 import PageModel from "./model/PageModel";
 import GridMapModel from "./model/GridMap/GridMapModel";
 

assets/script/data/const/TypeConst.ts

@@ -134,8 +134,9 @@ export enum HeadBgType {
 }
 
 export class ConstItem {
-    static gem = [1, 1] // 钻石
-    static coin = [1, 2] // 金币
+    static gem = [1, 102] // 钻石
+    static coin = [1, 101] // 金币
+    static sp = [1, 103] // 体力
 }
 
 export enum PlatformType {

assets/script/data/model/Item.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "19a6ab5c-5cd3-4b63-ade8-84bdfb3a24aa",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/script/data/model/ItemModel.ts → assets/script/data/model/Item/ItemModel.ts

@@ -1,17 +1,19 @@
-import Gamecfg from "../../common/gameCfg";
-import { gameMethod } from "../../common/gameMethod";
-import { xlsItemInfo } from "../../common/xlsConfig";
-import { KindItem, SevBack } from "../../common/Xys";
-import IDataModel from "../../frameWork/model/IDataModel";
-import UIHelp from "../../logic/ui/UIHelp";
-import EventMng from "../../manager/EventMng";
-import { I18n } from "../../utils/I18nUtil";
-import { ItemEvent } from "../const/EventConst";
-import { IconUrl } from "../const/ResConst";
-import { ConstItem, ItemBaseCfg, ItemKind } from "../const/TypeConst";
-import GameDataCenter from "../GameDataCenter";
-
-export default class ItemModel extends IDataModel {
+import Gamecfg from "../../../common/gameCfg";
+import { gameMethod } from "../../../common/gameMethod";
+import { xlsItemInfo } from "../../../common/xlsConfig";
+import { KindItem } from "../../../common/Xys";
+import UIHelp from "../../../logic/ui/UIHelp";
+import EventMng from "../../../manager/EventMng";
+import { ResItemInfo } from "../../../shared/item/PtlItemInfo";
+import { MsgItemChange_s } from "../../../shared/item/server/MsgItemChange_s";
+import { I18n } from "../../../utils/I18nUtil";
+import { ItemEvent } from "../../const/EventConst";
+import { IconUrl } from "../../const/ResConst";
+import { ConstItem, ItemBaseCfg, ItemKind } from "../../const/TypeConst";
+import GameDataCenter from "../../GameDataCenter";
+import { ItemModelData } from "./ItemModelData";
+
+export default class ItemModel extends ItemModelData {
 	// 本次登录不再提示是否购买,直接买的列表
 	buyNowList: { [key: string]: boolean } = {};
 
@@ -26,15 +28,24 @@ export default class ItemModel extends IDataModel {
 
 	constructor() {
 		super("item");
-		GameDataCenter.setRspModel("actItem", this);
 		this.buyNowList = {};
 	}
 
-	doSevback(result: SevBack): void { }
-	doEvent(result: SevBack): void {
-		if (result.actItem) {
-			EventMng.emit(ItemEvent.UP_ITEM, result.actItem?.u);
-		}
+	onRegister(): void {
+        GameDataCenter.gameServer.ListenMsg("item/server/ItemChange_s", this.onItemChange, this);
+    }
+
+	onItemChange(msg: MsgItemChange_s) {
+        for (let key in msg) {
+            if (Object.prototype.hasOwnProperty.call(msg, key)) {
+                this.ItemInfo[key] = msg[key];
+            }
+        }
+        EventMng.emit(ItemEvent.UP_ITEM);
+    }
+	
+	setItemInfo(res: ResItemInfo) {
+		this.ItemInfo = res;
 	}
 
 	getKindItem(kindItem: KindItem): KindItem {
@@ -48,8 +59,10 @@ export default class ItemModel extends IDataModel {
 	getItemCount(kindItem: KindItem | ConstItem): number {
 		if (kindItem?.[0] == ItemKind.money) {
 			switch (kindItem?.[1]) {
+				case ConstItem.sp[1]:
+					return  GameDataCenter.gridMap.hcInfo?.tili ?? 0;
 				default:
-					return GameDataCenter.sevBack.actItem?.a?.[kindItem?.[1]] ?? 0;
+					return this.ItemInfo?.[kindItem?.[1]] ?? 0;
 			}
 		}
 	}
@@ -103,29 +116,8 @@ export default class ItemModel extends IDataModel {
 	//根据类型获取道具列表
 	getItemListByType(type: string): KindItem[] {
 		let list: KindItem[] = [];
-		for (const kind in GameDataCenter.sevBack.actItem) {
-			for (const itemId in GameDataCenter.sevBack.actItem[kind].a) {
-				const element = GameDataCenter.sevBack.actItem[kind].a[itemId];
-				if (element > 0) {
-					let conf = this.getItemCfgBase([Number(kind), Number(itemId)]);
-					if (conf != null && conf.type == type) {
-						list.push([Number(kind), Number(itemId), element]);
-					}
-				}
-			}
-		}
 		return list;
 	}
-
-	addKindItem(item: KindItem) {
-		if (GameDataCenter.sevBack.actItem[item[0]] == null) {
-			GameDataCenter.sevBack.actItem[item[0]] = { a: {} };
-		}
-		if (GameDataCenter.sevBack.actItem[item[0]].a[item[1]] == null) {
-			GameDataCenter.sevBack.actItem[item[0]].a[item[1]] = 0;
-		}
-		GameDataCenter.sevBack.actItem[item[0]].a[item[1]] += item[2];
-	}
 	// 检测道具是否满足,弹出获取途径
 	isEnough(needItem: KindItem | ConstItem, showTips: boolean = true, preCostCount: number = 0): boolean {
 		if (gameMethod.isEmpty(needItem)) {
@@ -234,4 +226,13 @@ export default class ItemModel extends IDataModel {
 		// }
 		return jumplist;
 	}
+
+	//发送消息
+	async sendItemInfo() {
+        let ret = await GameDataCenter.gameServer.ReqApi("item/ItemInfo", {});
+        if (ret?.res) {
+            this.setItemInfo(ret.res);
+            EventMng.emit(ItemEvent.UP_ITEM);
+        }
+    }
 }

assets/script/data/model/ItemModel.ts.meta → assets/script/data/model/Item/ItemModel.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "05115100-fb18-4704-931b-fb6645274a31",
+  "uuid": "0a9746fc-2b38-42fe-8c55-fa57b24f3de6",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/data/model/Item/ItemModelData.ts

@@ -0,0 +1,10 @@
+
+import IDataModel from "../../../frameWork/model/IDataModel";
+import { ResItemInfo } from "../../../shared/item/PtlItemInfo";
+
+/**
+ * 定义 Model 的数据
+ */
+export class ItemModelData extends IDataModel {
+    ItemInfo: ResItemInfo;
+}

assets/script/data/model/Item/ItemModelData.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "f6685a7e-c563-4a74-920d-c908f9ba434e",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/data/model/Task/TaskModel.ts

@@ -2,6 +2,7 @@ import Gamecfg from "../../../common/gameCfg";
 import { gameMethod } from "../../../common/gameMethod";
 import { xlsTaskMain } from "../../../common/xlsConfig";
 import EventMng from "../../../manager/EventMng";
+import { MsgItemChange_s } from "../../../shared/item/server/MsgItemChange_s";
 import { ResTaskInfo } from "../../../shared/task/PtlTaskInfo";
 import { I18n } from "../../../utils/I18nUtil";
 import { TaskMainEvent } from "../../const/EventConst";
@@ -11,11 +12,6 @@ import { TaskModelData } from "./TaskModelData";
 
 export default class TaskModel extends TaskModelData {
 	readonly GuanQiaNum = 5;
-
-	constructor() {
-		super("task");
-	}
-
 	readonly TaskPopCloseCd: number = 5;
 	readonly TaskPopTime: number = 0.2;
 
@@ -25,6 +21,22 @@ export default class TaskModel extends TaskModelData {
 	//最后一次记录任务id
 	private _lastTaskId: number = 0;
 
+	constructor() {
+		super("task");
+	}
+
+	onRegister(): void {
+        GameDataCenter.gameServer.ListenMsg("item/server/ItemChange_s", this.onTaskChange, this);
+    }
+
+	onTaskChange(msg: MsgItemChange_s) {
+        for (let key in msg) {
+            if (Object.prototype.hasOwnProperty.call(msg, key)) {
+                this.taskInfo[key] = msg[key];
+            }
+        }
+        EventMng.emit(TaskMainEvent.UP_INFO);
+    }
 	
 	setTaskInfo(res: ResTaskInfo) {
 		this.taskInfo = res;

assets/script/logic/fgui/Common/ItemCount.ts

@@ -0,0 +1,136 @@
+import { KindItem } from "../../../common/Xys";
+import { ItemEvent } from "../../../data/const/EventConst";
+import GameDataCenter from "../../../data/GameDataCenter";
+import FguiLoadMgr from "../../../frameWork/fgui/FguiLoadMgr";
+import FguiMgr from "../../../frameWork/fgui/FguiMgr";
+import EventMng from "../../../manager/EventMng";
+import ClickAuEffect from "../../../utils/ClickAuEffect";
+import GameMath from "../../../utils/GameMath";
+
+export interface ItemCountExtraParam {
+	showAddBtn?: boolean; //是否显示加按钮
+	fullNumberShow?: boolean; //是否显示完整道具拥有数量
+	isBuyItem?: boolean; //是否点击从集市购买道具
+	notEnoughRed?: boolean; //道具不足是否显示红色字
+	isPreCost?: boolean; //是否是预扣除类道具
+	FixedCount?: number | string;// 显示固定数量，不用GameDataCenter.item.getItemCount
+}
+
+export default class ItemCount {
+	item: KindItem;
+
+	node: fairygui.GButton;
+
+	icon: fairygui.GLoader;
+	AddBtn: fairygui.GButton;
+
+	CostCount: number = 0;
+
+	callBack: Function;
+
+	fullNumberShow: boolean;
+
+	isBuyItem: boolean;
+
+	redText: boolean;
+
+	isPreCost: boolean;
+
+	FixedCount: number | string;
+
+	constructor(com: fairygui.GButton, kinditem?: KindItem, costCount: number = 0, param?: ItemCountExtraParam) {
+		this.node = com;
+		this.AddBtn = this.node.getChild("AddBtn") as fairygui.GButton;
+		this.icon = this.node.getChild("icon") as fairygui.GLoader;
+		if (kinditem) this.setData(kinditem, costCount, param);
+		this.AddBtn.visible = param && param.showAddBtn == false ? false : true;
+	}
+
+	setData(kindItem: KindItem, costCount: number = 0, param?: ItemCountExtraParam, iconUrl?: string) {
+		if (kindItem) {
+			this.CostCount = costCount;
+			this.fullNumberShow = param?.fullNumberShow ? true : false;
+			this.isBuyItem = param?.isBuyItem ? true : false;
+			this.redText = param?.notEnoughRed ? true : false;
+			this.isPreCost = param?.isPreCost ?? false;
+			this.FixedCount = param?.FixedCount;
+			this.item = kindItem;
+			if (!iconUrl) {
+				FguiLoadMgr.loadItemIcon(this.icon, this.item, null, 0.4);
+			} else {
+				if (iconUrl.indexOf('ui://') >= 0) {
+					this.icon.url = iconUrl;
+				}else{
+					//加载bundle资源
+					let bundleName: string = iconUrl.split("|")[0];
+					let urlStr: string = iconUrl.split("|")[1];
+					GameDataCenter.loading.loadSpriteFormBundle(this.icon?.node, bundleName, urlStr);
+				}
+			}
+			this.showItem();
+			this.node.visible = true;
+		} else {
+			this.item = null;
+			this.node.visible = false;
+		}
+	}
+
+	showItem() {
+		if (this.item == null) return;
+		if (this.FixedCount) {
+			this.node.title = this.FixedCount + "";// 显示传入的固定数量
+			if (this.redText) {
+				let itemCount = GameDataCenter.item.getItemCount(this.item);
+				if (Number(this.FixedCount) > itemCount) {
+					this.node.getChild("title").asTextField.color = cc.color().fromHEX("#E45849");
+				} else {
+					this.node.getChild("title").asTextField.color = cc.color().fromHEX("#FFFBDE");
+				}
+			}
+		} else {
+			let cost: string = this.CostCount ? "/" + this.CostCount : "";
+			let itemCount = this.isPreCost ? GameDataCenter.item.getItemPreCostCount(this.item) : GameDataCenter.item.getItemCount(this.item);
+			let num = this.fullNumberShow ? itemCount : GameMath.showNum(itemCount);
+			this.node.title = num + cost;
+			if (this.redText && itemCount < this.CostCount) {
+				this.node.getChild("title").asTextField.color = cc.color().fromHEX("#E45849");
+			} else {
+				this.node.getChild("title").asTextField.color = cc.color().fromHEX("#FFFBDE");
+			}
+		}
+	}
+
+	showDetail() {
+		// FguiMgr.Instance.openUI(ItemDetailViewView, ViewZorder.POP, null, this.item);
+	}
+
+	/**设置点击回调 如果有设置，就不会弹出详情
+	 */
+	setCallBack(callBack: Function) {
+		this.callBack = callBack;
+	}
+
+	onEnable() {
+		this.node.onClick(this.onClick, this);
+		EventMng.on(ItemEvent.UP_ITEM, this.showItem, this);
+		this.showItem();
+	}
+
+	onDisable() {
+		this.node.offClick(this.onClick, this);
+		EventMng.off(ItemEvent.UP_ITEM, this.showItem, this);
+	}
+
+	@ClickAuEffect()
+	onClick() {
+		if (this.callBack) {
+			this.callBack();
+		} else {
+			if (this.isBuyItem) {
+				// GameDataCenter.shop.openBuyItemView(this.item);
+			} else {
+				this.showDetail();
+			}
+		}
+	}
+}

assets/script/logic/fgui/Common/ItemCount.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "33a00080-a27f-4733-a1d4-c8cd8a224806",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -2,11 +2,13 @@ import Gamecfg from "../../../../common/gameCfg";
 import { gameMethod } from "../../../../common/gameMethod";
 import GameDataCenter from "../../../../data/GameDataCenter";
 import { ItemEvent, UserEvent, ZhanLiEvent } from "../../../../data/const/EventConst";
-import { ConstItem, HeadBgType } from "../../../../data/const/TypeConst";
+import { ConstItem, HeadBgType, ItemKind } from "../../../../data/const/TypeConst";
 import FguiLoadMgr from "../../../../frameWork/fgui/FguiLoadMgr";
 import EventMng from "../../../../manager/EventMng";
 import ClickAuEffect from "../../../../utils/ClickAuEffect";
 import GameMath from "../../../../utils/GameMath";
+import { GridEvent } from "../../../gridMap/GridEvent";
+import ItemCount, { ItemCountExtraParam } from "../../Common/ItemCount";
 import UserHead from "../../Common/UserHead";
 
 export default class UIHeadTopView {
@@ -16,6 +18,9 @@ export default class UIHeadTopView {
     private _ZhanLiFont: fairygui.GObject;
     private _UserHead: UserHead;
     private _PbLv: fairygui.GProgressBar;
+    ItemGold: ItemCount;
+    ItemDiamond: ItemCount;
+    ItemSp: ItemCount;
     public constructor(vm: fgui.GComponent) {
         this._HeadBtn = vm.getChild("HeadBtn")
         this._NameFont = vm.getChild("NameFont")
@@ -23,24 +28,35 @@ export default class UIHeadTopView {
         this._ZhanLiFont = vm.getChild("ZhanLiFont")
         this._UserHead = vm.getChild("UserHead") as UserHead;
         this._PbLv = vm.getChild("PbLv") as fgui.GProgressBar;
+        this.ItemGold = new ItemCount(vm.getChild("ItemGold") as fgui.GButton);
+        this.ItemDiamond = new ItemCount(vm.getChild("ItemDiamond") as fgui.GButton);
+        this.ItemSp = new ItemCount(vm.getChild("ItemSp") as fgui.GButton);
         // FguiLoadMgr.loadItemIcon(vm.getChild("GoldImg").asLoader, ConstItem.coin, () => { }, 0.3);
         // FguiLoadMgr.loadItemIcon(vm.getChild("DiamondImg").asLoader, ConstItem.gem, () => { }, 0.3);
     }
 
     public onEnable(): void {
+        this.ItemGold.onEnable();
+        this.ItemDiamond.onEnable();
+        this.ItemSp.onEnable();
+        GameDataCenter.item.sendItemInfo();
         EventMng.on(ItemEvent.UP_ITEM, this.onUpItem, this)
+        EventMng.on(GridEvent.HC_SP_UP, this.onUpSp, this)
         EventMng.on(ZhanLiEvent.ZHANLI_UP_HOME_ZHANLI, this.onUpZhanLi, this)
         EventMng.on(UserEvent.SET_NAME_SUCC, this.onUpUser, this);
         EventMng.on(UserEvent.UP_USER, this.onUpUser, this);
         this._HeadBtn.onClick(this.OnClickHeadBtn, this)
         this.onUpUser()
-        this.onUpItem()
         this.onUpZhanLi();
         this.onUpRed();
     }
 
     public onDisable(): void {
+        this.ItemGold.onDisable();
+        this.ItemDiamond.onDisable();
+        this.ItemSp.onDisable();
         EventMng.off(ItemEvent.UP_ITEM, this.onUpItem, this)
+        EventMng.off(GridEvent.HC_SP_UP, this.onUpSp, this)
         EventMng.off(ZhanLiEvent.ZHANLI_UP_HOME_ZHANLI, this.onUpZhanLi, this)
         EventMng.off(UserEvent.SET_NAME_SUCC, this.onUpUser, this);
         EventMng.off(UserEvent.UP_USER, this.onUpUser, this);
@@ -73,7 +89,28 @@ export default class UIHeadTopView {
     }
 
     onUpItem() {
-        
+        let param: ItemCountExtraParam = {
+            showAddBtn: true,
+            fullNumberShow: true,
+            isBuyItem: true,
+            notEnoughRed: false
+        }
+        let goldInfo = GameDataCenter.item.getKindItem(ConstItem.coin);
+        this.ItemGold.setData(goldInfo, null, param);
+        let gemInfo = GameDataCenter.item.getKindItem(ConstItem.gem);
+        this.ItemDiamond.setData(gemInfo, null, param);
+    }
+
+    onUpSp() {
+        //体力单独读取
+        let spInfo = [ConstItem.sp[0], ConstItem.sp[1], GameDataCenter.gridMap.hcInfo?.tili];
+        let param: ItemCountExtraParam = {
+            showAddBtn: true,
+            fullNumberShow: true,
+            isBuyItem: true,
+            notEnoughRed: false
+        }
+        this.ItemSp.setData(spInfo, null, param);
     }
 
     onUpZhanLi() {

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "27038615-dd53-46e8-b583-f57d634d16b7",
+  "uuid": "e721a0f5-d513-49aa-9cf0-1df5076dd85a",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "a0b1fc5f-62f5-4883-b497-62aabe77e9cd",
+  "uuid": "06554e5a-cebd-48ac-8e04-f6645c6036ed",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "f2b8e5fb-d7a5-42dc-902d-620277447a93",
+  "uuid": "8745f36f-4285-473b-819e-3ddae292de5b",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "2026ea43-2ab8-45ba-b5aa-2e1465e023f0",
+  "uuid": "f3f5f2aa-36ee-486a-9523-2855a0ef1556",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "8ba135ae-0551-466c-95f5-b5d741a50ba5",
+  "uuid": "f021a281-7fb1-41f0-9592-56944ceea7d8",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/mail.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "553c4953-3c9b-416f-9a9d-91d2e03c7dc1",
+  "uuid": "96f1a6aa-17e2-4805-b85c-cfdc2c3d55ad",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

assets/script/shared/mail/PtlMailInfo.ts

@@ -1,15 +1,23 @@
 
 
+<<<<<<< Updated upstream
 /**
  * 请求邮件信息
  */
+=======
+// 定义请求参数
+>>>>>>> Stashed changes
 export interface ReqMailInfo {
 
 }
 
+<<<<<<< Updated upstream
 /**
  * 返回邮件信息列表
  */
+=======
+// 定义返回字段
+>>>>>>> Stashed changes
 export interface ResMailInfo {
     [id:string]:MailInfo
 }

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

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "68613fbf-6fd8-4aa5-9ec7-5f7529d016cf",
+  "uuid": "ae39e1bb-00e4-4401-9a7d-e46d9b4cca2b",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/mail/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "d5b045a7-e135-4012-b684-7b03a39c05ed",
+  "uuid": "030ce394-d1c8-4480-b30c-055a0e4e557a",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

assets/script/shared/mail/server/MsgMailNew_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "e51bb4ef-2871-4327-aef9-2c4f952634ef",
+  "uuid": "309ee77d-a96b-48e2-be0a-b3f9f6204386",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/task/server.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.3",
-  "uuid": "f9dcf36e-2f34-4168-abd6-3e516071ab29",
+  "uuid": "f476512e-5c18-4961-8058-650de24016f6",
   "importer": "folder",
   "isBundle": false,
   "bundleName": "",

assets/script/shared/task/server/MsgTaskCons_s.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "a024e861-5138-4de8-9cee-204698625cb6",
+  "uuid": "2585da10-1594-4096-8f3f-011b3434dab2",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,