bug fix

matchvs · Jun 5, 2019 · 84221c7 · 84221c7
1 parent ad2c716
commit 84221c7
Show file tree

Hide file tree

Showing 47 changed files with 1,786 additions and 300 deletions.
diff --git a/client/manifest.json b/client/manifest.json
@@ -13,23 +13,53 @@
 		"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",
 		"bin-debug/logic/battle/CardControl.js",
 		"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,15 +74,15 @@
 		"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",
 		"bin-debug/logic/network/Resolver/CallLandLordResolver.js",
 		"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"
 	]
 }
diff --git 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
@@ -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
@@ -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
diff --git a/client/src/efinal/App.ts 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);
+
+	}
+}
diff --git a/client/src/efinal/ArrayUtil.ts b/client/src/efinal/ArrayUtil.ts
@@ -0,0 +1,5 @@
+class ArrayUtil {
+    public static clear(arr: Array<any>) {
+        arr && (arr.length = 0);
+    }
+}