From ad2c71671e9ad531a6c1a2ba5ba2fa51cb010d2a Mon Sep 17 00:00:00 2001
From: songwei <songwei@matchvs.com>
Date: Thu, 28 Feb 2019 16:11:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/Main.ts               |  1 +
 client/src/matchvs/MvsHttpApi.ts | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/client/src/Main.ts b/client/src/Main.ts
index 0af5cbf..c29315a 100644
--- a/client/src/Main.ts
+++ b/client/src/Main.ts
@@ -171,6 +171,7 @@ class Main extends eui.UILayer {
             break;
             //注册
             case MatchvsMessage.MATCHVS_REGISTERUSER:
+                MvsHttpApi.TestReportScore();
                 // this.userID = e.data.id;
                 this.userInfoStore(e.data);
             break;
diff --git a/client/src/matchvs/MvsHttpApi.ts b/client/src/matchvs/MvsHttpApi.ts
index f0b3c6b..66c0dea 100644
--- a/client/src/matchvs/MvsHttpApi.ts
+++ b/client/src/matchvs/MvsHttpApi.ts
@@ -3,6 +3,7 @@ class MvsHttpApi {
 	public  open_host:string = MatchvsData.pPlatform == "release"? "https://vsopen.matchvs.com":"https://alphavsopen.matchvs.com";
 	public  rank_list:string = "/rank/ranking_list?";
     public  rank_user:string = "/rank/grades?";
+    public rank_score:string = "/rank/scores?";                  // 上传排行榜分数
 
 	public  get_game_data:string = "/wc5/getGameData.do?";
 	public  set_game_data:string = "/wc5/setGameData.do?";
@@ -119,6 +120,8 @@ class MvsHttpApi {
         var request = new XMLHttpRequest()
         request.open(method, url)
         request.setRequestHeader("Content-Type",headtype);
+        // request.setRequestHeader("Access-Control-Allow-Origin", "true");
+        // request.setRequestHeader("Access-Control-Allow-Credentials", "true");
         if (method == "GET"){
             request.send();
         }else{
@@ -146,6 +149,10 @@ class MvsHttpApi {
 		this.dohttp(url, "POST", params, callback);
 	}
 
+    public http_put(url, params, callback){
+        this.dohttp(url, "PUT", params, callback);
+    }
+
     /**
      * 获取排行榜数据
      */
@@ -383,4 +390,33 @@ class MvsHttpApi {
         params.sign = this.SignPoint(params, ["gameID", "userID", "key"]);
         this.http_get(MvsHttpApi.url_Join(this.open_host, this.hash_get) + params, callback);
     }
+
+    public reportScore(args, callback){
+        let data = {
+            userID:args.userID,
+            gameID:this.gameID,
+            sign:"",
+            items:[
+                {fieldName:"score", value:args.value}
+            ],
+            mode:2,
+            seq:this.getCounter(),
+            ts:this.getTimeStamp()
+        };
+        data.sign = this.SignPoint(data, ["gameID","userID"]);
+        let userid = args.userID;
+        console.log("上报数据参数：", JSON.stringify(data));
+        this.http_put(MvsHttpApi.url_Join(this.open_host, this.rank_score) , data, callback);
+    }
+
+    public static TestReportScore(){
+        let test:MvsHttpApi = new MvsHttpApi();
+        test.reportScore({userID:123456, value:1000}, (res, err)=>{
+            if(err){
+                console.log("TestReportScore error ", err);
+                return; 
+            }
+            console.log("TestReportScore success ", res);
+        });
+    }
 }
\ No newline at end of file

From 84221c790e0b039f543cad26d530d863ec55519f Mon Sep 17 00:00:00 2001
From: geliang <geliang0120@gmail.com>
Date: Wed, 5 Jun 2019 15:08:09 +0800
Subject: [PATCH 2/4] bug fix

---
 client/manifest.json                          |  48 +++-
 client/resource/scene/Game.exml               |   2 +-
 client/resource/scene/Login.exml              |  68 +----
 client/resource/scene/MatchDialog.exml        |   2 +-
 client/src/SceneManager.ts                    |  97 -------
 client/src/efinal/App.ts                      |  22 ++
 client/src/efinal/ArrayUtil.ts                |   5 +
 client/src/efinal/BaseScene.ts                | 109 ++++++++
 client/src/efinal/BgAutoScorller.ts           |  28 ++
 client/src/efinal/BilingBiling.ts             |  16 ++
 client/src/efinal/ByteUtils.ts                |  49 ++++
 client/src/efinal/ColliderCheckUtil.ts        |  36 +++
 client/src/efinal/Delay.ts                    |   5 +
 client/src/efinal/DisplayObjectPool.ts        |  49 ++++
 client/src/efinal/FileLoader.ts               |  36 +++
 client/src/efinal/GameData.ts                 |  10 +
 client/src/efinal/Handler.ts                  |  75 +++++
 client/src/efinal/ImageLoader.ts              |  76 +++++
 client/src/efinal/LinkList.ts                 |  94 +++++++
 client/src/efinal/ListViewImageItem.ts        |  38 +++
 client/src/efinal/ListViewUtil.ts             |  43 +++
 client/src/efinal/Loading.ts                  |  96 +++++++
 client/src/efinal/MathUtils.ts                |  30 ++
 client/src/efinal/Music.ts                    |  29 ++
 client/src/efinal/NetStateBar.ts              |  13 +
 client/src/efinal/ResourceUtils.ts            |  30 ++
 client/src/efinal/SceneManager.ts             | 119 ++++++++
 client/src/efinal/ShaderUtils.ts              | 261 ++++++++++++++++++
 client/src/efinal/SoundBase.ts                | 149 ++++++++++
 client/src/efinal/Tips.ts                     |  29 ++
 client/src/{utils => efinal}/Toast.ts         |  31 ++-
 client/src/efinal/UI.ts                       |  29 ++
 client/src/efinal/ui/Dialog.ts                |  49 ++++
 client/src/efinal/util/AnimaUtil.ts           |  34 +++
 client/src/efinal/util/JSUtil.ts              |  11 +
 client/src/efinal/util/UriUtil.ts             |  16 ++
 client/src/logic/battle/BattleStageControl.ts |   4 +-
 client/src/logic/network/NetworkStateCheck.ts |   4 +-
 client/src/scene/BattleStageUI.ts             |   4 +-
 client/src/scene/DialogPage.ts                |  23 ++
 client/src/scene/Game.ts                      |   3 +-
 client/src/scene/Login.ts                     |   3 +-
 client/src/scene/RankList.ts                  |   2 +-
 client/src/scene/Result.ts                    |   2 +-
 client/src/scene/Room.ts                      |   8 +-
 client/src/scene/TopHeader.ts                 |   2 +-
 client/src/utils/MatchDialog.ts               | 197 ++++++-------
 47 files changed, 1786 insertions(+), 300 deletions(-)
 delete mode 100644 client/src/SceneManager.ts
 create mode 100644 client/src/efinal/App.ts
 create mode 100644 client/src/efinal/ArrayUtil.ts
 create mode 100644 client/src/efinal/BaseScene.ts
 create mode 100644 client/src/efinal/BgAutoScorller.ts
 create mode 100644 client/src/efinal/BilingBiling.ts
 create mode 100644 client/src/efinal/ByteUtils.ts
 create mode 100644 client/src/efinal/ColliderCheckUtil.ts
 create mode 100644 client/src/efinal/Delay.ts
 create mode 100644 client/src/efinal/DisplayObjectPool.ts
 create mode 100644 client/src/efinal/FileLoader.ts
 create mode 100644 client/src/efinal/GameData.ts
 create mode 100644 client/src/efinal/Handler.ts
 create mode 100644 client/src/efinal/ImageLoader.ts
 create mode 100644 client/src/efinal/LinkList.ts
 create mode 100644 client/src/efinal/ListViewImageItem.ts
 create mode 100644 client/src/efinal/ListViewUtil.ts
 create mode 100644 client/src/efinal/Loading.ts
 create mode 100644 client/src/efinal/MathUtils.ts
 create mode 100644 client/src/efinal/Music.ts
 create mode 100644 client/src/efinal/NetStateBar.ts
 create mode 100644 client/src/efinal/ResourceUtils.ts
 create mode 100644 client/src/efinal/SceneManager.ts
 create mode 100644 client/src/efinal/ShaderUtils.ts
 create mode 100644 client/src/efinal/SoundBase.ts
 create mode 100644 client/src/efinal/Tips.ts
 rename client/src/{utils => efinal}/Toast.ts (77%)
 create mode 100644 client/src/efinal/UI.ts
 create mode 100644 client/src/efinal/ui/Dialog.ts
 create mode 100644 client/src/efinal/util/AnimaUtil.ts
 create mode 100644 client/src/efinal/util/JSUtil.ts
 create mode 100644 client/src/efinal/util/UriUtil.ts
 create mode 100644 client/src/scene/DialogPage.ts

diff --git a/client/manifest.json b/client/manifest.json
index 8c8520f..7f05b16 100644
--- a/client/manifest.json
+++ b/client/manifest.json
@@ -13,15 +13,45 @@
 		"libs/modules/wxshare/wxshare.js"
 	],
 	"game": [
+		"bin-debug/efinal/BaseScene.js",
+		"bin-debug/efinal/MathUtils.js",
 		"bin-debug/logic/GUser.js",
 		"bin-debug/logic/network/Resolver/IResolver.js",
-		"bin-debug/logic/network/BattleEvent.js",
-		"bin-debug/Main.js",
-		"bin-debug/Platform.js",
-		"bin-debug/SceneManager.js",
+		"bin-debug/logic/battle/HouseRunning.js",
 		"bin-debug/ThemeAdapter.js",
-		"bin-debug/logic/GlobalData.js",
+		"bin-debug/efinal/App.js",
+		"bin-debug/efinal/ArrayUtil.js",
 		"bin-debug/AssetAdapter.js",
+		"bin-debug/efinal/BgAutoScorller.js",
+		"bin-debug/efinal/BilingBiling.js",
+		"bin-debug/efinal/ByteUtils.js",
+		"bin-debug/efinal/ColliderCheckUtil.js",
+		"bin-debug/efinal/Delay.js",
+		"bin-debug/efinal/DisplayObjectPool.js",
+		"bin-debug/efinal/FileLoader.js",
+		"bin-debug/efinal/GameData.js",
+		"bin-debug/efinal/Handler.js",
+		"bin-debug/efinal/ImageLoader.js",
+		"bin-debug/efinal/LinkList.js",
+		"bin-debug/efinal/ListViewImageItem.js",
+		"bin-debug/efinal/ListViewUtil.js",
+		"bin-debug/efinal/Loading.js",
+		"bin-debug/LoadingUI.js",
+		"bin-debug/efinal/Music.js",
+		"bin-debug/efinal/NetStateBar.js",
+		"bin-debug/efinal/ResourceUtils.js",
+		"bin-debug/efinal/SceneManager.js",
+		"bin-debug/efinal/ShaderUtils.js",
+		"bin-debug/efinal/SoundBase.js",
+		"bin-debug/efinal/Tips.js",
+		"bin-debug/efinal/Toast.js",
+		"bin-debug/efinal/UI.js",
+		"bin-debug/efinal/ui/Dialog.js",
+		"bin-debug/efinal/util/AnimaUtil.js",
+		"bin-debug/efinal/util/JSUtil.js",
+		"bin-debug/efinal/util/UriUtil.js",
+		"bin-debug/logic/GlobalData.js",
+		"bin-debug/Main.js",
 		"bin-debug/logic/battle/BattleBtnControl.js",
 		"bin-debug/logic/battle/BattleBtnUI.js",
 		"bin-debug/logic/battle/BattleStageControl.js",
@@ -29,7 +59,7 @@
 		"bin-debug/logic/battle/CardUI.js",
 		"bin-debug/logic/battle/ChatMsgControl.js",
 		"bin-debug/logic/battle/CircleLoading.js",
-		"bin-debug/logic/battle/HouseRunning.js",
+		"bin-debug/Config.js",
 		"bin-debug/logic/battle/MandPool.js",
 		"bin-debug/logic/battle/MyCardControl.js",
 		"bin-debug/logic/battle/Player.js",
@@ -44,7 +74,7 @@
 		"bin-debug/logic/game/Prompt.js",
 		"bin-debug/logic/game/Prompt2.js",
 		"bin-debug/logic/game/SendCard.js",
-		"bin-debug/Config.js",
+		"bin-debug/logic/network/BattleEvent.js",
 		"bin-debug/logic/network/BattleMessage.js",
 		"bin-debug/logic/network/BattleMsgEvent.js",
 		"bin-debug/logic/network/NetworkStateCheck.js",
@@ -52,7 +82,7 @@
 		"bin-debug/logic/network/Resolver/DefaultResolver.js",
 		"bin-debug/logic/network/Resolver/GameOverResolver.js",
 		"bin-debug/logic/network/Resolver/GameReadyResolver.js",
-		"bin-debug/LoadingUI.js",
+		"bin-debug/Platform.js",
 		"bin-debug/logic/network/Resolver/PlayCards.js",
 		"bin-debug/matchvs/MatchvsData.js",
 		"bin-debug/matchvs/MatchvsMessage.js",
@@ -61,6 +91,7 @@
 		"bin-debug/matchvs/PokeMatchvsRep.js",
 		"bin-debug/scene/Base.js",
 		"bin-debug/scene/BattleStageUI.js",
+		"bin-debug/scene/DialogPage.js",
 		"bin-debug/scene/ErrorNote.js",
 		"bin-debug/scene/Game.js",
 		"bin-debug/scene/Login.js",
@@ -74,7 +105,6 @@
 		"bin-debug/utils/IntegralSettlement.js",
 		"bin-debug/utils/MatchDialog.js",
 		"bin-debug/utils/MD5.js",
-		"bin-debug/utils/Toast.js",
 		"bin-debug/utils/WxUtils.js"
 	]
 }
\ No newline at end of file
diff --git a/client/resource/scene/Game.exml b/client/resource/scene/Game.exml
index 308db92..1c2beeb 100644
--- a/client/resource/scene/Game.exml
+++ b/client/resource/scene/Game.exml
@@ -23,7 +23,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="inviteFriends" label="" x="148" y="911" width="344" height="98">
+	<e:Button id="inviteFriends" label="" x="148" y="911" width="344" height="98" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="resource/assets/lobby/btn_invite_friends.png"/>
diff --git a/client/resource/scene/Login.exml b/client/resource/scene/Login.exml
index d6d9f52..f60c0f7 100644
--- a/client/resource/scene/Login.exml
+++ b/client/resource/scene/Login.exml
@@ -1,73 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="skins.AnimationSkin" width="640" height="1136" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing" xmlns:tween="egret.tween.*" >
-	<w:Declarations>
-		<tween:TweenGroup id="bgAnim">
-			<tween:TweenItem target="{bg}">
-				<tween:To duration="500" ease="sineIn">
-					<tween:props>
-						<e:Object alpha="{0}"/>
-					</tween:props>
-				</tween:To>
-				<tween:To duration="500" ease="sineOut">
-					<tween:props>
-						<e:Object alpha="{1}"/>
-					</tween:props>
-				</tween:To>
-			</tween:TweenItem>
-		</tween:TweenGroup>
-		<tween:TweenGroup id="btnAnim">
-			<tween:TweenItem target="{hero}">
-				<tween:To duration="250">
-					<tween:props>
-						<e:Object y="{1023}" alpha="{0.5}"/>
-					</tween:props>
-				</tween:To>
-				<tween:To duration="250">
-					<tween:props>
-						<e:Object alpha="{1}" y="{1160.79}"/>
-					</tween:props>
-				</tween:To>
-			</tween:TweenItem>
-			<tween:TweenItem target="{about}">
-				<tween:To duration="500">
-				<tween:props>
-					<e:Object y="{1023}" alpha="{0.5}"/>
-				</tween:props>
-				</tween:To>
-				<tween:To duration="500">
-				<tween:props>
-					<e:Object alpha="{1}" y="{1160.79}"/>
-				</tween:props>
-				</tween:To>
-			</tween:TweenItem>
-			<tween:TweenItem target="{player}">
-				<tween:To duration="750">
-				<tween:props>
-					<e:Object y="{1023}" alpha="{0.5}"/>
-				</tween:props>
-				</tween:To>
-				<tween:To duration="500">
-				<tween:props>
-					<e:Object alpha="{1}" y="{1160.79}"/>
-				</tween:props>
-				</tween:To>
-			</tween:TweenItem>
-			<tween:TweenItem target="{thing}">
-				<tween:To duration="800">
-				<tween:props>
-					<e:Object y="{1023}" alpha="{0.5}"/>
-				</tween:props>
-				</tween:To>
-				<tween:To duration="700">
-				<tween:props>
-					<e:Object alpha="{1}" y="{1160.79}"/>
-				</tween:props>
-				</tween:To>
-			</tween:TweenItem>
-		</tween:TweenGroup>
-	</w:Declarations>
 	<w:Config id="1630b19fbde" ></w:Config>
-	<e:Image id="bg" left="0" right="0" top="0" bottom="0" source="resource/assets/bg.jpg" width="640" height="1136"/>
+	<e:Image id="bg" width="100%" height="1136" fillMode="clip" source="bg_jpg" anchorOffsetY="0" x="0" y="0"/>
 	<e:Image id="logo" width="238" height="354" x="207" y="200" source="resource/assets/login/logo.png"/>
 	<e:Button id="btn_login" label="" x="148" y="849" width="344" height="99">
 		<e:skinName>
diff --git a/client/resource/scene/MatchDialog.exml b/client/resource/scene/MatchDialog.exml
index 0094a87..7b31b06 100644
--- a/client/resource/scene/MatchDialog.exml
+++ b/client/resource/scene/MatchDialog.exml
@@ -7,7 +7,7 @@
 	<e:Image height="420" x="110" y="358" source="resource/assets/lobby/bg_match_popup.png"/>
 	<e:Label text="匹配中..." x="243" y="403" textColor="0x333333" fontFamily="FZY4JW--GB1-0" size="38" textAlign="center" width="154" height="40" bold="true"/>
 	<e:Image id="cancel_match" width="230" height="78" x="205" y="661" source="resource/assets/lobby/btn_cancel.png"/>
-	<e:Group width="78" height="45" horizontalCenter="-11" verticalCenter="-9.5">
+	<e:Group width="78" height="45" x="270" y="536">
 
 
 		<e:Image id="time_units" width="26" height="45" scaleX="1" scaleY="1"  right="0"/>
diff --git a/client/src/SceneManager.ts b/client/src/SceneManager.ts
deleted file mode 100644
index a5e52ce..0000000
--- a/client/src/SceneManager.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-class SceneManager {
-    public static currentScene: egret.DisplayObjectContainer;
-    public static root: egret.DisplayObjectContainer;
-    public static isAnimation: boolean = false;
-    public static sceneStack: egret.DisplayObjectContainer[] = [];
-    public static init(root: egret.DisplayObjectContainer) {
-        this.root = root;
-    }
-    public static showScene(scene: any, par?): egret.DisplayObject {
-        if (!this.root) { console.error("SceneManager not be init()"); return; }
-        if (!scene) { console.error("scene is null"); return; }
-        //hide top
-        if (this.root.numChildren > 0) {
-            var top: any = this.root.getChildAt(this.root.numChildren - 1);
-            top.onHide && top.onHide();
-        }
-
-        //new  a scene
-        scene = new scene(par);
-        scene.name = scene.constructor.name
-        scene.onShow && scene.onShow(par);
-        //show currentScene
-        this.root.addChild(scene);
-
-        if (SceneManager.isAnimation) {
-            scene.x = 480;
-            egret.Tween.get(scene, { loop: false }).to({ x: 0, y: 0 }, 300, egret.Ease.circInOut);
-        }
-        // }
-        console.log("[SceneManager] show  scene:" + scene.constructor.name + "@" + scene.hashCode);
-    }
-
-    public static back(): boolean {
-        if (this.root.numChildren > 0) {
-            var perScene: any = this.root.getChildAt(this.root.numChildren - 1);
-            if (perScene) {
-                perScene.onHide && perScene.onHide();
-                if (!SceneManager.isAnimation) {
-                    if (this.root.numChildren > 1) {
-                        var top: any = this.root.getChildAt(this.root.numChildren - 2);
-                        console.log("[SceneManager]  Back,  from scene:" + perScene.constructor.name + "@" + perScene.hashCode+" to "+top.constructor.name+"@"+top.hashCode);
-                        top.onShow && top.onShow();
-
-                        
-                    }
-                    this.root.removeChild(perScene);
-                } else {
-                    perScene.x = 0;
-                    egret.Tween.get(perScene, { loop: false }).to({ x: 800, y: 0 }, 600, egret.Ease.quadIn).call(function () {
-                        perScene.x = 0;
-                        this.root.removeChild(perScene);
-                    }.bind(this));
-                    //show top
-                    if (this.root.numChildren > 1) {
-                        var top: any = this.root.getChildAt(this.root.numChildren - 2);
-                        top.onShow && top.onShow();
-                        top.x = -480;
-                        egret.Tween.get(top, { loop: false }).to({ x: 0, y: 0 }, 400, egret.Ease.backIn);
-                    }
-                }
-                
-                return true;
-            } else {
-                console.warn('[WARN] preScene is undefine');
-                return false;
-            }
-        } else {
-            console.warn("[SceneManager] Do`t Back!");
-            return false;
-        }
-    }
-
-    public static JumpResultUI(p3,p1,p2,iswin,islandwin,timestr , roomid:string){
-        SceneManager.root.removeChildren();
-        let re = new ResultUI();
-        SceneManager.root.addChild(re);
-        if(p1.isLandLord){
-			re.showResult(p1,p2,p3,iswin,islandwin,timestr,roomid);
-		}else if(p2.isLandLord){
-			re.showResult(p2,p1,p3,iswin,islandwin,timestr,roomid);
-		}else if(p3.isLandLord){
-			re.showResult(p3,p1,p2,iswin,islandwin,timestr,roomid);
-		}
-        
-    }
-
-    public static ErrorPage(msg:string, callFun:Function, obj:any){
-        SceneManager.root.removeChildren();
-        let errpage:ErrorNote = new ErrorNote();
-        errpage.SetErrorMsg(msg, callFun);
-        SceneManager.root.addChild(errpage);
-    }
-}
-   
-
-
-
diff --git a/client/src/efinal/App.ts b/client/src/efinal/App.ts
new file mode 100644
index 0000000..ca4ddda
--- /dev/null
+++ b/client/src/efinal/App.ts
@@ -0,0 +1,22 @@
+class App {
+	public static W: number = 1270;
+	public static H: number = 720;
+	public static IS_DEGUG: boolean = true;
+	public constructor() {
+	}
+
+	public static init(container: egret.DisplayObjectContainer): void {
+		Toast.initRes(container, "resource/efinal/loading/toast-bg.png");
+		var rootView = new egret.Sprite();
+		rootView.width = container.stage.stageWidth;
+		rootView.height = container.stage.stageHeight;
+		App.W = container.stage.stageWidth;
+		App.H = container.stage.stageHeight;
+		rootView.x = 0;
+		rootView.y = 0;
+		container.addChild(rootView);
+		SceneManager.init(rootView);
+		App.IS_DEGUG&&UI.buildEgretLogger(container);
+
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/ArrayUtil.ts b/client/src/efinal/ArrayUtil.ts
new file mode 100644
index 0000000..aaa2097
--- /dev/null
+++ b/client/src/efinal/ArrayUtil.ts
@@ -0,0 +1,5 @@
+class ArrayUtil {
+    public static clear(arr: Array<any>) {
+        arr && (arr.length = 0);
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/BaseScene.ts b/client/src/efinal/BaseScene.ts
new file mode 100644
index 0000000..34013ce
--- /dev/null
+++ b/client/src/efinal/BaseScene.ts
@@ -0,0 +1,109 @@
+class BaseScene extends eui.Component implements eui.UIComponent {
+    private root: any = this;
+    private receiverMap: Object = {};
+    public constructor() {
+        super();
+        this.root = this;
+        // console.log('[BaseScene] constructor');
+        this.width = App.W;
+        this.height = App.H;
+    }
+    public menuAnimation: egret.tween.TweenGroup;
+    // private hashMap = {};
+    protected partAdded(partName: string, instance: any): void {
+        super.partAdded(partName, instance);
+        instance.name = partName;
+        // if (partName !== "") {
+        //     this.hashMap[partName] = instance;
+        // }
+        if (partName === "" || (instance.touchEnabled === false)) {
+            // console.log("[BaseScene] [W] [Touch Unable]: " + partName);
+        } else {
+            instance.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.TouchEvent) {
+                // Toast.show("[BaseScene]  click:" + partName);
+                return this.onClick(partName, instance);
+            }, this);
+        }
+    }
+    protected childrenCreated(): void {
+        super.childrenCreated();
+        console.debug("[BaseScene] childrenCreated");
+    }
+    public onShow(par?: any) {
+        console.debug("[BaseScene] [onShow]: ", this.name, ",par:", par);
+    }
+    public onHide() {
+        console.debug("[BaseScene] [onHide]", this.name);
+        for(var key in this.receiverMap){
+            this.unReceive(key);
+        }
+    }
+
+    public onCreated(): void {
+        console.debug("[BaseScene] [onCreated] ", this.name);
+    }
+
+
+    public onDestory(): void {
+        console.debug("[BaseScene] [onDestory] ", this.name);
+    }
+
+    public finish() {
+        console.debug('[BaseScene] [finish] ', this.name);
+        SceneManager.back();
+    }
+
+    /**
+     * 注册一个自动释放(depend @super.onHide())的消息接受者
+     */
+    protected receive(key: string, callback: Function) {
+        Handler.getInstance().receive(key, callback);
+        this.receiverMap[key] = callback;
+    }
+    protected unReceive(key: string, callback?: Function) {
+        Handler.getInstance().unReceive(key, callback);
+    }
+    public findChild(name: string): egret.DisplayObject {
+        var view = this.findChildFrom(this.root, name);
+        if (!view) {
+            console.warn('[WARN] Not Found the view:' + name);
+        }
+        return view;
+        // return this.hashMap[name];
+    }
+    private findChildFrom(parent: egret.DisplayObjectContainer, name: string): egret.DisplayObject {
+        // console.log("findChildFrom " + parent.name);
+
+        for (var i = 0; i < parent.numChildren; i++) {
+            var child = parent.getChildAt(i);
+            // console.log("childname:" + child.name);
+            if (name === child.name) {
+                return child;
+            } else {
+                if (child instanceof egret.DisplayObjectContainer) {
+                    var p1 = <egret.DisplayObjectContainer>child;
+                    var r = this.findChildFrom(p1, name);
+                    if (r) {
+                        return r;
+                    } else {
+                        continue;
+                    }
+                } else {
+                    continue;
+                }
+            }
+
+        }
+        return null;
+    }
+    public onClick(name: string, v: egret.DisplayObject) {
+        switch (name) {
+            case "back":
+                this.finish();
+                break;
+            default:
+                console.log("[BaseScene] No Handler for  click " + name);
+                break;
+        }
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/BgAutoScorller.ts b/client/src/efinal/BgAutoScorller.ts
new file mode 100644
index 0000000..02438c8
--- /dev/null
+++ b/client/src/efinal/BgAutoScorller.ts
@@ -0,0 +1,28 @@
+class BgAutoScorller  {
+    constructor(v1, v2,speed) {
+        this.bg1 = v1;
+        this.bg2 = v2;
+        this.speed = speed;
+    }
+    private bg1: egret.DisplayObject;
+    private bg2: egret.DisplayObject;
+    private bg1Height: number = 0;
+    private bg2Height: number = 0;
+    private speed: number = 0;
+    public update(): void {
+        if (this.bg1.y >= 0) {
+            this.bg1.y = -this.bg1.height;
+        }
+        if (this.bg2.y >= this.bg2.height) {
+            this.bg2.y = 0;
+        }
+
+        this.bg1.y += this.speed;
+        this.bg2.y += this.speed;
+    }
+
+    public dispose(): void {
+        this.bg1 = null;
+        this.bg2 = null;
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/BilingBiling.ts b/client/src/efinal/BilingBiling.ts
new file mode 100644
index 0000000..a01c21c
--- /dev/null
+++ b/client/src/efinal/BilingBiling.ts
@@ -0,0 +1,16 @@
+/**
+ * 闪速效果
+ */
+class BilingBiling {
+	public static biling(view, time: number, loopCount: number) {
+		if (loopCount > 0) {
+			view.alpha = 0.1;
+			egret.Tween.get(view).to({ alpha: 1.0, loop: false }, time, egret.Ease.elasticInOut).call(
+				function () {
+					this.biling(view, time, --loopCount);
+				}.bind(this)
+			).play();
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/ByteUtils.ts b/client/src/efinal/ByteUtils.ts
new file mode 100644
index 0000000..77af0b1
--- /dev/null
+++ b/client/src/efinal/ByteUtils.ts
@@ -0,0 +1,49 @@
+function stringToUtf8ByteArray(a) {
+    if(!(a&&(typeof a === "string"))){
+        return new Uint8Array(0);
+    }
+    for (var b = [], c = 0, d = 0; d < a.length; d++) {
+        var e = a.charCodeAt(d);
+        128 > e ? b[c++] = e : (2048 > e ? b[c++] = e >> 6 | 192 : (55296 == (e & 64512) && d + 1 < a.length && 56320 == (a.charCodeAt(d + 1) & 64512) ? (e = 65536 + ((e & 1023) << 10) + (a.charCodeAt(++d) & 1023), b[c++] = e >> 18 | 240, b[c++] = e >> 12 & 63 | 128) : b[c++] = e >> 12 | 224, b[c++] = e >> 6 & 63 | 128), b[c++] = e & 63 | 128)
+    }
+    var buf = new Uint8Array(b.length);
+    for (var i = 0; i < buf.length; i++) {
+        buf[i] = b[i];
+
+    }
+    return buf;
+}
+function utf8ByteArrayToString (a) {
+    for (var b = [], c = 0, d = 0; c < a.length;) {
+        var e = a[c++];
+        if (128 > e) b[d++] = String.fromCharCode(e); else if (191 < e && 224 > e) {
+            var f = a[c++];
+            b[d++] = String.fromCharCode((e & 31) << 6 | f & 63)
+        } else if (239 < e && 365 > e) {
+            var f = a[c++], g = a[c++], h = a[c++],e:any = ((e & 7) << 18 | (f & 63) << 12 | (g & 63) << 6 | h & 63) - 65536;
+            b[d++] = String.fromCharCode(55296 + (e >> 10));
+            b[d++] = String.fromCharCode(56320 + (e & 1023))
+        } else f = a[c++], g = a[c++], b[d++] = String.fromCharCode((e & 15) << 12 | (f & 63) << 6 | g & 63)
+    }
+    return b.join("")
+}
+function str2u8array(str) {
+    if(str==undefined||(typeof str !== "string")){
+        return str;
+    }
+    var out = new Uint8Array(str.length*2);
+    for(var i =0;i<str.length;i++){
+        out[i*2] = str.charCodeAt(i)>>8;
+        out[i*2+1] = str.charCodeAt(i);
+    }
+    return out;
+}
+function u8array2str(u8array) {
+    var buf = new Uint16Array(u8array.length/2);
+    for(var i =0;i<buf.length;i++){
+        buf[i] = u8array[i*2]<<8|u8array[i*2+1];
+
+    }
+    return String.fromCharCode.apply(null, buf);
+
+}
diff --git a/client/src/efinal/ColliderCheckUtil.ts b/client/src/efinal/ColliderCheckUtil.ts
new file mode 100644
index 0000000..e82eb1a
--- /dev/null
+++ b/client/src/efinal/ColliderCheckUtil.ts
@@ -0,0 +1,36 @@
+class ColliderCheckUtil {
+	/**
+	 * 检查两个物体重叠的百分比
+	 * @return 0.0 ~ 1.0
+	 */
+	// public static checkPercentage(src: egret.DisplayObject, dst: egret.DisplayObject): Number {
+	// 	var srcSize = src.width*src.height;
+	// 	if(dst.x<src.x){
+	// 		if((dst.x+dst.width)>src.x){
+	// 			return (dst.x+dst.width-src.x)*
+	// 		}
+	// 	}
+	// 	// ||dst.x>src.x+src.width
+	// 	return 0;
+	// }
+	/**
+	 * 检查两个物体在Y轴重叠的百分比
+	 * @return 0.0 ~ 1.0
+	 */
+	public static checkPercentage(src: egret.DisplayObject, dst: egret.DisplayObject): number {
+		if (src.x >= dst.x && src.x < (dst.x + dst.width)) {
+			//src进入dst一半 至  src被dst完全包含
+			if ((src.y + src.height) >= dst.y && src.y <= (dst.y + dst.height)) {
+				if (src.y < dst.y) {
+					return (src.y + src.height - dst.y) / src.height;
+				} else if ((src.y + src.height) >= (dst.y + dst.height)) {
+					return (dst.y + dst.height - src.y) / src.height;
+				} else {
+					return 1.0;
+				}
+			}
+		}
+		return 0;
+	}
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/Delay.ts b/client/src/efinal/Delay.ts
new file mode 100644
index 0000000..7091054
--- /dev/null
+++ b/client/src/efinal/Delay.ts
@@ -0,0 +1,5 @@
+class Delay{
+    public static run(func:any,time){
+        setTimeout(func,time);
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/DisplayObjectPool.ts b/client/src/efinal/DisplayObjectPool.ts
new file mode 100644
index 0000000..d0e205e
--- /dev/null
+++ b/client/src/efinal/DisplayObjectPool.ts
@@ -0,0 +1,49 @@
+class DisplayObjectPool {
+	public constructor() {
+	}
+	private pool: Array<any> = [];
+	public get(creater: Function):any {
+		for (var i = 0; i < this.pool.length; i++) {
+			if (this.pool[i].state === 0) {
+				var o = creater(this.pool[i]);
+				return o;
+			}
+		}
+
+		var ne = creater();
+		this.pool.unshift(ne);
+		return ne;
+	}
+	public getAll(): Array<any> {
+		return this.pool;
+	}
+	public destory(o, destoryer: Function) {
+		if (o == null) {
+			console.warn("[WARN] NullPointException: Can`t destory null ");
+			return;
+		}
+		for (var i = 0; i < this.pool.length; i++) {
+			if (this.pool[i] === o) {
+				destoryer(this.pool[i]);
+				this.pool[i].state = 0;
+				return true;
+			}
+		}
+		console.warn("[WARN] Not found the object from pool:" + JSON.stringify(o));
+		return false;
+	}
+	public destoryAll(destoryer: Function) {
+		for (var i = 0; i < this.pool.length; i++) {
+			this.pool[i].visible = false;
+			destoryer(this.pool[i]);
+		}
+		this.pool = [];
+	}
+	public getItemByName(name: string): any {
+		for (var i = 0; i < this.pool.length; i++) {
+			if (this.pool[i].name === name) {
+				return this.pool[i];
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/FileLoader.ts b/client/src/efinal/FileLoader.ts
new file mode 100644
index 0000000..c547540
--- /dev/null
+++ b/client/src/efinal/FileLoader.ts
@@ -0,0 +1,36 @@
+class FileLoader {
+
+	public constructor() {
+	}
+	/**
+	 * 下载文件资源
+	 * @param uri ex:"resource/map/desert.tmx"
+	 * @param callback ex:callback(data:String)
+	 */
+	public static load(uri: string, callback: Function) {
+
+		var urlLoader: egret.URLLoader = new egret.URLLoader();
+		urlLoader.dataFormat = egret.URLLoaderDataFormat.TEXT;
+		urlLoader.addEventListener(egret.Event.COMPLETE, function (event: egret.Event): void {
+			callback(event.target.data);
+		}, uri);
+		urlLoader.load(new egret.URLRequest(uri));
+	}
+	/**
+	 * 下载文件资源
+	 * @param uri ex:"resource/map/desert.tmx"
+	 * @param callback ex:callback(xml:egret.XML)
+	 */
+
+	public static loadXML(uri: string, callback: Function) {
+		var urlLoader: egret.URLLoader = new egret.URLLoader();
+		urlLoader.dataFormat = egret.URLLoaderDataFormat.TEXT;
+		var fc = function (event: egret.Event): void {
+			callback(egret.XML.parse(event.target.data));
+			urlLoader.removeEventListener(egret.Event.COMPLETE, fc, uri);
+		};
+		urlLoader.addEventListener(egret.Event.COMPLETE, fc, uri);
+		urlLoader.load(new egret.URLRequest(uri));
+	}
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/GameData.ts b/client/src/efinal/GameData.ts
new file mode 100644
index 0000000..2a51b0d
--- /dev/null
+++ b/client/src/efinal/GameData.ts
@@ -0,0 +1,10 @@
+// TypeScript file
+class GameData {
+    static env: string = "fluttergo";
+    static userID: number = MathUtils.random(100000000);
+    static userName:string = GameData.userID+"";
+    static MAX_ROOM_USER_COUNT: number = 10;
+    static FPS: number = 5;
+    static token: string = "xxx"
+    static gameID: number = 0;
+}
\ No newline at end of file
diff --git a/client/src/efinal/Handler.ts b/client/src/efinal/Handler.ts
new file mode 100644
index 0000000..8f4c24d
--- /dev/null
+++ b/client/src/efinal/Handler.ts
@@ -0,0 +1,75 @@
+class Handler {
+
+	private listenerMap: Object = {};
+	private eventCacheQueue = [];
+	private static instance = new Handler();
+	public static getInstance(): Handler {
+		return Handler.instance;
+	}
+	private callback(cb, data) {
+		if (cb && cb.that) {
+			cb.call(cb.that, data);
+		} else {
+			cb && cb(data);
+		}
+	}
+	public receive(key: string, callback: Function) {
+		console.debug(`[Handler] reg receiver %s `, key)
+		if (!this.listenerMap[key]) {
+			this.listenerMap[key] = [];
+		}
+		this.listenerMap[key].push(callback);
+		for (var j = 0; j < this.eventCacheQueue.length; j++) {
+			var ekey = this.eventCacheQueue[j].key;
+			if (ekey == key) {
+				// console.debug("found cache : %s , len: %d", key, this.eventCacheQueue.length);
+				for (var i = 0; i < this.listenerMap[key].length; i++) {
+					var cb = this.listenerMap[key][i];
+					this.callback(cb, this.eventCacheQueue[j]);
+				}
+				this.eventCacheQueue.splice(j, 1);
+				// console.debug("destroy cache : %s , len: %d", key, this.eventCacheQueue.length);
+				j = 0;
+			}
+		}
+
+	}
+
+	public unReceive(key: string, callback?: Function) {
+		if (!this.listenerMap[key]) return;
+		if (callback) {
+			for (var i = 0; i < this.listenerMap[key].length; i++) {
+				if (this.listenerMap[key][i] == callback) {
+					console.debug(`[Handler] remove Receiver with a callbck %s `, key)
+					this.listenerMap[key].splice(i, 1)
+				}
+			}
+		} else {
+			console.debug(`[Handler] remove all Receiver at key: %s `, key)
+			delete this.listenerMap[key];
+		}
+
+	}
+	private pushCache(key: any, data?: any) {
+		console.debug("push cache: %s->%s", key, data);
+		this.eventCacheQueue.push({ key: key, data: data });
+	}
+
+	public dispatchEvent(key: any, data?: any) {
+		if (!this.listenerMap[key]) {
+			this.pushCache(key, data);
+			return
+		};
+		var isNeedCache = true;
+		for (var i = 0; i < this.listenerMap[key].length; i++) {
+			if (this.listenerMap[key][i]) {
+				console.debug(`dispatchEvent %s success`, key)
+				this.callback(this.listenerMap[key][i], { type: key, data: data });
+				isNeedCache = false;
+			}
+		}
+		if (isNeedCache) {
+			this.pushCache(key, data);
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/ImageLoader.ts b/client/src/efinal/ImageLoader.ts
new file mode 100644
index 0000000..6f9eb54
--- /dev/null
+++ b/client/src/efinal/ImageLoader.ts
@@ -0,0 +1,76 @@
+class ImageLoader {
+	public constructor() {
+	}
+	/**
+	 * 从缓存中加载图片,如果缓存中没有,则下载图片并放入缓存,再显示
+	 */
+	public static showAsync(image: egret.Bitmap, name: string, x?: number, y?: number, w?: number, h?: number) {
+		RES.getResAsync(name, function (result: egret.Texture) {
+			image.texture = result;
+			var index = name.indexOf("#");
+			if (index >= 0) {//读取子图,如果没有则创建再读取
+				var subkey = "";
+				subkey = name.substr(index + 1);
+				name = name.substr(0, index);
+				if (null == result['subTexture']) {
+					result['subTexture'] = new egret.SpriteSheet(result);
+
+				}
+				var spriteSheet: egret.SpriteSheet = result['subTexture'];
+				if (null == spriteSheet.getTexture(subkey)) {
+					spriteSheet.createTexture(subkey, x, y, w, h);
+				}
+				image.texture = spriteSheet.getTexture(subkey)
+			} else {
+				image.texture = result;
+			}
+
+		}, image);
+	}
+	/**
+	 * 从缓存中加载图片,如果缓存中没有,加载失败
+	 */
+	public static show(image: egret.Bitmap, name: string) {
+		image.texture = RES.getRes(name);
+	}
+	public static showAndCreate(container: egret.DisplayObjectContainer, name: string, x?: number, y?: number, isAlignBottom?: boolean) {
+		var texture = RES.getRes(name);
+
+		if (null == texture) {
+			console.warn("[WARN] Not be found image:'" + name + "'");
+			return;
+		}
+		var bitmap = new egret.Bitmap(texture);
+		bitmap.x = x;
+		// bitmap.y = y;
+		bitmap.y = isAlignBottom ? (y - texture.textureHeight + texture.textureWidth) : y;
+		bitmap.width = texture.textureWidth;
+		bitmap.height = texture.textureHeight;
+		// console.log('[INFO] showAndCreate image: ' + name +" bitmap.x:"+bitmap.x+","+bitmap.y +" size:"+bitmap.width+","+bitmap.height);
+		container.addChild(bitmap);
+		return bitmap;
+	}
+	/**
+	 * 加载远程服务器上的资源
+	 */
+	public static showAsyncByCrossUrl(image: egret.DisplayObjectContainer, url: string, x?: number, y?: number, w?: number, h?: number) {
+		// RES.getResByUrl(url:string,compFunc:Function,thisObject:any,type:string=””):void
+		var loader: egret.ImageLoader = new egret.ImageLoader()
+		loader.crossOrigin = "anonymous";
+		var callback = function (e: egret.Event) {
+			var bitmapData: egret.BitmapData = (<egret.ImageLoader>e.target).data;
+			var texture = new egret.Texture();
+			texture.bitmapData = bitmapData;
+			var bitmap = new egret.Bitmap(texture);
+			bitmap.x = x || 0;
+			bitmap.y = y || 0;
+			bitmap.width = w || texture.textureWidth;
+			bitmap.height = h || texture.textureWidth;
+			image.addChild(bitmap);
+		};
+		loader.once(egret.Event.COMPLETE, callback, this);
+		loader.load(url);
+	}
+
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/LinkList.ts b/client/src/efinal/LinkList.ts
new file mode 100644
index 0000000..6ce5fc7
--- /dev/null
+++ b/client/src/efinal/LinkList.ts
@@ -0,0 +1,94 @@
+class LinkList {
+		
+	 	// var Node = function (element) {　　　　　　　　//新元素构造
+        //     this.element = element;
+        //     this.next = null;
+        // };
+		
+        // var length = 0;
+        // var head = null;
+
+        // this.append = function (element) {
+        //     var node = new Node(element);　　　　　　　　//构造新的元素节点
+        //     var current;
+        //     if (head === null) {　　　　　　　　　　　　　//头节点为空时  当前结点作为头节点
+        //         head = node;
+        //     } else {
+        //         current = head;　　　　　　　　　　　　　　
+        //         while (current.next) {　　　　　　　　　　//遍历，直到节点的next为null时停止循环，当前节点为尾节点
+        //             current = current.next;
+        //         }
+        //         current.next = node;　　　　　　　　　　　　//将尾节点指向新的元素，新元素作为尾节点
+        //     }           
+        //     length++;　　　　　　　　　　　　　　　　　　　　//更新链表长度
+        // };
+        // this.removeAt = function (position) {
+        //     if (position > -1 && position < length) {
+        //         var current = head;
+        //         var index = 0;
+        //         var previous;
+        //         if (position == 0) {
+        //             head = current.next;
+        //         } else {
+        //             while (index++ < position) {
+        //                 previous = current;
+        //                 current = current.next;
+        //             }
+        //             previous.next = current.next;
+        //         }
+        //         length--;
+        //         return current.element;
+        //     } else {
+        //         return null;
+        //     }
+        // };
+        // this.insert = function (position, element) {
+        //     if (position > -1 && position <= length) {　　　　　　　　//校验边界
+        //         var node = new Node(element);　　　　　　　　
+        //         current = head;
+        //         var index = 0;
+        //         var previous;
+        //         if (position == 0) {　　　　　　　　　　　　　　　　　　　　//作为头节点，将新节点的next指向原有的头节点。
+        //             node.next = current;
+        //             head = node;　　　　　　　　　　　　　　　　　　　　　　　　//新节点赋值给头节点
+        //         } else {
+        //             while (index++ < position) {
+        //                 previous = current;
+        //                 current = current.next;
+        //             }　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　　//遍历结束得到当前position所在的current节点，和上一个节点
+        //             previous.next = node;　　　　　　　　　　　　　　　　　　　　//上一个节点的next指向新节点  新节点指向当前结点，可以参照上图来看
+        //             node.next = current;
+        //         }
+        //         length++;
+        //         return true;
+        //     } else {
+        //         return false;
+        //     }
+
+        // };
+        // this.toString = function () {
+        //     var current = head;
+        //     var string = '';
+        //     while (current) {
+        //         string += ',' + current.element;
+        //         current = current.next;
+        //     }
+        //     return string;
+        // };
+        // this.indexOf = function (element) {
+        //     var current = head;
+        //     var index = -1;
+        //     while (current) {
+        //         if (element === current.element) {　　　　　　　　　　　　//从头节点开始遍历
+        //             return index;
+        //         }
+        //         index++;
+        //         current = current.next;
+        //     }
+        //     return -1;
+        // };
+        // this.getLength = function () {
+        //     return length;
+        // }
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/ListViewImageItem.ts b/client/src/efinal/ListViewImageItem.ts
new file mode 100644
index 0000000..c33a789
--- /dev/null
+++ b/client/src/efinal/ListViewImageItem.ts
@@ -0,0 +1,38 @@
+class ListViewImageItem extends eui.ItemRenderer {
+	public constructor() {
+		super();
+		//自定义的 ItemRenderer
+		this.touchChildren = true;
+	}
+	protected labelDisplay: eui.Label;
+	protected partAdded(partName: string, instance: any): void {
+		super.partAdded(partName, instance);
+
+		instance.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.Event) {
+
+			instance.name = partName;
+			if (partName === "" || (instance.touchEnabled === false)) {
+			} else {
+				instance.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.TouchEvent) {
+					return this.onItemClick(partName, instance);
+				}, this);
+			}
+		}, this);
+		console.log('[INFO] partName' + partName);
+
+	}
+	protected childrenCreated(): void {
+		super.childrenCreated();
+		console.log('[INFO] childrenCreated');
+		this.selected = true;
+	}
+	protected dataChanged(): void {
+
+		// console.log('[List DataChanged] : ' + this.data);
+	}
+	protected onItemClick(viewName: string, view: any): void {
+		console.log('[List OnItemClick] : ' + this.itemIndex + " ->" + viewName);
+
+	}
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/ListViewUtil.ts b/client/src/efinal/ListViewUtil.ts
new file mode 100644
index 0000000..8398fa8
--- /dev/null
+++ b/client/src/efinal/ListViewUtil.ts
@@ -0,0 +1,43 @@
+class ListViewUtil {
+	/**
+	 * 初始化 List 
+	 * eg:
+	 * 		ListViewUtil.initListView(this.l_list,[1,23,4,5,1,23,1,1], (e: eui.ItemTapEvent) => {
+			Toast.show("on item click	" + e.itemIndex);
+		})
+	 */
+	public static initListView(conatiner:egret.DisplayObjectContainer,listview: eui.List, sourceArr: any[], onItemClick?:Function) {
+		//用ArrayCollection包装
+		var myCollection: eui.ArrayCollection = new eui.ArrayCollection(sourceArr);
+		listview.dataProvider = myCollection;
+		listview.useVirtualLayout = true;
+		listview.itemRenderer = ListViewImageItem;
+		//设置listview容器本身不可点击
+		listview.touchEnabled = false;
+		// //创建一个 Scroller
+		var scroller = new eui.Scroller();
+		scroller.height = listview.height;
+		scroller.width = listview.width;
+		scroller.viewport = listview;
+		scroller.x = listview.x;
+		scroller.y = listview.y
+		
+		scroller.name = "scroller";
+		conatiner.addChild(scroller);
+		onItemClick&&listview.addEventListener(eui.ItemTapEvent.ITEM_TAP, onItemClick, listview);
+	}
+	public static refreshData(listView: any, newDataList: Array<any>) {
+		(<eui.ArrayCollection>listView.dataProvider).source = newDataList;
+		(<eui.ArrayCollection>listView.dataProvider).refresh();
+	}
+	/**
+	 * 
+	 * ListViewUtil.setOnItemClick(this.l_list,(e: eui.ItemTapEvent) => {
+			Toast.show("on item click	" + e.itemIndex);
+		})
+	 * 
+	 */
+	public static setOnItemClick(listview: eui.List,onItemClick?:Function){
+		onItemClick&&listview.addEventListener(eui.ItemTapEvent.ITEM_TAP, onItemClick, listview);
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/Loading.ts b/client/src/efinal/Loading.ts
new file mode 100644
index 0000000..c5012ff
--- /dev/null
+++ b/client/src/efinal/Loading.ts
@@ -0,0 +1,96 @@
+class Loading extends egret.Sprite {
+    public constructor(w, h) {
+        super();
+        this.createView(w, h)
+    }
+    private textField: egret.TextField;
+    private context: egret.DisplayObjectContainer;
+
+    private textField_power: egret.TextField;
+
+
+    private uiContainer: egret.DisplayObjectContainer;
+
+    private logoUrl = "resource/assets/loading_logo.png";
+
+
+    private w: number;
+
+    private h: number;
+
+    private createView(w, h): void {
+        this.w = w;
+        this.h = h;
+
+        this.textField = new egret.TextField();
+        this.textField.y = 500;
+        this.textField.textColor = 0xCCCCCC;
+        this.textField.size = 46;
+        this.textField.width = this.w;
+        this.textField.height = 100;
+        this.textField.fontFamily = "Black";
+        this.textField.textAlign = "center";
+        this.textField.text = "加载中…";
+
+
+
+        this.textField_power = new egret.TextField();
+        this.textField_power.text = ".";
+        this.textField_power.textColor = 0xCCCCCC;
+        this.textField_power.size = 80;
+        this.textField_power.fontFamily = "White";
+        this.textField_power.textAlign = "center";
+        this.textField_power.x = this.w * 0.5;
+        this.textField_power.y = this.h * 0.8;
+        egret.Tween.get(this.textField_power, { loop: true })
+            .to({ rotation: 360 }, 800, egret.Ease.cubicIn).play();
+
+        var bg: egret.Shape = new egret.Shape();
+
+        bg.width = this.w;
+        bg.height = this.h;
+        bg.x = (this.w - bg.width) / 2;
+        bg.y = (this.h - bg.height) / 2;
+        bg.graphics.beginFill(0x333333, 0.8);
+        bg.graphics.drawRect(0, 0, this.w, this.h);
+        bg.graphics.endFill();
+        this.addChild(bg);
+
+
+        this.addChild(this.textField);
+
+        this.addChild(this.textField_power);
+        this.touchEnabled = true;
+        this.addEventListener(egret.TouchEvent.TOUCH_TAP, function () {
+            console.log("touch loading");
+        }, this);
+    }
+
+    public setProgress(current, total): void {
+        var num: number = Math.floor((current / total) * 100);
+        this.textField.text = "加载中…" + num + "%";
+    }
+    public static create(context: egret.DisplayObjectContainer): Loading {
+        var loading: any = new Loading(context.width, context.height);
+        loading.context = context;
+        return loading;
+    }
+    public isShow: boolean = false;
+    public show() {
+        if (this.isShow) {
+            console.log('[INFO]  loading hande be show');
+            return;
+        }
+        this.isShow = true;
+        this.context.addChild(this);
+    }
+    public close() {
+        if (!this.isShow) {
+            console.log('[INFO] loading is not  showoing');
+            return;
+        }
+        this.isShow = false;
+        this.context.removeChild(this);
+    }
+
+}
diff --git a/client/src/efinal/MathUtils.ts b/client/src/efinal/MathUtils.ts
new file mode 100644
index 0000000..72703a9
--- /dev/null
+++ b/client/src/efinal/MathUtils.ts
@@ -0,0 +1,30 @@
+
+// 微信上的适配
+// 其他端可以不用那么麻烦 showAll原有的尺寸正常缩放
+function FakeRandom(seed) {
+    this.next = function (range) {
+        range = range || 100;
+        var min = 0;
+        seed = (seed * 9301 + 49297) % 233280;
+        var rnd = seed / 233280.0;
+        return Math.floor(min + rnd * (range - min));
+    }
+}
+
+class MathUtils {
+    public static Random = new FakeRandom(new Date().getMilliseconds());
+    public static random(range?: number): number {
+        if (range < 0) {
+            range = 0;
+        }
+        return MathUtils.Random.next(range);
+    }
+
+    public static max(a: number, b: number) {
+
+        return a > b ? a : b;
+    }
+    public static min(a: number, b: number) {
+        return a < b ? a : b;
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/Music.ts b/client/src/efinal/Music.ts
new file mode 100644
index 0000000..c44a624
--- /dev/null
+++ b/client/src/efinal/Music.ts
@@ -0,0 +1,29 @@
+class Music {
+	// appear_mp3: "appear_mp3",
+	// bg_mp3: "bg_mp3",
+	// click_mp3: "click_mp3",
+	// die_mp3: "die_mp3",
+	// draw_mp3: "draw_mp3",
+	// explode_mp3: "explode_mp3",
+	// get_mp3: "get_mp3",
+	// lay_mp3: "lay_mp3",
+	// save_mp3: "save_mp3",
+	// start_mp3: " start_mp3",
+	// win_mp3: "win_mp3",
+	public static music = {
+	}
+	public static isMute = false;
+	public static play(name, isLoop: boolean = false): SoundBase {
+		if (Music.music[name] == null) {
+			Music.music[name] = new SoundBase(name);
+		}
+		if (isLoop == true) {
+			Music.music[name].setLoop(true);
+		}
+		Music.music[name].play();
+		return Music.music[name];
+	}
+	public static stop(name) {
+		Music.music[name].stop();
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/NetStateBar.ts b/client/src/efinal/NetStateBar.ts
new file mode 100644
index 0000000..a46599c
--- /dev/null
+++ b/client/src/efinal/NetStateBar.ts
@@ -0,0 +1,13 @@
+class NetStateBar extends BaseScene implements eui.UIComponent {
+	public static Connect: string = "connect";
+	public static Disconnect: string = "disconnect";
+	public static Slow: string = "slow";
+	public constructor() {
+		super();
+		console.log('[INFO] NetStateBar');
+	}
+	public state(state: string) {
+		this.currentState = state;
+	}
+
+}
\ No newline at end of file
diff --git a/client/src/efinal/ResourceUtils.ts b/client/src/efinal/ResourceUtils.ts
new file mode 100644
index 0000000..7ff1876
--- /dev/null
+++ b/client/src/efinal/ResourceUtils.ts
@@ -0,0 +1,30 @@
+class ResourceUtils {
+    /**
+     * 根据name关键字创建一个Bitmap对象。name属性请参考resources/resource.json配置文件的内容。
+     */
+    public static createBitmapByName(name:string):egret.Bitmap {
+        var result:egret.Bitmap = new egret.Bitmap();
+
+        // 小心, RES.getRes(name)要是找不到,并不会报错
+        var texture:egret.Texture = RES.getRes(name);
+        result.texture = texture;
+        return result;
+    }
+
+    /**
+     * 根据name关键字创建一个Bitmap对象。此name 是根据TexturePacker 组合成的一张位图
+     */
+    public static createBitmapFromSheet(name:string, sheetName:string = "gameRes"):egret.Bitmap {
+        var sheet:egret.SpriteSheet = RES.getRes(sheetName);
+        var texture:egret.Texture = sheet.getTexture(name);
+        var result:egret.Bitmap = new egret.Bitmap();
+        result.texture = texture;
+        return result;
+    }
+
+    public static getTextureFromSheet(name:string, sheetName:string = "gameRes"):egret.Texture {
+        var sheet:egret.SpriteSheet = RES.getRes(sheetName);
+        var result:egret.Texture = sheet.getTexture(name);
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/SceneManager.ts b/client/src/efinal/SceneManager.ts
new file mode 100644
index 0000000..c5dfcc2
--- /dev/null
+++ b/client/src/efinal/SceneManager.ts
@@ -0,0 +1,119 @@
+/**
+ * 以栈(LIFO - Last in, First out)的形式对ViewTree进行管理,默认带动画效果
+ */
+class SceneManager {
+    public static currentScene: egret.DisplayObjectContainer;
+    public static root: egret.DisplayObjectContainer;
+    public static animaLayer: egret.DisplayObjectContainer;
+    public static isAnimation: boolean = true;
+    public static AnimationTime: number = 300;
+
+    // ShaderUtils.shader(this.lobbyLayout, ShaderUtils.CustomFilter.customFilter3);
+
+    public static init(root: egret.DisplayObjectContainer) {
+        this.root = root;
+        this.animaLayer = new egret.DisplayObjectContainer();
+        root.parent.addChild(this.animaLayer);
+    }
+    /**
+     * @deprecated
+     */
+    public static showScene(scene: any, par?,isAnima?:boolean) {
+        SceneManager.go(scene, par,isAnima&&true);
+    }
+    /**
+     * 新建一个场景并显示,同时隐藏旧的场景
+     */
+    public static go(scene: any, par?,isAnima?:boolean): egret.DisplayObject {
+        if (!this.root) { console.error("SceneManager not be init()"); return; }
+        if (!scene) { console.error("scene is null"); return; }
+        //hide top
+        if (this.root.numChildren > 0) {
+            var top: BaseScene = <BaseScene>this.root.getChildAt(this.root.numChildren - 1);
+            top.onHide && top.onHide();
+
+            if (isAnima&&SceneManager.isAnimation) {
+                var x = top.x;
+                egret.Tween.get(top, { loop: false }).to({ x: this.root.width * -1, y: 0 }, SceneManager.AnimationTime, egret.Ease.quadOut).call(function () {
+                    top.x = x;
+                    top.visible = false;
+                }.bind(this));
+            } else {
+                top.visible = false;
+            }
+        }
+
+        //new  a scene
+        scene = new scene();
+        scene.name = scene.constructor.name
+        scene.addEventListener(egret.Event.COMPLETE, function () {
+            scene.onCreated();
+            scene.onShow && scene.onShow(par);
+        }, this);
+
+        this.root.addChild(scene);
+        if (isAnima&&SceneManager.isAnimation) {
+            scene.x = this.root.width;
+            egret.Tween.get(scene, { loop: false }).to({ x: 0, y: 0 }, SceneManager.AnimationTime, egret.Ease.circIn);
+        }
+        console.debug("[SceneManager] show  scene:" , scene.constructor.name , "@" , scene.hashCode);
+    }
+
+
+
+    /**
+     * 回退到某个页面
+     */
+    public static backToThePast(scece: any) {
+        while (this.root.numChildren > 0) {
+            var s: any = this.root.getChildAt(this.root.numChildren - 1);
+            console.debug('[INFO] backToThePast s.constructor.name:', s.constructor.name);
+            // console.debug('[INFO] scece.constructor.name', scece.name);
+            if (s.constructor.name != scece.name) {
+                SceneManager.back();
+            } else {
+                break;
+            }
+        }
+
+    }
+    /**
+     * 回到上一个场景
+     */
+    public static back(): boolean {
+
+        if (!this.root || this.root.numChildren <= 0) {
+            console.warn('[WARN] preScene is undefine');
+            return false;
+        }
+        var perScene: BaseScene = <BaseScene>this.root.getChildAt(this.root.numChildren - 1);
+        if (!perScene) {
+            console.warn("[SceneManager] Do`t Back!");
+            return false;
+        }
+
+        perScene.onHide && perScene.onHide();
+        perScene.onDestory && perScene.onDestory();
+
+        if (this.root.numChildren > 1) {
+            var currentScene: BaseScene = <BaseScene>this.root.getChildAt(this.root.numChildren - 2);
+            console.debug("[SceneManager]  Back,  from scene:", perScene.constructor["name"], "@", perScene.hashCode, " to ", currentScene.constructor["name"], "@", currentScene.hashCode);
+            currentScene.visible = true;
+            currentScene.onShow && currentScene.onShow();
+        }
+
+        this.root.removeChild(perScene);
+
+
+        if (SceneManager.isAnimation) {
+            this.animaLayer.addChild(perScene);
+            egret.Tween.get(perScene, { loop: false }).to({ x: this.root.width * -1, y: 0 }, SceneManager.AnimationTime, egret.Ease.quadOut).call(function () {
+                perScene.x = 0;
+                this.animaLayer.removeChild(perScene);
+            }.bind(this));
+
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/ShaderUtils.ts b/client/src/efinal/ShaderUtils.ts
new file mode 100644
index 0000000..eb0a403
--- /dev/null
+++ b/client/src/efinal/ShaderUtils.ts
@@ -0,0 +1,261 @@
+class ShaderUtils {
+    /**
+     * http://developer.egret.com/cn/github/egret-docs/Engine2D/filter/filter/index.html
+     */
+    public static filter(v: egret.DisplayObject): void {
+        var distance: number = 6;           /// 阴影的偏移距离，以像素为单位
+        var angle: number = 45;              /// 阴影的角度，0 到 360 度
+        var color: number = 0x000000;        /// 阴影的颜色，不包含透明度
+        var alpha: number = 0.7;             /// 光晕的颜色透明度，是对 color 参数的透明度设定
+        var blurX: number = 16;              /// 水平模糊量。有效值为 0 到 255.0（浮点）
+        var blurY: number = 16;              /// 垂直模糊量。有效值为 0 到 255.0（浮点）
+        var strength: number = 0.65;                /// 压印的强度，值越大，压印的颜色越深，而且阴影与背景之间的对比度也越强。有效值为 0 到 255。暂未实现
+        var quality: number = egret.BitmapFilterQuality.LOW;              /// 应用滤镜的次数，暂无实现
+        var inner: boolean = false;            /// 指定发光是否为内侧发光
+        var knockout: boolean = false;            /// 指定对象是否具有挖空效果
+        var dropShadowFilter: egret.DropShadowFilter = new egret.DropShadowFilter(distance, angle, color, alpha, blurX, blurY,
+            strength, quality, inner, knockout);
+        v.filters = [dropShadowFilter];
+    }
+    /**
+     * parms shaderFitler @see ShaderUtils.CustomFilter.customFilter3
+     */
+    public static shader(v: egret.DisplayObject, shaderFitler?): void {
+        let filter = shaderFitler || ShaderUtils.newFilterLightWalk(null);
+        v.filters = [filter.filter];
+        v["autoUpdate"] = () => {
+            filter.update(filter.filter);
+            console.log('[INFO] update');
+        };
+        v.addEventListener(egret.Event.ENTER_FRAME, v["autoUpdate"], v);
+    }
+    public static clearShader(v: egret.DisplayObject, ) {
+        v.filters = null;
+        v.removeEventListener(egret.Event.ENTER_FRAME, v["autoUpdate"], v);
+    }
+
+    public static Shaders = {
+
+        vertexSrc: "attribute vec2 aVertexPosition;\n" +
+        "attribute vec2 aTextureCoord;\n" +
+        "attribute vec2 aColor;\n" +
+
+        "uniform vec2 projectionVector;\n" +
+
+        "varying vec2 vTextureCoord;\n" +
+        "varying vec4 vColor;\n" +
+
+        "const vec2 center = vec2(-1.0, 1.0);\n" +
+
+        "void main(void) {\n" +
+        "   gl_Position = vec4( (aVertexPosition / projectionVector) + center , 0.0, 1.0);\n" +
+        "   vTextureCoord = aTextureCoord;\n" +
+        "   vColor = vec4(aColor.x, aColor.x, aColor.x, aColor.x);\n" +
+        "}",
+        fragmentSrc1:
+        "precision lowp float;\n" +
+        "varying vec2 vTextureCoord;\n" +
+        "varying vec4 vColor;\n" +
+        "uniform sampler2D uSampler;\n" +
+
+        "uniform float customUniform;\n" +
+
+        "void main(void) {\n" +
+        "vec2 uvs = vTextureCoord.xy;\n" +
+        "vec4 fg = texture2D(uSampler, vTextureCoord);\n" +
+        "fg.rgb += sin(customUniform + uvs.x * 2. + uvs.y * 2.) * 0.2;\n" +
+        "gl_FragColor = fg * vColor;\n" +
+        "}",
+
+        fragmentSrc2: [
+            "precision lowp float;",
+
+            "varying vec2 vTextureCoord;",
+            // "varying vec4 vColor;",
+
+            "uniform float time;",
+            "uniform sampler2D uSampler;",
+
+            "void main() {",
+            "vec3 p = (vec3(vTextureCoord.xy,.0) - 0.5) * abs(sin(time/10.0)) * 10.0;",
+            "float d = sin(length(p)+time), a = sin(mod(atan(p.y, p.x) + time + sin(d+time), 3.1416/3.)*3.), v = a + d, m = sin(length(p)*4.0-a+time);",
+            // "float _r = -v*sin(m*sin(-d)+time*.1);",
+            // "float _g = v*m*sin(tan(sin(-a))*sin(-a*3.)*3.+time*.5);",
+            // "float _b = mod(v,m);",
+            "float _r = mod(v,m);",
+            "float _g = .1;",
+            "float _b = .1;",
+            "float _a = 1.0;",
+            "if(_r < 0.1 && _g < 0.1 && _b < 0.1) {",
+            "_a = 0.0;",
+            "}",
+            "gl_FragColor = vec4(_r * _a, _g * _a, _b * _a, _a);",
+            "}"
+        ].join("\n"),
+
+        fragmentSrc3: [
+            "precision lowp float;\n" +
+            "varying vec2 vTextureCoord;",
+            "varying vec4 vColor;\n",
+            "uniform sampler2D uSampler;",
+
+            "uniform vec2 center;",
+            "uniform vec3 params;", // 10.0, 0.8, 0.1"
+            "uniform float time;",
+
+            "void main()",
+            "{",
+            "vec2 uv = vTextureCoord.xy;",
+            "vec2 texCoord = uv;",
+
+            "float dist = distance(uv, center);",
+
+            "if ( (dist <= (time + params.z)) && (dist >= (time - params.z)) )",
+            "{",
+            "float diff = (dist - time);",
+            "float powDiff = 1.0 - pow(abs(diff*params.x), params.y);",
+
+            "float diffTime = diff  * powDiff;",
+            "vec2 diffUV = normalize(uv - center);",
+            "texCoord = uv + (diffUV * diffTime);",
+            "}",
+
+            "gl_FragColor = texture2D(uSampler, texCoord);",
+            "}"
+        ].join("\n"),
+
+        fragmentSrc4: [
+            "precision lowp float;\n" +
+            "varying vec2 vTextureCoord;",
+            "varying vec4 vColor;\n",
+            "uniform sampler2D uSampler;",
+
+            "uniform float lineWidth;",
+            "uniform float offset;",
+
+            "void main()",
+            "{",
+            "vec2 uv = vTextureCoord.xy;",
+            "vec2 texCoord = uv;",
+
+            "float modPart = mod(vTextureCoord.y, lineWidth);",
+            "float solidPart = (1.0 - offset) * lineWidth;",
+
+            "if(modPart > solidPart) {",
+            "gl_FragColor = texture2D(uSampler, texCoord);",
+            "} else {",
+            "gl_FragColor = vec4(0., 0., 0., 0.);",
+            "}",
+
+
+            "}"
+        ].join("\n"),
+    }
+    /**
+     *         //light walk through the surface
+     */
+    public static newFilterLightWalk(completeListener: Function) {
+        return {
+            filter: new egret.CustomFilter(
+                ShaderUtils.Shaders.vertexSrc,
+                ShaderUtils.Shaders.fragmentSrc1,
+                {
+                    customUniform: 0
+                }
+            ),
+            completeListener: function () { console.log("animetion is complete"); },
+            update: function (filter) {
+                filter.uniforms.customUniform += 0.1;
+                if (filter.uniforms.customUniform > Math.PI * 2) {
+                    filter.uniforms.customUniform = 0.0;
+                    completeListener() || this.completeListener();
+                }
+            }
+        };
+    }
+    /**
+     *   // like the flower collapse
+     */
+    public static newFilterFlowerCollapse(completeListener?: Function) {
+        return {
+            filter: new egret.CustomFilter(
+                ShaderUtils.Shaders.vertexSrc,
+                ShaderUtils.Shaders.fragmentSrc2,
+                {
+                    time: 0
+                }
+            ),
+            completeListener: function () { console.log("animetion is complete"); },
+            isRevese: false,
+            update: function (filter) {
+                if (!this.isRevese) {
+                    if (filter.uniforms.time < 1) {
+                        filter.uniforms.time += 0.008;
+                    } else {
+                        this.isRevese = true;
+                        filter.uniforms.time = 1;
+                    }
+                } else {
+                    if (filter.uniforms.time > 0) {
+                        (completeListener && completeListener()) || this.completeListener();
+                        filter.uniforms.time -= 0.008;
+                    } else {
+                        this.isRevese = false;
+                        filter.uniforms.time = 0.0;
+                    }
+                }
+
+                // filter.uniforms.time += 0.008;
+                // if (filter.uniforms.time > 1) {
+                //     filter.uniforms.time = 0.0;
+                //     completeListener()||this.completeListener();
+                // }
+            }
+        };
+    }
+    public static newFilterWaterWave(completeListener: Function) {
+        return {
+            filter: new egret.CustomFilter(
+                ShaderUtils.Shaders.vertexSrc,
+                ShaderUtils.Shaders.fragmentSrc3,
+                {
+                    center: { x: 0.5, y: 0.5 },
+                    params: { x: 10, y: 0.8, z: 0.1 },
+                    time: 0
+                }
+            ),
+            completeListener: function () { console.log("animetion is complete"); },
+            update: function (filter) {
+                filter.uniforms.time += 0.01;
+                if (filter.uniforms.time > 1) {
+                    filter.uniforms.time = 0.0;
+                    completeListener() || this.completeListener();
+                }
+            }
+        };
+    }
+    /**
+     * blind window 
+     */
+    public static newFilterBlindWindow(completeListener: Function) {
+        return {
+            filter: new egret.CustomFilter(
+                ShaderUtils.Shaders.vertexSrc,
+                ShaderUtils.Shaders.fragmentSrc4,
+                {
+                    lineWidth: 0.1,
+                    offset: 0
+                }
+            ),
+            completeListener: function () { console.log("animetion is complete"); },
+            update: function (filter) {
+                filter.uniforms.offset += 0.05;
+                if (filter.uniforms.offset > 1) {
+                    filter.uniforms.offset = 0.0;
+                    completeListener() || this.completeListener();
+                }
+            }
+        };
+    }
+}
+
diff --git a/client/src/efinal/SoundBase.ts b/client/src/efinal/SoundBase.ts
new file mode 100644
index 0000000..557a50e
--- /dev/null
+++ b/client/src/efinal/SoundBase.ts
@@ -0,0 +1,149 @@
+/**
+ * Created by FCX on 3/14/2016.
+ */
+class SoundBase extends egret.DisplayObjectContainer {
+
+    public constructor(url?: string) {
+        super();
+        if (url)
+            this._soundURL = url;
+
+        this._sound = new egret.Sound();
+        this._loadSound();
+
+    }
+
+    private _sound: egret.Sound;
+
+    private _soundURL: string = "bgSound";
+
+    private _soundChannel: egret.SoundChannel;
+    //默认播放位置，从头开始的
+    private _positon: number = 0;
+    //默认不循环，设置为负数循环
+    private _loop: boolean = false;
+    //当前状态0位空，1位播放，2位暂停, 3表示加载完成,4表示加载失败
+    private _status: number = 0;
+    //加载音频
+    private _loadSound() {
+        if (RES.getRes(this._soundURL)) {
+            // 加载
+            this._sound = RES.getRes(this._soundURL);
+        } else {
+            //如果RES中未加载该资源，尝试绝对路径加载之。
+            this._sound.once(egret.Event.COMPLETE, this.loadComplete, this);
+            this._sound.once(egret.IOErrorEvent.IO_ERROR, this.onLoadErr, this);
+
+            // 启动从指定 URL 加载外部音频文件的过程???
+            // url在哪里?
+            // 难道是对应的url???
+            this._sound.load(this._soundURL);
+        }
+    }
+    //加载音频完成
+    private loadComplete(e: egret.Event) {
+        this._status = 3;
+        var waring: string = "加载完成";
+        egret.log(waring);
+        //删除加载失败的监听
+        this._sound.removeEventListener(egret.IOErrorEvent.IO_ERROR, this.onLoadErr, this)
+        this.dispatchEventWith(egret.Event.COMPLETE, false, waring);
+    }
+    //加载音频失败
+    private onLoadErr(e: egret.IOErrorEvent) {
+        this._status = 4;
+        var waring: string = "加载失败" + this._soundURL;
+        egret.log(waring);
+        //删除加载成功的监听
+        this._sound.removeEventListener(egret.Event.COMPLETE, this.loadComplete, this);
+        this.dispatchEventWith(egret.IOErrorEvent.IO_ERROR, false, waring);
+    }
+    //设置url并重新加载
+    public setUrl(url: string) {
+        this._soundURL = url;
+        this._loadSound();
+    }
+    //设置循环
+    private looped(e: egret.Event) {
+        // console.log("looped");
+        this._soundChannel = null;
+        this._positon = 0;
+        this._status = 0;
+        var waring: string = "播放完成";
+        if (this._loop) {
+            this.play();
+        } else {
+            this.dispatchEventWith(egret.Event.SOUND_COMPLETE, false, waring);
+        }
+    }
+    //获取状态
+    public getStatus() {
+        return this._status;
+    }
+    //设置音量
+    public setVolume(volume: number) {
+        console.log(this._status);
+        if (1 === this._status)
+            this._soundChannel.volume = volume / 100;
+    }
+    //显示播放时间
+    public showPosition(): number {
+
+        if (1 === this._status)
+            this._positon = this._soundChannel.position;
+        return this._positon;
+    }
+    //播放音频
+    public play() {
+        try {
+            if (4 === this._status) {
+                this._loadSound();
+                return;
+            }
+            this._status = 1;
+            if (this._soundChannel)
+                this._soundChannel.stop();
+
+            this._soundChannel = this._sound.play(this._positon, 1);
+
+            this._soundChannel.once(egret.Event.SOUND_COMPLETE, this.looped, this);
+        } catch (error) {
+            console.error(error);
+        }
+        return this._status;
+    }
+    //设置循环
+    public setLoop(loop: boolean = false): boolean {
+        this._loop = loop;
+
+        return loop;
+    }
+    //设置暂停
+    public pause() {
+        var temp = this._status;
+        if (1 === temp) {
+            this._positon = this._soundChannel.position;
+            this._soundChannel.stop();
+            this._status = 2;
+        }
+        egret.log(this._positon);
+        return temp;
+    }
+    //恢复
+    public resume() {
+        var temp = this._status;
+        if (2 === temp) {
+            this.play();
+
+        }
+        egret.log(this._positon);
+        return temp;
+    }
+    //停止
+    public stop() {
+        this._status = 0;
+        this._positon = 0;
+        this._soundChannel.stop();
+        this._soundChannel = null;
+    }
+}
\ No newline at end of file
diff --git a/client/src/efinal/Tips.ts b/client/src/efinal/Tips.ts
new file mode 100644
index 0000000..130011d
--- /dev/null
+++ b/client/src/efinal/Tips.ts
@@ -0,0 +1,29 @@
+class Tips {
+	private step = 0;
+	private root;
+	private stepViewNames: Array<string> = [];
+	public show(root: BaseScene, stepViewName: Array<string>) {
+		this.stepViewNames = stepViewName;
+		this.root = root;
+		root.findChild(stepViewName[0]).visible = true;
+		root.findChild(stepViewName[1]).visible = true;
+		for (var i = 2; i < this.stepViewNames.length; i++) {
+			root.findChild(stepViewName[i]).visible = false;
+		}
+	}
+	public nextStep() {
+		if (this.root === null) {
+			console.warn("please call func 'Tips.show(root,stepViewNameArray)' as  the first step");
+			return false;
+		}
+		this.step++;
+		if (this.step+1 > this.stepViewNames.length-1) {// next step is exit tips ,-1 =  root
+			this.root.findChild(this.stepViewNames[0]).visible = false;
+			return true;
+		} else {
+			this.root.findChild(this.stepViewNames[this.step]).visible = false;
+			this.root.findChild(this.stepViewNames[this.step+1]).visible = true;
+			return false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/src/utils/Toast.ts b/client/src/efinal/Toast.ts
similarity index 77%
rename from client/src/utils/Toast.ts
rename to client/src/efinal/Toast.ts
index 8a6a0ed..d787ea0 100644
--- a/client/src/utils/Toast.ts
+++ b/client/src/efinal/Toast.ts
@@ -1,13 +1,23 @@
 class Toast extends egret.DisplayObjectContainer {
-
+    private static _txtrToastBg: egret.Texture;
+    private static context: egret.DisplayObjectContainer;
     public static init(cont: egret.DisplayObjectContainer, txtrToastBg: egret.Texture): void {
+        if(this.context){
+            console.warn("Toast has init, so ignore this action");
+            return;
+        }
         console.log("Toast.init", txtrToastBg);
-        this._cont = cont;
+        this.context = cont;
         this._txtrToastBg = txtrToastBg;
     }
     public static initRes(cont: egret.DisplayObjectContainer, img: string): void {
+        if(this.context){
+            console.warn("Toast has init, so ignore this action");
+            return;
+        }
+
         console.log("Toast.init", img);
-        this._cont = cont;
+        this.context = cont;
       
         var loader: egret.ImageLoader = new egret.ImageLoader();
         //添加加载完成侦听
@@ -27,14 +37,13 @@ class Toast extends egret.DisplayObjectContainer {
     }
 
     public static show(msg: string): void {
-        if (this._cont) {
-            var toast: Toast = new Toast(msg, 650, 1150);
-            this._cont.addChild(toast);
+        if (this.context) {
+            var toast: Toast = new Toast(msg, this.context.stage.stageWidth, this.context.stage.stageHeight);
+            this.context.addChild(toast);
         }
     }
 
-    private static _txtrToastBg: egret.Texture;
-    private static _cont: egret.DisplayObjectContainer;
+
 
     constructor(msg: string, w: number, h: number) {
         super();
@@ -71,12 +80,12 @@ class Toast extends egret.DisplayObjectContainer {
         this.alpha = 0;
 
         egret.Tween.get(this)
-            .to({ alpha: 1 }, 800, egret.Ease.quintOut)
+            .to({ alpha: 1 }, 200, egret.Ease.quintOut)
             //.to( { scaleX: 1.2, scaleY: 1.2 }, 100, egret.Ease.quintOut )
             //.call( ()=>{ console.log( "tween tween tween" ); } ) 
             //.to( { scaleX: 1.0, scaleY: 1.0 }, 300, egret.Ease.quintIn )
-            .wait(1600)
-            .to({ alpha: 0 }, 1200, egret.Ease.quintIn).call(() => {      /*  y: this.y - 50, */
+            .wait(600)
+            .to({ alpha: 0 }, 200, egret.Ease.quintIn).call(() => {      /*  y: this.y - 50, */
                 if (this.parent) {
                     this.parent.removeChild(this);
                 }
diff --git a/client/src/efinal/UI.ts b/client/src/efinal/UI.ts
new file mode 100644
index 0000000..923cc0b
--- /dev/null
+++ b/client/src/efinal/UI.ts
@@ -0,0 +1,29 @@
+class UI {
+
+	private static LOGGER: any = console;
+
+	public static printLog(par?: any) {
+		UI.LOGGER.info('[INFO] : ' + par);
+	}
+
+	public static setLogger(logger) {
+		UI.LOGGER = logger;
+	}
+	public static buildEgretLogger(root: egret.DisplayObjectContainer) {
+		var text: eui.Label = new eui.Label();
+		text.touchEnabled = false;
+		text.alpha = 0.8;
+		text.textColor = 0x98e165;
+		text.name = "Log";
+		var logger: any = text;
+		logger.info = function (msg) {
+			logger.text += msg;
+			logger.text += "\r\n";
+			if (logger.text > 1024) {
+				logger.text.substr(512, logger.text.length);
+			}
+		}
+		root.addChild(logger);
+		UI.setLogger(logger);
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/ui/Dialog.ts b/client/src/efinal/ui/Dialog.ts
new file mode 100644
index 0000000..8a2067b
--- /dev/null
+++ b/client/src/efinal/ui/Dialog.ts
@@ -0,0 +1,49 @@
+class Dialog extends eui.Component implements eui.UIComponent {
+	public OK: eui.Button;
+	public Cancle: eui.Button;
+	public title: eui.Label;
+	public message: eui.Label;
+	public img: eui.Image;
+
+
+	public constructor() {
+		super();
+
+	}
+
+	protected partAdded(partName: string, instance: any): void {
+		super.partAdded(partName, instance);
+		console.log('[INFO] partAdded');
+
+
+	}
+
+	protected childrenCreated(): void {
+		super.childrenCreated();
+		console.log('[INFO] childrenCreated');
+	}
+	public show(context: egret.DisplayObjectContainer, message: string, OKListener?: Function, title?: string, cancleListener?: Function) {
+		context.addChild(this);
+		message && (this.message.text = message);
+		title && (this.title.text = title);
+		this.setOKListener(OKListener);
+		this.setCancleListener(cancleListener);
+		return this;
+
+	}
+	public hide() {
+		this.parent && this.parent.removeChild(this);
+	}
+	public setOKListener(cb) {
+		this.OK.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.TouchEvent) {
+			this.hide();
+			return cb&&cb();
+		}.bind(this), this.OK);
+	}
+	public setCancleListener(cb) {
+		this.Cancle.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.TouchEvent) {
+			this.hide();
+			return cb&&cb();
+		}.bind(this), this.OK);
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/util/AnimaUtil.ts b/client/src/efinal/util/AnimaUtil.ts
new file mode 100644
index 0000000..dd6ae64
--- /dev/null
+++ b/client/src/efinal/util/AnimaUtil.ts
@@ -0,0 +1,34 @@
+class AnimaUtil {
+	public static showMoive(frameName: string, container: egret.DisplayObjectContainer, playerCompleteCallback?: Function, isRemoveAfterComplete?: boolean, isLoop?: boolean, x?, y?, width?, high?):egret.MovieClip {
+
+		return AnimaUtil.showMoiveWithAction(frameName, null,container, playerCompleteCallback, isRemoveAfterComplete, isLoop, x, y, width, high);
+	}
+	/**
+	 * 当loop为true时, playerCompleteCallback会被多次回调 
+	 */
+	public static showMoiveWithAction(frameName: string,actionName:string, container: egret.DisplayObjectContainer, playerCompleteCallback?: 
+									Function, isRemoveAfterComplete?: 
+									boolean, isLoop?: boolean, x?, y?, width?, high?):egret.MovieClip {
+		var BombData = RES.getRes(frameName + "_mc_json");
+		var BombTxtr = RES.getRes(frameName + "_tex_png");
+		var mcFactory: egret.MovieClipDataFactory = new egret.MovieClipDataFactory(BombData, BombTxtr);
+		var behavior2 = new egret.MovieClip(mcFactory.generateMovieClipData(frameName));
+		behavior2.x = x ? x : 0;
+		behavior2.y = y ? y : 0;
+		behavior2.width = width ? width : container.width;
+		behavior2.height = high ? high : container.height;
+		behavior2.anchorOffsetX = -1 * behavior2.width / 2;
+		behavior2.anchorOffsetY = -1 * behavior2.height / 2;
+		behavior2.name = container ? container.name : frameName;
+		container && container.addChild(behavior2);
+		behavior2.addEventListener(isLoop ? egret.Event.LOOP_COMPLETE : egret.Event.COMPLETE, function (e: egret.Event): void {
+			// console.log('[INFO] loop con');
+			if (isRemoveAfterComplete && isLoop == false) {
+				container && container.removeChild(behavior2);
+			}
+			playerCompleteCallback && playerCompleteCallback(frameName);
+		}, behavior2);
+		behavior2.gotoAndPlay(actionName||0, isLoop ? -1 : 1);
+		return behavior2;
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/util/JSUtil.ts b/client/src/efinal/util/JSUtil.ts
new file mode 100644
index 0000000..6a69d43
--- /dev/null
+++ b/client/src/efinal/util/JSUtil.ts
@@ -0,0 +1,11 @@
+class JSUtil {
+	public constructor() {
+	}
+	public static isArray(value) {
+		if (typeof Array.isArray === "function") {
+			return Array.isArray(value);
+		} else {
+			return Object.prototype.toString.call(value) === "[object Array]";
+		}
+	}
+}
\ No newline at end of file
diff --git a/client/src/efinal/util/UriUtil.ts b/client/src/efinal/util/UriUtil.ts
new file mode 100644
index 0000000..e917be5
--- /dev/null
+++ b/client/src/efinal/util/UriUtil.ts
@@ -0,0 +1,16 @@
+class UriUtil {
+	public constructor() {
+	}
+	public static getRequestPars(): Object {
+		var url = location.search; //获取url中"?"符后的字串
+		var theRequest = new Object();
+		if (url.indexOf("?") != -1) {
+			var str: string = url.substr(1);
+			var strs = str.split("&");
+			for (var i = 0; i < strs.length; i++) {
+				theRequest[strs[i].split("=")[0]] = decodeURIComponent(strs[i].split("=")[1]);
+			}
+		}
+		return theRequest;
+	}
+}
\ No newline at end of file
diff --git a/client/src/logic/battle/BattleStageControl.ts b/client/src/logic/battle/BattleStageControl.ts
index 75a8c00..4a84143 100644
--- a/client/src/logic/battle/BattleStageControl.ts
+++ b/client/src/logic/battle/BattleStageControl.ts
@@ -685,8 +685,8 @@ module battle {
 		//有玩家离开房间就提示玩家离开房间，需要回到大厅。
 		private leaveRoomNotify(event:egret.Event){
 			PokeMatchvsEngine.getInstance.leaveRoom("他们都不玩了，我也离开");
-			SceneManager.ErrorPage("玩家"+event.data.userId+"离开房间，请返回到大厅...",()=>{
-				SceneManager.showScene(Game);
+			DialogPage.ErrorPage("玩家"+event.data.userId+"离开房间，请返回到大厅...",()=>{
+				
 			},this);
 		}
 
diff --git a/client/src/logic/network/NetworkStateCheck.ts b/client/src/logic/network/NetworkStateCheck.ts
index fd132d9..b8f58e2 100644
--- a/client/src/logic/network/NetworkStateCheck.ts
+++ b/client/src/logic/network/NetworkStateCheck.ts
@@ -65,7 +65,7 @@ module network {
 			let data = e.data;
 			if(data.state == 3){
 				this.CancelListen();
-				SceneManager.ErrorPage("其他玩家网络连接断开，请返回到大厅...",this.returnSceneGameLoy,this);
+				DialogPage.ErrorPage("其他玩家网络连接断开，请返回到大厅...",this.returnSceneGameLoy,this);
 			}
 		}
 
@@ -103,7 +103,7 @@ module network {
 			let errData = this._errCodeMap[Number(data.code)];
 			if(errData){
 				this.CancelListen();
-				SceneManager.ErrorPage(errData.message, errData.callBack,this);
+				DialogPage.ErrorPage(errData.message, errData.callBack,this);
 			}
 			// }else{
 			// 	SceneManager.ErrorPage("服务返回错误："+data.code,this.returnSceneLogin,this);
diff --git a/client/src/scene/BattleStageUI.ts b/client/src/scene/BattleStageUI.ts
index 55dfd1f..e5bbd2a 100644
--- a/client/src/scene/BattleStageUI.ts
+++ b/client/src/scene/BattleStageUI.ts
@@ -1,4 +1,4 @@
-class BattleStageUI extends eui.Component implements eui.UIComponent{
+class BattleStageUI extends  BaseScene{
 
 	public roomID:string = "";
 
@@ -302,7 +302,7 @@ class BattleStageUI extends eui.Component implements eui.UIComponent{
 			this._tablecardControl.ShowTableCard(3, p3.cardList);
 			// this._myCardControl.Release();
 		}
-		SceneManager.JumpResultUI(p3,p1,p2,iswin,islandwin,timestr, this.roomID);
+		DialogPage.JumpResultUI(p3,p1,p2,iswin,islandwin,timestr, this.roomID);
 		this.Release();
 		return;
 	}
diff --git a/client/src/scene/DialogPage.ts b/client/src/scene/DialogPage.ts
new file mode 100644
index 0000000..734b01b
--- /dev/null
+++ b/client/src/scene/DialogPage.ts
@@ -0,0 +1,23 @@
+
+	class DialogPage {
+		public static JumpResultUI(p3, p1, p2, iswin, islandwin, timestr, roomid: string) {
+			SceneManager.root.removeChildren();
+			let re = new ResultUI();
+			SceneManager.root.addChild(re);
+			if (p1.isLandLord) {
+				re.showResult(p1, p2, p3, iswin, islandwin, timestr, roomid);
+			} else if (p2.isLandLord) {
+				re.showResult(p2, p1, p3, iswin, islandwin, timestr, roomid);
+			} else if (p3.isLandLord) {
+				re.showResult(p3, p1, p2, iswin, islandwin, timestr, roomid);
+			}
+
+		}
+
+		public static ErrorPage(msg: string, callFun: Function, obj: any) {
+			SceneManager.root.removeChildren();
+			let errpage: ErrorNote = new ErrorNote();
+			errpage.SetErrorMsg(msg, callFun);
+			SceneManager.root.addChild(errpage);
+		}
+	}
\ No newline at end of file
diff --git a/client/src/scene/Game.ts b/client/src/scene/Game.ts
index c63203b..5d3ef6a 100644
--- a/client/src/scene/Game.ts
+++ b/client/src/scene/Game.ts
@@ -1,4 +1,4 @@
-class Game extends eui.Component implements eui.UIComponent {
+class Game extends BaseScene {
 
 	private userPlayer = [];
 	private roomName = "我是世界第一，你是谁？";
@@ -7,7 +7,6 @@ class Game extends eui.Component implements eui.UIComponent {
 
 	public constructor() {
 		super();
-		Toast.initRes(this, "resource/loading/toast-bg.png")
 	}
 
 	protected partAdded(partName: string, instance: any): void {
diff --git a/client/src/scene/Login.ts b/client/src/scene/Login.ts
index a2ba910..4f25386 100644
--- a/client/src/scene/Login.ts
+++ b/client/src/scene/Login.ts
@@ -1,9 +1,8 @@
-class Login extends eui.Component implements eui.UIComponent {
+class Login extends BaseScene {
 	private that: any = this;
 
 	public constructor() {
 		super();
-		Toast.initRes(this, "resource/loading/toast-bg.png");
 
 	}
 	
diff --git a/client/src/scene/RankList.ts b/client/src/scene/RankList.ts
index 491f6fc..998c073 100644
--- a/client/src/scene/RankList.ts
+++ b/client/src/scene/RankList.ts
@@ -1,4 +1,4 @@
-class RankList extends eui.Component implements  eui.UIComponent {
+class RankList extends BaseScene {
 	private rankList:eui.List;
 	private http:MvsHttpApi = new MvsHttpApi();
 	private userMap:{[key:number]:any} = [];
diff --git a/client/src/scene/Result.ts b/client/src/scene/Result.ts
index 5ee0056..cabe7d1 100644
--- a/client/src/scene/Result.ts
+++ b/client/src/scene/Result.ts
@@ -2,7 +2,7 @@
  * 结算页面
  * 
  */
-class ResultUI extends eui.Component implements  eui.UIComponent {
+class ResultUI extends BaseScene implements  eui.UIComponent {
 	private allChildren:{[key:string]:any} = [];
 
 	private roomID:string = "";
diff --git a/client/src/scene/Room.ts b/client/src/scene/Room.ts
index 4001a62..5e10f34 100644
--- a/client/src/scene/Room.ts
+++ b/client/src/scene/Room.ts
@@ -1,4 +1,4 @@
-class Room extends eui.Component implements  eui.UIComponent {
+class Room extends BaseScene implements  eui.UIComponent {
 
 	public roomID:string = "";
 	private countDownLabel:eui.Label = null;
@@ -213,7 +213,7 @@ class Room extends eui.Component implements  eui.UIComponent {
 				}
 				this.userPlayer.length = 0;
 				this.removeEvent();
-				SceneManager.showScene(Game);
+				SceneManager.back();
 			break;
 			case MatchvsMessage.MATCHVS_KICK_PLAYER_NOTIFY:
 				console.log('Room');
@@ -318,7 +318,7 @@ class Room extends eui.Component implements  eui.UIComponent {
 			this.countDownLabel.text = "";
 			this.countDownTimer = 0;
 			this.removeEvent();
-			SceneManager.showScene(Game);
+			SceneManager.back();
 		}
 		var name;
 		if (this.beKickedOutName == "") {
@@ -357,10 +357,12 @@ class Room extends eui.Component implements  eui.UIComponent {
 			this.beKickedOutName = instance.text;
 		} else {
 			try {
+				Toast.show("微信邀请");
 				var par = "roomID="+this.roomID;
 				let wxm = new Wxmodel();
 				wxm.together("约战",par);
 			} catch (e){
+				Toast.show("失败,请在微信中发出邀请");
 				console.warn(e,e.message);
 			}
 
diff --git a/client/src/scene/TopHeader.ts b/client/src/scene/TopHeader.ts
index 44a11b5..1f0124a 100644
--- a/client/src/scene/TopHeader.ts
+++ b/client/src/scene/TopHeader.ts
@@ -1,4 +1,4 @@
-class TopHeader extends eui.Component implements eui.UIComponent{
+class TopHeader extends BaseScene implements eui.UIComponent{
 
 	private allChildren:{[key:string]:any} = [];
 
diff --git a/client/src/utils/MatchDialog.ts b/client/src/utils/MatchDialog.ts
index 130377e..1aa4733 100644
--- a/client/src/utils/MatchDialog.ts
+++ b/client/src/utils/MatchDialog.ts
@@ -1,155 +1,156 @@
-class MatchDialog extends eui.Component implements  eui.UIComponent {
+class MatchDialog extends BaseScene {
 
 
-	private defaultFont:number = 0; 
-	private fontImgUnits:eui.Image = null;
-	private fontImgtens:eui.Image = null;
-	private fontImghundreds:eui.Image = null;
-	private timer:egret.Timer;
+	private defaultFont: number = 0;
+	private fontImgUnits: eui.Image = null;
+	private fontImgtens: eui.Image = null;
+	private fontImghundreds: eui.Image = null;
+	private timer: egret.Timer;
 	private userPlayer = [];
 	private roomID = "";
 
 	public constructor(obj) {
 		super();
-		console.log('MatchDialog','constructor');
-		this.roomID = obj;
-		this.timer = new egret.Timer(1000,0);
+		console.log('MatchDialog', 'constructor');
+		this.timer = new egret.Timer(1000, 0);
 		//注册事件侦听器
-        this.timer.addEventListener(egret.TimerEvent.TIMER,this.timerFunc,this);
+		this.timer.addEventListener(egret.TimerEvent.TIMER, this.timerFunc, this);
 		this.timer.start();
 		this.userPlayer.length = 0;
 	}
 
-	public initEvent() { 
+	public initEvent() {
 		console.log("initEvent");
-		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_JOINROOM_NOTIFY,this.onEvent,this);
-		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM,this.onEvent,this);
-		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY,this.onEvent,this);
-		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_ROOM_DETAIL_RSP,this.onEvent,this);
+		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_JOINROOM_NOTIFY, this.onEvent, this);
+		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM, this.onEvent, this);
+		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY, this.onEvent, this);
+		PokeMatchvsRep.getInstance.addEventListener(MatchvsMessage.MATCHVS_ROOM_DETAIL_RSP, this.onEvent, this);
 	}
 
-	protected partAdded(partName:string,instance:any):void {
-		super.partAdded(partName,instance);
-		if(partName == "time_units") {
+	protected partAdded(partName: string, instance: any): void {
+		super.partAdded(partName, instance);
+		if (partName == "time_units") {
 			this.fontImgUnits = instance;
 		}
-		if(partName == "time_tens") {
+		if (partName == "time_tens") {
 			this.fontImgtens = instance;
 		}
-		if(partName == "time_hundreds") {
+		if (partName == "time_hundreds") {
 			this.fontImghundreds = instance;
 		}
-		if(partName == "cancel_match") {
+		if (partName == "cancel_match") {
 			instance.addEventListener(egret.TouchEvent.TOUCH_TAP, function (e: egret.TouchEvent) {
 				if (PokeMatchvsEngine.getInstance.leaveRoom("不想等待匹配了") == -6) {
 					this.userPlayer.length = 0;
 					this.stopTimer();
 					SceneManager.showScene(Game);
 				}
-			},this);
+			}, this);
 		};
 		network.NetworkStateCheck.getInstance().RegistNetListen(this);
 	}
-
-	protected childrenCreated():void {
+	public onShow(par?: any) {
+		this.roomID = par;
+	}
+	protected childrenCreated(): void {
 		super.childrenCreated();
-		console.log('MatchDialog','childrenCreated');
+		console.log('MatchDialog', 'childrenCreated');
 		network.NetworkStateCheck.getInstance().RegistNetListen(this);
 		PokeMatchvsEngine.getInstance.getRoomDetail(this.roomID);
 		this.initEvent();
-		
+
 	}
 
 	/**
 	 * 接收Event信息
 	 */
-	 public onEvent(e:egret.Event):void {
-		 switch (e.type) {
+	public onEvent(e: egret.Event): void {
+		switch (e.type) {
 			case MatchvsMessage.MATCHVS_ROOM_DETAIL_RSP:
 				for (var i in e.data.userInfos) {
-					if (e.data.userInfos[i].userId != GlobalData.myUser.userID ) {
+					if (e.data.userInfos[i].userId != GlobalData.myUser.userID) {
 						this.addUser(e.data.userInfos[i]);
 					}
 				}
-			 break;
-			 case MatchvsMessage.MATCHVS_JOINROOM_NOTIFY:
-			 	this.addUser(e.data);
-			 break;
-				
-			 case MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY:
+				break;
+			case MatchvsMessage.MATCHVS_JOINROOM_NOTIFY:
+				this.addUser(e.data);
+				break;
+
+			case MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY:
 				//获取数组下标，删除离开玩家的指定的下标，将定时器重置，倒计时也需要重置
-				for(var i in this.userPlayer ) {
-					if(e.data.userId == this.userPlayer[i].userID) {
-						egret.log("删除userID在数组的位置"+i);
-						this.userPlayer.splice(parseInt(i),1);
+				for (var i in this.userPlayer) {
+					if (e.data.userId == this.userPlayer[i].userID) {
+						egret.log("删除userID在数组的位置" + i);
+						this.userPlayer.splice(parseInt(i), 1);
 					}
 				}
 				break;
-			 case MatchvsMessage.MATCHVS_LEVAE_ROOM:
-			 	this.userPlayer.length = 0;
+			case MatchvsMessage.MATCHVS_LEVAE_ROOM:
+				this.userPlayer.length = 0;
 				egret.log("接收到离开房间的消息");
 				this.stopTimer();
 				// var roomPanel = new Game();
 				// this.addChild(roomPanel);
 				// roomPanel = null;
 				SceneManager.back();
-				console.log('MatchDialog','back_game');
-			 break;
-			 
-		 }
-	 }
-
-
-	 /**
-	  * 跳转游戏页面
-	  */
-	private startBattle(){
-		this. stopTimer();
-		var obj = {roomID: this.roomID, userList:this.userPlayer};
-		SceneManager.showScene(BattleStageUI,obj);
+				console.log('MatchDialog', 'back_game');
+				break;
+
+		}
+	}
+
+
+	/**
+	 * 跳转游戏页面
+	 */
+	private startBattle() {
+		this.stopTimer();
+		var obj = { roomID: this.roomID, userList: this.userPlayer };
+		SceneManager.showScene(BattleStageUI, obj);
 	}
 
 
 	/**
 	 * 定时器时间的展示
 	 */
-    private timerFunc() {
-		switch(this.defaultFont.toString().length) {
+	private timerFunc() {
+		switch (this.defaultFont.toString().length) {
 			case 1:
-				var a=this.defaultFont%10;
-				this.fontImgUnits.source = (a).toString();  
-			break
+				var a = this.defaultFont % 10;
+				this.fontImgUnits.source = (a).toString();
+				break
 			case 2:
-				var a = this.defaultFont%10;  
-				var b = Math.floor((this.defaultFont%100)/10);
+				var a = this.defaultFont % 10;
+				var b = Math.floor((this.defaultFont % 100) / 10);
 				this.fontImgUnits.source = a.toString();
-				this.fontImgtens.source = b.toString();  
-			break
+				this.fontImgtens.source = b.toString();
+				break
 			case 3:
-				var a = this.defaultFont%10;  
-				var b = Math.floor((this.defaultFont%100)/10);
-				var c = Math.floor((this.defaultFont/100));
+				var a = this.defaultFont % 10;
+				var b = Math.floor((this.defaultFont % 100) / 10);
+				var c = Math.floor((this.defaultFont / 100));
 				this.fontImgUnits.source = (a).toString();
-				this.fontImgtens.source = (b).toString();  
+				this.fontImgtens.source = (b).toString();
 				this.fontImghundreds.source = (c).toString();
-			break
+				break
 		}
-		egret.log("时间"+this.defaultFont);
+		egret.log("时间" + this.defaultFont);
 		this.defaultFont++;
-    }
+	}
 
 
 
-		/**
-	 * 将玩家信息放入UserplayerList中
-	 */
-	public addUser(userPlayer:any) {
+	/**
+ * 将玩家信息放入UserplayerList中
+ */
+	public addUser(userPlayer: any) {
 		if (this.userPlayer.length > 0) {
-			for(var i = 0; i <this.userPlayer.length; i++) {
-				if(userPlayer.userId != this.userPlayer[i].userID) {
-					var user:GUser = new GUser;
+			for (var i = 0; i < this.userPlayer.length; i++) {
+				if (userPlayer.userId != this.userPlayer[i].userID) {
+					var user: GUser = new GUser;
 					var arr = JSON.parse(userPlayer.userProfile);
-					user.nickName =arr.nickName;
+					user.nickName = arr.nickName;
 					user.avator = arr.avator;
 					user.pointValue = arr.pointValue;
 					user.userID = userPlayer.userId;
@@ -157,16 +158,16 @@ class MatchDialog extends eui.Component implements  eui.UIComponent {
 				}
 			}
 		} else {
-			var user:GUser = new GUser;
+			var user: GUser = new GUser;
 			var arr = JSON.parse(userPlayer.userProfile);
-			user.nickName =arr.nickName;
+			user.nickName = arr.nickName;
 			user.avator = arr.avator;
 			user.pointValue = arr.pointValue;
 			user.userID = userPlayer.userId;
 			this.userPlayer.push(user);
 		}
-		egret.log("userPlayer的长度"+this.userPlayer.length);
-		if(this.userPlayer.length  == (MatchvsData.maxPlayer-1)) {
+		egret.log("userPlayer的长度" + this.userPlayer.length);
+		if (this.userPlayer.length == (MatchvsData.maxPlayer - 1)) {
 			this.userPlayer.push(GlobalData.myUser);
 			this.startBattle();
 		}
@@ -182,29 +183,29 @@ class MatchDialog extends eui.Component implements  eui.UIComponent {
 	}
 
 	public removeEvent() {
-		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_JOINROOM_NOTIFY,this.onEvent,this);
-		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY,this.onEvent,this);
-		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM,this.onEvent,this);
-		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_ROOM_DETAIL_RSP,this.onEvent,this);
-		this.timer.removeEventListener(egret.TimerEvent.TIMER,this.timerFunc,this);
+		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_JOINROOM_NOTIFY, this.onEvent, this);
+		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM_NOTIFY, this.onEvent, this);
+		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_LEVAE_ROOM, this.onEvent, this);
+		PokeMatchvsRep.getInstance.removeEventListener(MatchvsMessage.MATCHVS_ROOM_DETAIL_RSP, this.onEvent, this);
+		this.timer.removeEventListener(egret.TimerEvent.TIMER, this.timerFunc, this);
 	}
 
 
 
 
 
-	public Release(){
-		 this.removeEvent();
-	 }
+	public Release() {
+		this.removeEvent();
+	}
 
-	Num = [9,99,999,9999,9999,99999,999999];
+	Num = [9, 99, 999, 9999, 9999, 99999, 999999];
 
-	public getIntLenth (x:number) {
-		for(var i = 0; i< this.Num.length;i++) {
-			if(Math.abs(x) <= this.Num[i]) {
-				return i+1;
-			}	
+	public getIntLenth(x: number) {
+		for (var i = 0; i < this.Num.length; i++) {
+			if (Math.abs(x) <= this.Num[i]) {
+				return i + 1;
+			}
 		}
 	}
-	
+
 }
\ No newline at end of file

From e56d3bfe183bc77e5a7aaf326cda0c66f5303e91 Mon Sep 17 00:00:00 2001
From: geliang <geliang0120@gmail.com>
Date: Thu, 6 Jun 2019 10:50:50 +0800
Subject: [PATCH 3/4] hide  the "kick" button

---
 client/src/scene/Room.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/scene/Room.ts b/client/src/scene/Room.ts
index 5e10f34..6d2d83a 100644
--- a/client/src/scene/Room.ts
+++ b/client/src/scene/Room.ts
@@ -284,9 +284,9 @@ class Room extends BaseScene implements  eui.UIComponent {
 			if(this.nameViewList[i].text == "") {
 				this.nameViewList[i].text = userPlayer.nickName;
 				this.iconViewList[i].source = userPlayer.avator;
-				this.actionViewList[i].strokeColor = "11169372"
-				this.actionTextViewList[i].text = "踢人";
-				this.actionTextViewList[i].textColor = "11169372";
+				// this.actionViewList[i].strokeColor = "11169372"
+				// this.actionTextViewList[i].text = "踢人";
+				// this.actionTextViewList[i].textColor = "11169372";
 				return;
 			}
 		}

From 038325f34fbe572a9e4e6f156601fda257b04c08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Jan 2021 00:42:49 +0000
Subject: [PATCH 4/4] Bump axios from 0.18.0 to 0.21.1 in /gs-server

Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.21.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 gs-server/package-lock.json | 1459 +++++++++++++++++++++++++++++++++--
 gs-server/package.json      |    2 +-
 2 files changed, 1396 insertions(+), 65 deletions(-)

diff --git a/gs-server/package-lock.json b/gs-server/package-lock.json
index f8c0fde..f0d9e2d 100644
--- a/gs-server/package-lock.json
+++ b/gs-server/package-lock.json
@@ -4,6 +4,30 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@types/bytebuffer": {
+      "version": "5.0.42",
+      "resolved": "https://registry.npmjs.org/@types/bytebuffer/-/bytebuffer-5.0.42.tgz",
+      "integrity": "sha512-lEgKojWUAc/MG2t649oZS5AfYFP2xRNPoDuwDBlBMjHXd8MaGPgFgtCXUK7inZdBOygmVf10qxc1Us8GXC96aw==",
+      "requires": {
+        "@types/long": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/long": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz",
+      "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
+    },
+    "@types/node": {
+      "version": "14.14.20",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz",
+      "integrity": "sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="
+    },
+    "abbrev": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+    },
     "addressparser": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
@@ -14,6 +38,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz",
       "integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
+      "optional": true,
       "requires": {
         "extend": "3.0.1",
         "semver": "5.0.3"
@@ -22,7 +47,8 @@
         "semver": {
           "version": "5.0.3",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz",
-          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no="
+          "integrity": "sha1-d0Zt5YnNXTyV8TiqeLxWmjy10no=",
+          "optional": true
         }
       }
     },
@@ -54,7 +80,8 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "optional": true
     },
     "ansi-styles": {
       "version": "2.2.1",
@@ -62,6 +89,76 @@
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
       "optional": true
     },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+    },
+    "are-we-there-yet": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "requires": {
+        "delegates": "^1.0.0",
+        "readable-stream": "^2.0.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "ascallback": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ascallback/-/ascallback-1.1.1.tgz",
+      "integrity": "sha1-JGCG+106xOm3iuedLVl57+Vj2jU="
+    },
+    "ascli": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
+      "integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
+      "requires": {
+        "colour": "~0.7.1",
+        "optjs": "~3.2.2"
+      }
+    },
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
@@ -71,7 +168,8 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "optional": true
     },
     "ast-types": {
       "version": "0.11.3",
@@ -97,8 +195,7 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "optional": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.7.0",
@@ -107,14 +204,23 @@
       "optional": true
     },
     "axios": {
-      "version": "0.18.0",
-      "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz",
-      "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=",
+      "version": "0.21.1",
+      "resolved": "http://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
+      "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
       "requires": {
-        "follow-redirects": "1.5.9",
-        "is-buffer": "1.1.6"
+        "follow-redirects": "^1.10.0"
       }
     },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
@@ -179,10 +285,34 @@
         "hoek": "4.2.1"
       }
     },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "requires": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
     "buffer-more-ints": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz",
-      "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw="
+      "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw=",
+      "optional": true
     },
     "buildmail": {
       "version": "4.0.1",
@@ -199,17 +329,29 @@
         "punycode": "1.4.1"
       }
     },
+    "bytebuffer": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/bytebuffer/-/bytebuffer-5.0.1.tgz",
+      "integrity": "sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=",
+      "requires": {
+        "long": "~3"
+      }
+    },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
       "optional": true
     },
+    "camelcase": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "optional": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "chalk": {
       "version": "1.1.3",
@@ -224,17 +366,42 @@
         "supports-color": "2.0.0"
       }
     },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+    },
     "circular-json": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz",
       "integrity": "sha512-YlxLOimeIoQGHnMe3kbf8qIV2Bj7uXLbljMPRguNT49GmSAzooNfS9EJ91rSJKbLBOOzM5agvtx0WyechZN/Hw=="
     },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      }
+    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "optional": true
     },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "colour": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz",
+      "integrity": "sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g="
+    },
     "combined-stream": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
@@ -249,11 +416,202 @@
       "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
       "optional": true
     },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
+    "coveralls": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.1.0.tgz",
+      "integrity": "sha512-sHxOu2ELzW8/NC1UP5XVLbZDzO4S3VxfFye3XYCznopHy02YjNkHcj5bKaVw2O7hVaBdBjEdQGpie4II1mWhuQ==",
+      "requires": {
+        "js-yaml": "^3.13.1",
+        "lcov-parse": "^1.0.0",
+        "log-driver": "^1.2.7",
+        "minimist": "^1.2.5",
+        "request": "^2.88.2"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "aws4": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+          "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+        },
+        "extend": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "har-validator": {
+          "version": "5.1.5",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+          "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+          "requires": {
+            "ajv": "^6.12.3",
+            "har-schema": "^2.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        },
+        "mime-db": {
+          "version": "1.45.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz",
+          "integrity": "sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
+        },
+        "mime-types": {
+          "version": "2.1.28",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz",
+          "integrity": "sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==",
+          "requires": {
+            "mime-db": "1.45.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
+        "oauth-sign": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+        },
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        },
+        "request": {
+          "version": "2.88.2",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
+      }
+    },
+    "crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "requires": {
+        "buffer": "^5.1.0"
+      }
+    },
     "cron-parser": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-2.5.0.tgz",
@@ -283,6 +641,11 @@
         }
       }
     },
+    "cyclist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk="
+    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -311,6 +674,16 @@
         "ms": "2.0.0"
       }
     },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -340,7 +713,13 @@
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "optional": true
+    },
+    "delegates": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "depd": {
       "version": "1.1.1",
@@ -348,12 +727,67 @@
       "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
       "optional": true
     },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
+    },
     "double-ended-queue": {
       "version": "2.1.0-0",
       "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
       "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=",
       "optional": true
     },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -363,6 +797,24 @@
         "jsbn": "0.1.1"
       }
     },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "error-inject": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz",
+      "integrity": "sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc="
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -385,7 +837,8 @@
     "esprima": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+      "optional": true
     },
     "estraverse": {
       "version": "4.2.0",
@@ -402,12 +855,14 @@
     "extend": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "optional": true
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "optional": true
     },
     "fast-deep-equal": {
       "version": "1.1.0",
@@ -418,8 +873,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "optional": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -433,14 +887,54 @@
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "optional": true
     },
-    "follow-redirects": {
-      "version": "1.5.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz",
-      "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==",
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "requires": {
-        "debug": "3.1.0"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
       }
     },
+    "follow-redirects": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz",
+      "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg=="
+    },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -449,20 +943,74 @@
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "optional": true
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
       "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
-      "optional": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
         "mime-types": "2.1.18"
       }
     },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
     "ftp": {
       "version": "0.3.10",
       "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
@@ -473,6 +1021,36 @@
         "xregexp": "2.0.0"
       }
     },
+    "gameserver-nodejs": {
+      "version": "3.8.9",
+      "resolved": "https://registry.npmjs.org/gameserver-nodejs/-/gameserver-nodejs-3.8.9.tgz",
+      "integrity": "sha512-2kI6BuvRWyXL2zB3FmZproHpSgCz27LRpgq5+5RYLvXAWoyWoA1K0hkwYauJV9EV8YMw/fPmzSOokcMXY89k9Q==",
+      "requires": {
+        "ascallback": "^1.1.1",
+        "crc": "^3.5.0",
+        "google-protobuf": "^3.5.0",
+        "grpc": "^1.17.0",
+        "lodash": "^4.6.1",
+        "mali": "^0.6.1",
+        "mississippi": "^1.3.0",
+        "text-encoding": "^0.6.4"
+      }
+    },
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "requires": {
+        "aproba": "^1.0.3",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.0",
+        "object-assign": "^4.1.0",
+        "signal-exit": "^3.0.0",
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wide-align": "^1.1.0"
+      }
+    },
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
@@ -558,11 +1136,58 @@
         "assert-plus": "1.0.0"
       }
     },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "google-protobuf": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.14.0.tgz",
+      "integrity": "sha512-bwa8dBuMpOxg7COyqkW6muQuvNnWgVN8TX/epDRGW5m0jcrmq2QJyCyiV8ZE2/6LaIIqJtiv9bYokFhfpy/o6w=="
+    },
+    "grpc": {
+      "version": "1.24.4",
+      "resolved": "https://registry.npmjs.org/grpc/-/grpc-1.24.4.tgz",
+      "integrity": "sha512-mHRAwuitCMuSHo1tp1+Zc0sz3cYa7pkhVJ77pkIXD5gcVORtkRiyW6msXYqTDT+35jazg98lbO3XzuTo2+XrcA==",
+      "requires": {
+        "@types/bytebuffer": "^5.0.40",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.clone": "^4.5.0",
+        "nan": "^2.13.2",
+        "node-pre-gyp": "^0.16.0",
+        "protobufjs": "^5.0.3"
+      }
+    },
+    "grpc-create-metadata": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/grpc-create-metadata/-/grpc-create-metadata-3.0.0.tgz",
+      "integrity": "sha512-Gr+wYv4NdlG1fKbk7W60xI+6tgWaereF/8ga1NTo9W7IhCAH+mqMt6NDXYBwa9v4KFLWKWngNhDSdGU+HLVdIw==",
+      "requires": {
+        "lodash.forown": "^4.4.0"
+      }
+    },
+    "grpc-inspect": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/grpc-inspect/-/grpc-inspect-0.5.0.tgz",
+      "integrity": "sha512-7Zf9+7aiHDD8zmREz9Uf7sSwWi1yH+DW7orYBRItR68MAecnlxH9rJpBGD1h4XGEHLYxaXG8ayl8DBT4t7J/mA==",
+      "requires": {
+        "lodash": "^4.17.2",
+        "traverse": "^0.6.6"
+      }
+    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "optional": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.0.3",
@@ -583,6 +1208,11 @@
         "ansi-regex": "2.1.1"
       }
     },
+    "has-unicode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
+    },
     "hawk": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
@@ -608,7 +1238,8 @@
     "hoek": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
-      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
+      "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
+      "optional": true
     },
     "http-errors": {
       "version": "1.6.2",
@@ -626,6 +1257,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz",
       "integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=",
+      "optional": true,
       "requires": {
         "agent-base": "2.1.1",
         "debug": "2.6.9",
@@ -636,6 +1268,7 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "optional": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -646,7 +1279,6 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "optional": true,
       "requires": {
         "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
@@ -657,6 +1289,7 @@
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
       "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
+      "optional": true,
       "requires": {
         "httpreq": "0.4.24",
         "underscore": "1.7.0"
@@ -665,12 +1298,14 @@
     "httpreq": {
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
-      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8="
+      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
+      "optional": true
     },
     "https-proxy-agent": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz",
       "integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
+      "optional": true,
       "requires": {
         "agent-base": "2.1.1",
         "debug": "2.6.9",
@@ -681,6 +1316,7 @@
           "version": "2.6.9",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "optional": true,
           "requires": {
             "ms": "2.0.0"
           }
@@ -690,8 +1326,20 @@
     "iconv-lite": {
       "version": "0.4.19",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
-      "optional": true
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+    },
+    "ignore-walk": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "requires": {
+        "minimatch": "^3.0.4"
+      }
     },
     "inflection": {
       "version": "1.10.0",
@@ -699,21 +1347,43 @@
       "integrity": "sha1-W//LEZetPoEFD44X4hZoCH7p6y8=",
       "optional": true
     },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
+    "ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
     "ip": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz",
       "integrity": "sha1-x+NWzeoiWucbNtcPLnGpK6TkJZA=",
       "optional": true
     },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
     },
     "is-my-ip-valid": {
       "version": "1.0.0",
@@ -751,14 +1421,12 @@
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "optional": true
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "optional": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "isarray": {
       "version": "0.0.1",
@@ -769,8 +1437,23 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "optional": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        }
+      }
     },
     "jsbn": {
       "version": "0.1.1",
@@ -813,6 +1496,19 @@
         "verror": "1.10.0"
       }
     },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "lcov-parse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
+      "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A="
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -826,12 +1522,14 @@
     "libbase64": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
-      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY="
+      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
+      "optional": true
     },
     "libmime": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz",
       "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
+      "optional": true,
       "requires": {
         "iconv-lite": "0.4.15",
         "libbase64": "0.1.0",
@@ -841,20 +1539,81 @@
         "iconv-lite": {
           "version": "0.4.15",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
-          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es="
+          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+          "optional": true
         }
       }
     },
     "libqp": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
-      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g="
+      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
+      "optional": true
     },
     "lodash": {
       "version": "4.17.10",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
-      "optional": true
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+    },
+    "lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
+    },
+    "lodash.concat": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.concat/-/lodash.concat-4.5.0.tgz",
+      "integrity": "sha1-sFOuAuSoAIWC5yVrnQK9ptA4A5U="
+    },
+    "lodash.find": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.find/-/lodash.find-4.6.0.tgz",
+      "integrity": "sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E="
+    },
+    "lodash.forown": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz",
+      "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68="
+    },
+    "lodash.intersection": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz",
+      "integrity": "sha1-ChG6Yx0OlcI8fy9Mu5ppLtF45wU="
+    },
+    "lodash.isplainobject": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+    },
+    "lodash.pick": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
+      "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM="
+    },
+    "lodash.pull": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.pull/-/lodash.pull-4.1.0.tgz",
+      "integrity": "sha1-YAYMxr1iW01FZ+wn3EXNG+nuwBI="
+    },
+    "lodash.upperfirst": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz",
+      "integrity": "sha1-E2Xt9DFIBIHvDRxolXpe2Z1J984="
+    },
+    "lodash.values": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.values/-/lodash.values-4.3.0.tgz",
+      "integrity": "sha1-o6bCsOvsxcLLocF+bmIP6BtT00c="
+    },
+    "log-driver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
+      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="
     },
     "log4js": {
       "version": "2.5.3",
@@ -887,7 +1646,7 @@
         },
         "follow-redirects": {
           "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
           "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
           "optional": true,
           "requires": {
@@ -934,6 +1693,7 @@
           "version": "2.10.1",
           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+          "optional": true,
           "requires": {
             "hoek": "2.16.3"
           }
@@ -991,7 +1751,8 @@
         "hoek": {
           "version": "2.16.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+          "optional": true
         },
         "http-signature": {
           "version": "1.1.1",
@@ -1062,6 +1823,11 @@
         }
       }
     },
+    "long": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
+      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
+    },
     "long-timeout": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz",
@@ -1128,24 +1894,109 @@
         }
       }
     },
+    "mali": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/mali/-/mali-0.6.1.tgz",
+      "integrity": "sha512-ccRH8sjVRpGIr4hhftUffJ3xAWG8EyRvu9Ynrx3tK9slh1wYurfOR1oTD27uXf612lyNXWuYNX7EI0l9u6g42w==",
+      "requires": {
+        "ascallback": "^1.1.1",
+        "coveralls": "^3.0.0",
+        "delegates": "^1.0.0",
+        "destroy": "^1.0.4",
+        "ee-first": "^1.1.1",
+        "error-inject": "^1.0.0",
+        "grpc-create-metadata": "^3.0.0",
+        "grpc-inspect": "^0.5.0",
+        "is-stream": "^1.1.0",
+        "lodash": "^4.17.0",
+        "lodash.camelcase": "^4.3.0",
+        "lodash.concat": "^4.5.0",
+        "lodash.find": "^4.6.0",
+        "lodash.forown": "^4.4.0",
+        "lodash.intersection": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.pick": "^4.4.0",
+        "lodash.pull": "^4.1.0",
+        "lodash.upperfirst": "^4.3.1",
+        "lodash.values": "^4.3.0",
+        "mali-call-types": "~0.1.0",
+        "mali-compose": "~1.0.0",
+        "p-map": "^1.2.0",
+        "pify": "^3.0.0"
+      }
+    },
+    "mali-call-types": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mali-call-types/-/mali-call-types-0.1.0.tgz",
+      "integrity": "sha1-1OoKWZSFkJCD2Y8dsAPEbTmkvso="
+    },
+    "mali-compose": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mali-compose/-/mali-compose-1.0.0.tgz",
+      "integrity": "sha512-Z6Nf7w0YOXStDMQ0RT6KMhmUdKy1YM+RIlQ0Wc/yNlun+MtNfvaszKYoJlwTZrCPJlIEFsNHKF6M9glawJf81A=="
+    },
     "mime-db": {
       "version": "1.33.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+      "optional": true
     },
     "mime-types": {
       "version": "2.1.18",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
       "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "optional": true,
       "requires": {
         "mime-db": "1.33.0"
       }
     },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "requires": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "mississippi": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-1.3.1.tgz",
+      "integrity": "sha512-/6rB8YXFbAtsUVRphIRQqB0+9c7VaPHCjVtvto+JqwVxgz8Zz+I+f68/JgQ+Pb4VlZb2svA9OtdXnHHsZz7ltg==",
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^1.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
     "mkdirp": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
@@ -1172,12 +2023,74 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "nan": {
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
+    },
+    "needle": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz",
+      "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==",
+      "requires": {
+        "debug": "^3.2.6",
+        "iconv-lite": "^0.4.4",
+        "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+        }
+      }
+    },
     "netmask": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
       "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
       "optional": true
     },
+    "node-pre-gyp": {
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz",
+      "integrity": "sha512-4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g==",
+      "requires": {
+        "detect-libc": "^1.0.2",
+        "mkdirp": "^0.5.3",
+        "needle": "^2.5.0",
+        "nopt": "^4.0.1",
+        "npm-packlist": "^1.1.6",
+        "npmlog": "^4.0.2",
+        "rc": "^1.2.7",
+        "rimraf": "^2.6.1",
+        "semver": "^5.3.0",
+        "tar": "^4.4.2"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
+      }
+    },
     "node-schedule": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/node-schedule/-/node-schedule-1.3.0.tgz",
@@ -1234,12 +2147,14 @@
     "nodemailer-fetch": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
-      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q="
+      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
+      "optional": true
     },
     "nodemailer-shared": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
       "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
+      "optional": true,
       "requires": {
         "nodemailer-fetch": "1.6.0"
       }
@@ -1269,7 +2184,56 @@
     "nodemailer-wellknown": {
       "version": "0.1.10",
       "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
-      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U="
+      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
+      "optional": true
+    },
+    "nopt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "requires": {
+        "abbrev": "1",
+        "osenv": "^0.1.4"
+      }
+    },
+    "npm-bundled": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "requires": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+    },
+    "npm-packlist": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "requires": {
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npmlog": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "requires": {
+        "are-we-there-yet": "~1.1.2",
+        "console-control-strings": "~1.1.0",
+        "gauge": "~2.7.3",
+        "set-blocking": "~2.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.8.2",
@@ -1277,11 +2241,24 @@
       "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
       "optional": true
     },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
       "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
     },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -1296,6 +2273,43 @@
         "wordwrap": "1.0.0"
       }
     },
+    "optjs": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz",
+      "integrity": "sha1-aabOicRCpEQDFBrS+bNwvVu29O4="
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
+    },
     "pac-proxy-agent": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
@@ -1345,6 +2359,55 @@
         }
       }
     },
+    "parallel-transform": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+      "requires": {
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
     "path-proxy": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz",
@@ -1365,8 +2428,12 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "optional": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -1386,7 +2453,8 @@
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "optional": true
     },
     "process-nextick-args": {
       "version": "1.0.7",
@@ -1394,6 +2462,17 @@
       "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
       "optional": true
     },
+    "protobufjs": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-5.0.3.tgz",
+      "integrity": "sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==",
+      "requires": {
+        "ascli": "~1",
+        "bytebuffer": "~5",
+        "glob": "^7.0.5",
+        "yargs": "^3.10.0"
+      }
+    },
     "proxy-agent": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz",
@@ -1421,6 +2500,41 @@
         }
       }
     },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+    },
+    "pump": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
+      "integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -1451,6 +2565,24 @@
         "unpipe": "1.0.0"
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        }
+      }
+    },
     "readable-stream": {
       "version": "1.1.14",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
@@ -1528,22 +2660,45 @@
         "when": "3.7.8"
       }
     },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
     "setprototypeof": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
       "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
       "optional": true
     },
+    "signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+    },
     "slack-node": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz",
@@ -1556,12 +2711,14 @@
     "smart-buffer": {
       "version": "1.1.15",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz",
-      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY="
+      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=",
+      "optional": true
     },
     "smtp-connection": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
       "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
+      "optional": true,
       "requires": {
         "httpntlm": "1.6.1",
         "nodemailer-shared": "1.1.0"
@@ -1580,6 +2737,7 @@
       "version": "1.1.10",
       "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz",
       "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=",
+      "optional": true,
       "requires": {
         "ip": "1.1.5",
         "smart-buffer": "1.1.15"
@@ -1588,7 +2746,8 @@
         "ip": {
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-          "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+          "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+          "optional": true
         }
       }
     },
@@ -1596,6 +2755,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
       "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
+      "optional": true,
       "requires": {
         "agent-base": "2.1.1",
         "extend": "3.0.1",
@@ -1613,6 +2773,11 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "optional": true
     },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
     "sshpk": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
@@ -1635,6 +2800,20 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "optional": true
     },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
+      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="
+    },
     "streamroller": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
@@ -1680,6 +2859,16 @@
         }
       }
     },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "requires": {
+        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
     "string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -1696,17 +2885,83 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "optional": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
     },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
       "optional": true
     },
+    "tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "requires": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      }
+    },
+    "text-encoding": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz",
+      "integrity": "sha1-45mpgiV6J22uQou5KEXLcb3CbRk="
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "process-nextick-args": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+          "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
     "thunkify": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
@@ -1728,6 +2983,11 @@
         "punycode": "1.4.1"
       }
     },
+    "traverse": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz",
+      "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc="
+    },
     "tsscmp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
@@ -1738,7 +2998,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "optional": true,
       "requires": {
         "safe-buffer": "5.1.2"
       }
@@ -1753,14 +3012,21 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "optional": true,
       "requires": {
         "prelude-ls": "1.1.2"
       }
     },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
     "underscore": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
-      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk="
+      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
+      "optional": true
     },
     "unpipe": {
       "version": "1.0.0",
@@ -1768,6 +3034,21 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "optional": true
     },
+    "uri-js": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
+      "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
+      "requires": {
+        "punycode": "^2.1.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+        }
+      }
+    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -1796,12 +3077,39 @@
       "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
       "optional": true
     },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
+    "window-size": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz",
+      "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY="
+    },
     "wordwrap": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "optional": true
     },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
     "xregexp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
@@ -1811,8 +3119,31 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "optional": true
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    },
+    "y18n": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+    },
+    "yargs": {
+      "version": "3.32.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
+      "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=",
+      "requires": {
+        "camelcase": "^2.0.1",
+        "cliui": "^3.0.3",
+        "decamelize": "^1.1.1",
+        "os-locale": "^1.4.0",
+        "string-width": "^1.0.1",
+        "window-size": "^0.1.4",
+        "y18n": "^3.2.0"
+      }
     }
   }
 }
diff --git a/gs-server/package.json b/gs-server/package.json
index c0fdc80..a7fd189 100644
--- a/gs-server/package.json
+++ b/gs-server/package.json
@@ -3,7 +3,7 @@
   "description": "game server demo written by node",
   "version": "0.1.0",
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.21.1",
     "gameserver-nodejs": "^3.8.3",
     "log4js": "^2.5.3",
     "node-schedule": "^1.3.0"