修改BUG

修改Ingame脚本复活 结束游戏 重新开始游戏

bin/h5/.rec

@@ -77,7 +77,6 @@ P 9ABD9CBD func3.png
 P 9AE7FF5E func4.png
 P CFFDECAE func5.png
 D MainView
-R 54B68F22 logo.png
 R 9E2456ED main1-1.png
 P FB70ABCE zhujiemian-1-1(1).png
 P 07FDD0FA zhujiemian-1-2(1).png
@@ -208,7 +207,6 @@ P FFE41E4D BoosterShoot1_00254.png
 P 0147D2E2 BoosterShoot1_00255.png
 P 0147D2E2 BoosterShoot1_00256.png
 D WinView
-P 364C6A04 black.png
 R 2BA03ECE guoguan-1-1.png
 P 61A8584F guoguan-1-2.png
 P 460AED94 guoguan-1-3.png

laya/.laya

@@ -1,6 +1,6 @@
 <project version="2.0">
-   <asynRes>img,temp,sound                                                                                                </asynRes>
-   <unDealRes>embed                                                                                                </unDealRes>
+   <asynRes>img,temp,sound                                                                                                      </asynRes>
+   <unDealRes>embed                                                                                                      </unDealRes>
    <resTypes>png,jpg   </resTypes>
    <resExportPath>bin/h5   </resExportPath>
    <asynResExportPath>bin   </asynResExportPath>
@@ -15,7 +15,7 @@ var Dialog=laya.ui.Dialog;]]>   </codeImportsJS>
    <shareResPath/>
    <codeType>1   </codeType>
    <resCanCompress/>
-   <resPublishQuality>80                                                                                                </resPublishQuality>
+   <resPublishQuality>80                                                                                                      </resPublishQuality>
    <langPath/>
    <defaultFont/>
    <codeImportsTS><![CDATA[import View=Laya.View;
@@ -29,7 +29,7 @@ import Scene=Laya.Scene;]]>   </codeImportsTS>
    <trimempty>false   </trimempty>
    <startScene>MainScene.scene   </startScene>
    <engineType>2D   </engineType>
-   <scaleMode>showall   </scaleMode>
+   <scaleMode>fixedwidth   </scaleMode>
    <screenMode>none   </screenMode>
    <alignV>top   </alignV>
    <alignH>left   </alignH>

laya/pages/InGameScene.scene

@@ -2,7 +2,7 @@
     "x":0,
     "type":"Scene",
     "selectedBox":2,
-    "selecteID":52,
+    "selecteID":4,
     "searchKey":"Scene",
     "props":{"width":720,"sceneColor":"#000000","pref":"@Prefab:Pr","height":1280},
     "nodeParent":-1,
@@ -151,7 +151,7 @@
             "x":15,
             "type":"Image",
             "searchKey":"Image,BG",
-            "props":{"y":0,"x":0,"top":0,"skin":"InGameView/groundplane.png","sizeGrid":"179,113,184,121","right":0,"name":"BG","left":0,"bottom":0},
+            "props":{"y":0,"x":0,"var":"BG","top":0,"skin":"InGameView/groundplane.png","sizeGrid":"179,113,184,121","right":0,"left":0,"bottom":0},
             "nodeParent":2,
             "label":"BG",
             "isDirectory":false,

laya/pages/MainScene.scene

@@ -2,7 +2,7 @@
     "x":0,
     "type":"View",
     "selectedBox":2,
-    "selecteID":41,
+    "selecteID":15,
     "searchKey":"View",
     "props":{"width":720,"sceneColor":"#000000","height":1280},
     "nodeParent":-1,
@@ -18,7 +18,7 @@
             "x":15,
             "type":"Image",
             "searchKey":"Image,BG",
-            "props":{"y":0,"x":0,"skin":"MainView/main1-1.png","name":"BG","alpha":1},
+            "props":{"var":"BG","top":0,"skin":"MainView/main1-1.png","right":0,"left":0,"bottom":0,"alpha":1},
             "nodeParent":2,
             "label":"BG",
             "isDirectory":false,
@@ -58,150 +58,6 @@
         },
         {
             "x":15,
-            "type":"Box",
-            "searchKey":"Box,decorate",
-            "props":{"name":"decorate"},
-            "nodeParent":2,
-            "label":"decorate",
-            "isOpen":false,
-            "isDirectory":true,
-            "isAniNode":true,
-            "hasChild":true,
-            "compId":15,
-            "child":[
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"y":868,"x":492,"width":90,"skin":"Ball/blast-10.png","pivotY":45,"pivotX":45,"height":90},
-                    "nodeParent":15,
-                    "label":"Image",
-                    "isOpen":false,
-                    "isDirectory":true,
-                    "isAniNode":true,
-                    "hasChild":true,
-                    "compId":20,
-                    "child":[
-                        {
-                            "type":"FontClip",
-                            "searchKey":"FontClip",
-                            "props":{"y":45,"x":45,"width":25,"value":"8","skin":"Ball/43.png","sheet":"0123456789","pivotY":15,"pivotX":13,"height":29},
-                            "nodeParent":20,
-                            "label":"FontClip",
-                            "isDirectory":false,
-                            "isAniNode":true,
-                            "hasChild":false,
-                            "compId":21,
-                            "child":[
-                                ]
-                        }]
-                },
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"y":840,"x":188,"width":110,"skin":"Ball/blast-12.png","pivotY":55,"pivotX":55,"height":110},
-                    "nodeParent":15,
-                    "label":"Image",
-                    "isOpen":false,
-                    "isDirectory":true,
-                    "isAniNode":true,
-                    "hasChild":true,
-                    "compId":24,
-                    "child":[
-                        {
-                            "type":"FontClip",
-                            "searchKey":"FontClip",
-                            "props":{"y":55,"x":55,"width":72,"value":"32","skin":"Ball/44.png","sheet":"0123456789","scaleY":0.8,"scaleX":0.8,"pivotY":22,"pivotX":36,"height":43},
-                            "nodeParent":24,
-                            "label":"FontClip",
-                            "isDirectory":false,
-                            "isAniNode":true,
-                            "hasChild":false,
-                            "compId":25,
-                            "child":[
-                                ]
-                        }]
-                },
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"y":693,"x":484,"width":150,"skin":"Ball/blast-13.png","height":150},
-                    "nodeParent":15,
-                    "label":"Image",
-                    "isOpen":false,
-                    "isDirectory":true,
-                    "isAniNode":true,
-                    "hasChild":true,
-                    "compId":35,
-                    "child":[
-                        {
-                            "type":"FontClip",
-                            "searchKey":"FontClip",
-                            "props":{"y":75,"x":75,"width":72,"value":"64","skin":"Ball/44.png","sheet":"0123456789","pivotY":22,"pivotX":36,"height":43},
-                            "nodeParent":35,
-                            "label":"FontClip",
-                            "isDirectory":false,
-                            "isAniNode":true,
-                            "hasChild":false,
-                            "compId":36,
-                            "child":[
-                                ]
-                        }]
-                },
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"y":593,"x":150,"width":170,"skin":"Ball/blast-14.png","height":170},
-                    "nodeParent":15,
-                    "label":"Image",
-                    "isOpen":true,
-                    "isDirectory":true,
-                    "isAniNode":true,
-                    "hasChild":true,
-                    "compId":37,
-                    "child":[
-                        {
-                            "type":"FontClip",
-                            "searchKey":"FontClip",
-                            "props":{"y":85,"x":85,"width":108,"value":"128","skin":"Ball/44.png","sheet":"0123456789","pivotY":22,"pivotX":54,"height":43},
-                            "nodeParent":37,
-                            "label":"FontClip",
-                            "isDirectory":false,
-                            "isAniNode":true,
-                            "hasChild":false,
-                            "compId":40,
-                            "child":[
-                                ]
-                        }]
-                },
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"y":757,"x":131,"width":90,"skin":"Ball/blast-10.png","pivotY":45,"pivotX":45,"height":90},
-                    "nodeParent":15,
-                    "label":"Image",
-                    "isOpen":false,
-                    "isDirectory":true,
-                    "isAniNode":true,
-                    "hasChild":true,
-                    "compId":38,
-                    "child":[
-                        {
-                            "type":"FontClip",
-                            "searchKey":"FontClip",
-                            "props":{"y":45,"x":45,"width":25,"value":"8","skin":"Ball/43.png","sheet":"0123456789","pivotY":15,"pivotX":13,"height":29},
-                            "nodeParent":38,
-                            "label":"FontClip",
-                            "isDirectory":false,
-                            "isAniNode":true,
-                            "hasChild":false,
-                            "compId":39,
-                            "child":[
-                                ]
-                        }]
-                }]
-        },
-        {
-            "x":15,
             "type":"Button",
             "searchKey":"Button,RankBtn",
             "props":{"y":994,"x":317,"var":"RankBtn","stateNum":"1","skin":"MainView/zhujiemian-1-3(1).png"},
@@ -255,6 +111,141 @@
             "compId":41,
             "child":[
                 ]
+        },
+        {
+            "x":15,
+            "type":"Image",
+            "searchKey":"Image",
+            "props":{"y":868,"x":492,"width":90,"skin":"Ball/blast-10.png","pivotY":45,"pivotX":45,"height":90},
+            "nodeParent":2,
+            "label":"Image",
+            "isOpen":false,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":20,
+            "child":[
+                {
+                    "type":"FontClip",
+                    "searchKey":"FontClip",
+                    "props":{"y":45,"x":45,"width":25,"value":"8","skin":"Ball/43.png","sheet":"0123456789","pivotY":15,"pivotX":13,"height":29},
+                    "nodeParent":20,
+                    "label":"FontClip",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":21,
+                    "child":[
+                        ]
+                }]
+        },
+        {
+            "x":15,
+            "type":"Image",
+            "searchKey":"Image",
+            "props":{"y":840,"x":188,"width":110,"skin":"Ball/blast-12.png","pivotY":55,"pivotX":55,"height":110},
+            "nodeParent":2,
+            "label":"Image",
+            "isOpen":false,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":24,
+            "child":[
+                {
+                    "type":"FontClip",
+                    "searchKey":"FontClip",
+                    "props":{"y":55,"x":55,"width":72,"value":"32","skin":"Ball/44.png","sheet":"0123456789","scaleY":0.8,"scaleX":0.8,"pivotY":22,"pivotX":36,"height":43},
+                    "nodeParent":24,
+                    "label":"FontClip",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":25,
+                    "child":[
+                        ]
+                }]
+        },
+        {
+            "x":15,
+            "type":"Image",
+            "searchKey":"Image",
+            "props":{"y":693,"x":484,"width":150,"skin":"Ball/blast-13.png","height":150},
+            "nodeParent":2,
+            "label":"Image",
+            "isOpen":false,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":35,
+            "child":[
+                {
+                    "type":"FontClip",
+                    "searchKey":"FontClip",
+                    "props":{"y":75,"x":75,"width":72,"value":"64","skin":"Ball/44.png","sheet":"0123456789","pivotY":22,"pivotX":36,"height":43},
+                    "nodeParent":35,
+                    "label":"FontClip",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":36,
+                    "child":[
+                        ]
+                }]
+        },
+        {
+            "x":15,
+            "type":"Image",
+            "searchKey":"Image",
+            "props":{"y":593,"x":150,"width":170,"skin":"Ball/blast-14.png","height":170},
+            "nodeParent":2,
+            "label":"Image",
+            "isOpen":false,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":37,
+            "child":[
+                {
+                    "type":"FontClip",
+                    "searchKey":"FontClip",
+                    "props":{"y":85,"x":85,"width":108,"value":"128","skin":"Ball/44.png","sheet":"0123456789","pivotY":22,"pivotX":54,"height":43},
+                    "nodeParent":37,
+                    "label":"FontClip",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":40,
+                    "child":[
+                        ]
+                }]
+        },
+        {
+            "x":15,
+            "type":"Image",
+            "searchKey":"Image",
+            "props":{"y":757,"x":131,"width":90,"skin":"Ball/blast-10.png","pivotY":45,"pivotX":45,"height":90},
+            "nodeParent":2,
+            "label":"Image",
+            "isOpen":false,
+            "isDirectory":true,
+            "isAniNode":true,
+            "hasChild":true,
+            "compId":38,
+            "child":[
+                {
+                    "type":"FontClip",
+                    "searchKey":"FontClip",
+                    "props":{"y":45,"x":45,"width":25,"value":"8","skin":"Ball/43.png","sheet":"0123456789","pivotY":15,"pivotX":13,"height":29},
+                    "nodeParent":38,
+                    "label":"FontClip",
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":39,
+                    "child":[
+                        ]
+                }]
         }],
     "animations":[
         {

laya/pages/ReviveView.scene

@@ -1,8 +1,8 @@
 {
     "x":0,
     "type":"Scene",
-    "selectedBox":2,
-    "selecteID":4,
+    "selectedBox":6,
+    "selecteID":7,
     "searchKey":"Scene",
     "props":{"width":720,"sceneColor":"#000000","height":1280},
     "nodeParent":-1,
@@ -21,7 +21,7 @@
             "props":{"y":17,"x":0,"skin":"ReviveView/fuhuo-1-1.png"},
             "nodeParent":2,
             "label":"Image",
-            "isOpen":null,
+            "isOpen":false,
             "isDirectory":true,
             "isAniNode":true,
             "hasChild":true,
@@ -49,16 +49,17 @@
             "props":{"y":449,"x":370,"width":147,"skin":"ReviveView/fuhuo-1-4.png","pivotY":74,"pivotX":74,"height":147},
             "nodeParent":2,
             "label":"Image",
-            "isOpen":false,
+            "isOpen":true,
             "isDirectory":true,
             "isAniNode":true,
             "hasChild":true,
             "compId":6,
             "child":[
                 {
+                    "x":30,
                     "type":"Text",
                     "searchKey":"Text,Time",
-                    "props":{"y":70,"x":74,"width":103,"var":"Time","valign":"middle","text":"5","pivotY":58,"pivotX":52,"height":117,"fontSize":125,"color":"#f05929","align":"center"},
+                    "props":{"y":70,"x":74,"width":103,"var":"Time","valign":"middle","text":"9","pivotY":58,"pivotX":52,"height":117,"fontSize":125,"color":"#f05929","align":"center"},
                     "nodeParent":6,
                     "label":"Time",
                     "isDirectory":false,

src/GameConfig.ts

@@ -6,7 +6,7 @@ import Ball from "./Main/Ball"
 export default class GameConfig{
     static width:number=720;
     static height:number=1280;
-    static scaleMode:string="showall";
+    static scaleMode:string="fixedwidth";
     static screenMode:string="none";
     static alignV:string="top";
     static alignH:string="left";

src/Main/GameControl.ts

@@ -30,12 +30,18 @@ export class GameControl{
         GamePool.Instance.FallDown(30);
     }
     GameLose(){
-        Laya.timer.once(3000,this,()=>{
-            ViewManager.Instance.OpenPopView(ViewType.FailureView);
+        Laya.timer.once(2000,this,()=>{
+            if(GameManager.Instance.ReviveNum>0){
+                ViewManager.Instance.OpenPopView(ViewType.ReviveView);
+                GameManager.Instance.ReviveNum--;
+            }
+            else{
+                ViewManager.Instance.OpenPopView(ViewType.FailureView);
+            }
         })
     }
     GameWin(){
-        Laya.timer.once(3000,this,()=>{
+        Laya.timer.once(2000,this,()=>{
             ViewManager.Instance.OpenPopView(ViewType.WinView);
         })
     }

src/Main/GameManager.ts

@@ -3,6 +3,8 @@ import { AccountManager } from "../Net/AccountManager";
 
 export class GameManager{
     private static ins:GameManager;
+    //复活次数
+    public ReviveNum:number = 1;
     //记录本关卡的进度分数
     public ScoreProgress:number = 0;
     //目标点
@@ -22,7 +24,7 @@ export class GameManager{
    public STAGE:number = 0;
     constructor(){
         GameManager.ins = this;
-        EventManager.StageOn(StageMode.Start,this,this.Start)
+        EventManager.StageOn(StageMode.ReStart,this,this.Fresh)
     }
     public static get Instance():GameManager{
         if(GameManager.ins){
@@ -32,8 +34,12 @@ export class GameManager{
             return new GameManager();
         }
     }
-    Start(){
-        
+    Fresh(){
+        this.ScoreProgress = 0;
+        this.ReviveNum = 0;
+
     }
+     
+    
 
 }

src/Tool/EventManager.ts

@@ -1,7 +1,7 @@
 //道具种类
 export enum PropEffecf{NONE,DOUBLE,HAMMER,UP,CLEARLAST,CLEARTWO }
 //舞台状态
-export enum StageMode{ReStart,Start,Lose,Win,Clone};
+export enum StageMode{ReStart,Start,Lose,Win,Clone,Over,Revive};
 export class EventManager{
     private static Instance:Laya.EventDispatcher = new Laya.EventDispatcher();
     public static PropState:PropEffecf = PropEffecf.NONE;

src/Tool/GamePool.ts

@@ -19,6 +19,7 @@ export  class GamePool  {
 
     constructor() {
         GamePool.Ins = this;
+        EventManager.StageOn(StageMode.Start,this,this.FreshScore);
         this.Init();
       }
     public static get Instance():GamePool{
@@ -33,7 +34,7 @@ export  class GamePool  {
         for (let i = 0; i < 14; i++) {
             this.ReadJSON(i);
         }
-        this.FreshScore();
+        // this.FreshScore();
     }
     ReadJSON(i:number){
         Laya.loader.create("Prefab/"+this.BallPrefab[i]+".json",Laya.Handler.create(this,this.creat));
@@ -83,7 +84,7 @@ export  class GamePool  {
     //获取本关卡最小球 及 次小球
     FreshScore(){
         let level = JsonManager.Level;
-        let stage = level[2-1];
+        let stage = level[GameManager.Instance.STAGE];
         let edge = stage.edge.split(";");
         let min =Number(edge[0]);
         let minnext = Number(edge[1]);

src/View/FailureView.ts

@@ -43,11 +43,12 @@ export default class FailureView extends ui.FailureViewUI implements SC{
         ServerManager.Instance.SendHttp(BlastToMerge.JieShu,args,Laya.Handler.create(this,this.Try),null);
     }
     BackMain(){
-        EventManager.StageTrigger(StageMode.ReStart);
+        EventManager.StageTrigger(StageMode.Over);
         ViewManager.Instance.ShowView(ViewType.MainView);
     }
     Try(){
         EventManager.StageTrigger(StageMode.ReStart);
+        ViewManager.Instance.ClosePopView(ViewType.FailureView);
     }
     
 

src/View/InGameView.ts

@@ -22,6 +22,8 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         EventManager.StageOn(StageMode.Win,this,this.Win);
         EventManager.StageOn(StageMode.Lose,this,this.Lose);
         EventManager.StageOn(StageMode.ReStart,this,this.ReStart);
+        EventManager.StageOn(StageMode.Over,this,this.Over)
+        EventManager.StageOn(StageMode.Revive,this,this.Revive);
         // EventManager.StageOn(StageMode.Lose,this,this.)
     }
     public static get Instance():InGameView{
@@ -49,9 +51,11 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         this.doublebtn.clickHandler = new Laya.Handler(this,this.ClickDouble);
         this.hammerbtn.clickHandler = new Laya.Handler(this,this.ClickHammer);
         this.height = Laya.stage.height; 
+        this.BG.height = Laya.stage.height;
         Laya.stage.on(Laya.Event.RESIZE,this,()=>
         {
             this.height = Laya.stage.height;
+            this.BG.height = Laya.stage.height;
         })
     }
     //添加预设
@@ -150,7 +154,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     //进度条
     Progress(){
         this.LevelProgress.value = this.Ratio;
-        if(GameManager.Instance.ScoreProgress>Number(this.RequireScore.text)){
+        if(GameManager.Instance.ScoreProgress>=Number(this.RequireScore.text)){
             GameManager.Instance.ScoreProgress = Number(this.RequireScore.text);
             this.NowScore.text = GameManager.Instance.ScoreProgress.toString();
             EventManager.StageTrigger(StageMode.Win);
@@ -302,23 +306,47 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     }
     //清除舞台上的球
     ClearStage(){
-        let num = 0;
+        if(this.prefabbox.destroyed)return
         for (let i = this.prefabbox.numChildren-1; i > -1; i--) {
             let ball = this.prefabbox.getChildAt(i) as Laya.Image;
-            Laya.timer.clearAll(ball);
             let _rig = ball.getComponent(Laya.RigidBody) as Laya.RigidBody;
             let _collider = ball.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
             _collider.enabled = false;
             _rig.enabled = false;
+            Laya.timer.clearAll(ball);
             ball.removeSelf();
             ball.destroy();
-            num++;
         }
+    }
+    //游戏结束
+    Over(){
+        this.ClearStage();
+        EventManager.StageOff(StageMode.Clone,this,this.AddPrefab);
+        EventManager.StageOff(StageMode.Win,this,this.Win);
+        EventManager.StageOff(StageMode.Lose,this,this.Lose);
+        EventManager.StageOff(StageMode.ReStart,this,this.ReStart);
+        EventManager.StageOff(StageMode.Over,this,this.Over);
+        EventManager.StageOff(StageMode.Revive,this,this.Revive);
         //清除碰撞器
         this.ClearCollider(this.BottomCollider);
         this.ClearCollider(this.RightCollider);
         this.ClearCollider(this.LeftCollider);
     }
+    //复活
+    Revive(){
+        for (let i = this.prefabbox.numChildren-1; i >-1 ; i--) {
+            let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+            let ball = prefab.getComponent(Ball) as Ball;
+            if(ball.score == GameManager.Instance.MinBall){
+                GameManager.Instance.ScoreProgress += ball.score;
+                prefab.removeSelf();
+            }
+        }
+        Laya.timer.once(1000,this,()=>{
+            this.LoseView = true;
+            Laya.timer.frameLoop(2,this,this.CheckHeight);
+        })
+    }
     //游戏胜利
     Win(){
         Laya.timer.clear(this,this.CheckHeight);
@@ -327,9 +355,11 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     Lose(){
         Laya.timer.clear(this,this.CheckHeight);
     }
-    //舞台重置
+    //再来一局
     ReStart(){
         this.ClearStage();
+        this.ScoreRefresh();
+        GamePool.Instance.FallDown(30);
     }
     //清除碰撞器
     ClearCollider(_node:Laya.Image){
@@ -340,9 +370,8 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         _node.removeSelf();
         _node.destroy();
     }
-    
     Close(){
-        
+        Laya.timer.clearAll(this);
     }
     
     

src/View/MainView.ts

@@ -38,6 +38,13 @@ export default class MainView extends ui.MainSceneUI implements SC{
         this.SignBtn.clickHandler = Laya.Handler.create(this,this.ClickSign);
         this.LotteryBtn.clickHandler = Laya.Handler.create(this,this.ClickLottery);
         this.SetBtn.clickHandler = Laya.Handler.create(this,this.ClickSet);
+        this.height = Laya.stage.height; 
+        this.BG.height = Laya.stage.height;
+        Laya.stage.on(Laya.Event.RESIZE,this,()=>
+        {
+            this.height = Laya.stage.height;
+            this.BG.height = Laya.stage.height;
+        })
     }
     ClickStart(){
         var agrs = [{ "t": AccountManager.Instance.ServerTime.toString() }];

src/View/ReviveView.ts

@@ -1,5 +1,6 @@
 import { ui } from "../ui/layaMaxUI";
 import { SC, ViewManager, ViewType } from "./ViewManager";
+import { EventManager, StageMode } from "../Tool/EventManager";
 
 export default class ReviveView extends ui.ReviveViewUI implements SC{
     private static ins:ReviveView;
@@ -15,18 +16,52 @@ export default class ReviveView extends ui.ReviveViewUI implements SC{
         }
     }
     Show(){
-        this.NoBtn.clickHandler = Laya.Handler.create(this,this.ClickClose)
+        this.VideoBtn.clickHandler = Laya.Handler.create(this,this.VideoRevive)
+        this.NoBtn.visible = false;
+        Laya.timer.once(1000,this,()=>{
+            this.NoBtn.visible = true;
+            this.NoBtn.clickHandler = Laya.Handler.create(this,this.DontRevive,null,false);
+        })
+        this.count = true;
+        Laya.timer.loop(1000,this,this.CountTime);
         this.height = Laya.stage.height; 
         Laya.stage.on(Laya.Event.RESIZE,this,()=>
         {
             this.height = Laya.stage.height;
         })
     }
+     time = 9;
+     count = false;
+     fuhuo = false;
+     //倒计时
+     CountTime()
+     {
+         if(this.count && this.time > 0)
+         {
+             this.time -= 1;
+             this.Time.text = this.time.toString();
+             if(this.time < 1)
+             {
+                Laya.timer.clear(this,this.CountTime);
+                this.DontRevive();
+             }
+         }
+     }
+     //不用复活
+     DontRevive(){
+         Laya.timer.clear(this,this.CountTime);
+         this.count = false;
+         ViewManager.Instance.OpenPopView(ViewType.FailureView);
+     }
+     //视频复活
+     VideoRevive(){
+        Laya.timer.clear(this,this.CountTime);
+        this.count = false;
+        EventManager.StageTrigger(StageMode.Revive);
+        ViewManager.Instance.ClearPopViews();
+     }
     Close(){
-        
-    }
-    ClickClose(){
-        ViewManager.Instance.ShowView(ViewType.MainView);
+        Laya.timer.clearAll(this);
     }
 
 } 

src/View/ViewManager.ts

@@ -87,6 +87,7 @@ export class ViewManager{
         GuangGao.Clear();
         this.ClosePopView(ViewType.WinView);
         this.ClosePopView(ViewType.FailureView);
+        this.ClosePopView(ViewType.ReviveView);
         //this.ClosePopView(ViewType.NewRewardView);
     }
     CreateView(_viewtype:ViewType){

src/View/WinView.ts

@@ -4,6 +4,8 @@ import { ServerManager, BlastToMerge } from "../Net/ServerManager";
 import { AccountManager } from "../Net/AccountManager";
 import MainView from "./MainView";
 import { EventManager, StageMode } from "../Tool/EventManager";
+import { GameManager } from "../Main/GameManager";
+import { GamePool } from "../Tool/GamePool";
 
 export default class WinView extends ui.WinViewUI implements SC{
     private static ins:WinView;
@@ -20,6 +22,7 @@ export default class WinView extends ui.WinViewUI implements SC{
     }
     Show(){
         this.BackBtn.clickHandler = Laya.Handler.create(this,this.ClickBack);
+        this.NextBtn.clickHandler = new Laya.Handler(this,this.NextLevel);
         this.height = Laya.stage.height; 
         this.BG.height = Laya.stage.height;
         Laya.stage.on(Laya.Event.RESIZE,this,()=>
@@ -43,12 +46,15 @@ export default class WinView extends ui.WinViewUI implements SC{
     }
     //返回主界面
     BackMain(){
-        EventManager.StageTrigger(StageMode.ReStart);
+        EventManager.StageTrigger(StageMode.Over);
         ViewManager.Instance.ShowView(ViewType.MainView);
     }
     //下一关
     NextLevel(){
+        GameManager.Instance.STAGE = Number(AccountManager.Instance.curplayerData.GainAccount("stage"));
+        GamePool.Instance.FreshScore();
         EventManager.StageTrigger(StageMode.ReStart);
+        ViewManager.Instance.ClearPopViews();
     }
 
 }