Merge branch 'master' of http://118.178.135.110:3000/fish/tower_client

assets/script/game/manager/MailManager.ts

@@ -4,7 +4,7 @@ import { Mail, MailData } from "../data/MailData";
 
 export class MailManager {
     //邮件功能是否开放
-    static isOpenMail(){
+    static isOpenMail() {
         return false;
     }
 
@@ -17,7 +17,7 @@ export class MailManager {
         for (const key in mails) {
             const v = mails[key];
             // if (parseInt(v.expire, 10) >= nowTime) {
-                mailList.push(v);
+            mailList.push(v);
             // }
         }
 
@@ -55,7 +55,7 @@ export class MailManager {
         }
         return false;
     }
-    
+
     //获取邮件附件（首个外部展示用）
     static getShowAward(id: string): any {
         let mails = MailData.getData()
@@ -105,11 +105,19 @@ export class MailManager {
         //             }
         //         }
 
-                // return text;
-            // } else {
-                return content;
-            // }
+        // return text;
+        // } else {
+        return content;
         // }
+        // }
+    }
+
+    //消息-讀郵件
+    static sendGetMailMsg(args: { ids: {} }, callback) {
+        LoginMgr.sendPost('user', 'get_mails', (data) => {
+            console.log(data);
+            MailData.setNewMail(data.get_mails)
+        }, args)
     }
 
     //是否有附件未领
@@ -125,7 +133,7 @@ export class MailManager {
     }
 
     //消息-批量刪除
-    static sendBatchDelMailMsg(args:{},callback){
+    static sendBatchDelMailMsg(args: {}, callback) {
         LoginMgr.sendPost('user', 'batch_del_mail', (data) => {
             console.log(data);
             MailData.removeMail(data.del_mails);
@@ -134,7 +142,7 @@ export class MailManager {
     }
 
     //消息-批量領獎
-    static sendBatchMaillAwardsMsg(args:{},callback){
+    static sendBatchMaillAwardsMsg(args: {}, callback) {
         LoginMgr.sendPost('user', 'batch_mail_awards', (data) => {
             console.log(data);
             for (const key in data.read_mails) {
@@ -148,7 +156,7 @@ export class MailManager {
     }
 
     //消息-讀郵件
-    static sendReadMailMsg(args:{id:string},callback){
+    static sendReadMailMsg(args: { id: string }, callback) {
         LoginMgr.sendPost('user', 'read_mail', (data) => {
             console.log(data);
             MailData.setMailReadById(args.id)

assets/script/game/ui/tower/TowerUI.ts

@@ -20,9 +20,12 @@ import { StringUtil } from '../../../framework/util/StringUtil';
 import { MaterialUtil } from '../../../framework/util/MaterialUtil';
 import { BattlesConf } from './conf/BattlesConf';
 import { GameEvent } from '../../data/GameEvent';
+import { LoginManager, LoginMgr } from '../../common/LoginManager';
+import { MailManager } from '../../manager/MailManager';
+import { ViewID } from '../../../framework/config/LayerConf';
+import { MailData } from '../../data/MailData';
 import { RoleManager } from '../../manager/RoleManager';
 
-
 //地图比例尺 1：70
 let mapScale = 72;
 let basePoint = {x:-325,y:-70}
@@ -1003,21 +1006,25 @@ export class TowerUI extends BaseView {
 		this.damageCountData.set(typeID,value+valueOld)
 	}
 
-
-
 	private onTouchButton(event: Event, customStr) {
 		let target: any = event.target;
 		if (target.name == 'mask') {
 			Framework.layer.close(this);
-
 		} else if (target.name == 'hanghui_btn') {
 			RoleManager.getNewRole()
+		} else if (target.name == 'hero_btn') {
+			Framework.layer.open(ViewID.HeroList);
+		} else if (target.name == 'material_btn') {
+			LoginMgr.sendPost('tavern', 'get', (data) => {
+				console.log(data);
+			}, {})
+		} else if (target.name == 'mail_btn') {
+			MailManager.sendGetMailMsg({ ids: [MailData.getMaxMailId(0), MailData.getMaxMailId(1)] }, () => {
+				Framework.layer.open(ViewID.MailMain);
+			})
 		}
-
 	}
 
-
-
 	//{typeID:number,value:number}
 	private bossUpdate(data:EnemyActionType){
 		switch(data){