diff --git a/tgx-games-client/assets/Prefebs.meta b/tgx-games-client/assets/Prefebs.meta
new file mode 100644
index 0000000..4b572e8
--- /dev/null
+++ b/tgx-games-client/assets/Prefebs.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "b53fd94c-6d04-4e1e-967b-a9962d5c56bd",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/tgx-games-client/assets/Prefebs/role.meta b/tgx-games-client/assets/Prefebs/role.meta
new file mode 100644
index 0000000..c120749
--- /dev/null
+++ b/tgx-games-client/assets/Prefebs/role.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "f6db9553-6ca0-4260-9a81-f9cd1f0c53ad",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/tgx-games-client/assets/level1/UI.meta b/tgx-games-client/assets/level1/UI.meta
new file mode 100644
index 0000000..f42d4cb
--- /dev/null
+++ b/tgx-games-client/assets/level1/UI.meta
@@ -0,0 +1,9 @@
+{
+  "ver": "1.2.0",
+  "importer": "directory",
+  "imported": true,
+  "uuid": "085df255-5bfc-49de-a5cf-0a107a209406",
+  "files": [],
+  "subMetas": {},
+  "userData": {}
+}
diff --git a/tgx-games-client/assets/level1/scene/level1Scene.scene b/tgx-games-client/assets/level1/scene/level1Scene.scene
index 69142ce..548a0cb 100644
--- a/tgx-games-client/assets/level1/scene/level1Scene.scene
+++ b/tgx-games-client/assets/level1/scene/level1Scene.scene
@@ -219,7 +219,7 @@
     "node": {
       "__id__": 5
     },
-    "_enabled": true,
+    "_enabled": false,
     "__prefab": null,
     "roleItem": {
       "__uuid__": "b91905ff-fb95-4680-bcd6-5603f2b07dee",
diff --git a/tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts b/tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
index 69f5b83..725bb74 100644
--- a/tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
+++ b/tgx-games-client/assets/module_arean/scripts/AreanGameScene.ts
@@ -65,6 +65,7 @@ export class AreanGameScene extends Component {
 			assetManager.loadBundle("level1",()=>{
 				director.loadScene("scene/level1Scene");
 				tgxUIWaiting.hide();
+				this.onCompleteCallback();
 			})
 		}
 				
diff --git a/tgx-games-client/assets/module_arean/scripts/AreanManager.ts b/tgx-games-client/assets/module_arean/scripts/AreanManager.ts
index 327416d..d5d352b 100644
--- a/tgx-games-client/assets/module_arean/scripts/AreanManager.ts
+++ b/tgx-games-client/assets/module_arean/scripts/AreanManager.ts
@@ -1,5 +1,7 @@
 
 import {AreanConfigManager} from "db://assets/module_arean/scripts/DataConfig/AreanConfigManager";
+import { BattleView } from "../../level1/Script/BattleView";
+import { AreanPlayer } from "./AreanPlayer";
 
 export class AreanManager {
 
@@ -27,19 +29,18 @@ export class AreanManager {
 
 	public cfgMgr: AreanConfigManager = new AreanConfigManager();
 
-
-	// private battleView: BattleView = null;
-	//
-	// get BattleView(): BattleView {
-	// 	return this.battleView;
-	// }
-	// set BattleView(value: BattleView) {
-	// 	this.battleView = value;
-	// }
-	//
-	//
-	// player:AreanPlayer = null;
-	// playerGroup:AreanPlayer[] = [];
+	private battleView: BattleView = null;
+	
+	get BattleView(): BattleView {
+		return this.battleView;
+	}
+	set BattleView(value: BattleView) {
+		this.battleView = value;
+	}
+	
+	
+	player:AreanPlayer = null;
+	playerGroup:AreanPlayer[] = [];
 
 	/**
 	 * 初始化
diff --git a/tgx-games-client/settings/v2/packages/cocos-service.json b/tgx-games-client/settings/v2/packages/cocos-service.json
index 2aadceb..ba916fc 100644
--- a/tgx-games-client/settings/v2/packages/cocos-service.json
+++ b/tgx-games-client/settings/v2/packages/cocos-service.json
@@ -1,23 +1,23 @@
-{
-  "__version__": "3.0.7",
-  "game": {
-    "name": "未知游戏",
-    "app_id": "UNKNOW",
-    "c_id": "0"
-  },
-  "appConfigMaps": [
-    {
-      "app_id": "UNKNOW",
-      "config_id": "3e2173"
-    }
-  ],
-  "configs": [
-    {
-      "app_id": "UNKNOW",
-      "config_id": "3e2173",
-      "config_name": "Default",
-      "config_remarks": "",
-      "services": []
-    }
-  ]
-}
+{
+  "__version__": "3.0.7",
+  "game": {
+    "name": "未知游戏",
+    "app_id": "UNKNOW",
+    "c_id": "0"
+  },
+  "appConfigMaps": [
+    {
+      "app_id": "UNKNOW",
+      "config_id": "3e2173"
+    }
+  ],
+  "configs": [
+    {
+      "app_id": "UNKNOW",
+      "config_id": "3e2173",
+      "config_name": "Default",
+      "config_remarks": "",
+      "services": []
+    }
+  ]
+}
diff --git a/tgx-games-server/src/SrvGame/RoomArean.ts b/tgx-games-server/src/SrvGame/RoomArean.ts
index c77b393..7c8605c 100644
--- a/tgx-games-server/src/SrvGame/RoomArean.ts
+++ b/tgx-games-server/src/SrvGame/RoomArean.ts
@@ -493,8 +493,8 @@ export class RoomArean extends Room {
                             }
                             this.updateGameStatus(stage.afterCard, 3);
 
-                            //生成战报
-                            battleTime = this.battle();
+                            //生成战报，隐藏战斗
+                            //battleTime = this.battle();
                         }
                         break;
 
diff --git a/tgx-games-server/src/shared/protocols/public/arean/AreanTypeDef.ts b/tgx-games-server/src/shared/protocols/public/arean/AreanTypeDef.ts
index d1e68f0..21b1267 100644
--- a/tgx-games-server/src/shared/protocols/public/arean/AreanTypeDef.ts
+++ b/tgx-games-server/src/shared/protocols/public/arean/AreanTypeDef.ts
@@ -557,11 +557,20 @@ export enum GameStage {
 export enum stage {
     await = 0,
     career = 1,
+    /**
+     * 玩家选卡阶段，服务器接受玩家请求
+     */
     card = 2,
+    /**
+     * 演出阶段，通知前端演出
+     */
     battle = 3,
     equip = 4,
     treasure = 5,
     end = 6,
+    /**
+     * 演出前阶段，服务器计算所有玩家请求并发送给客户端全部玩家的数据
+     */
     afterCard = 7
 }