13213

.rpt2_cache/rpt2_4a9d91541e38d5aa3994fade33b06c6f8ad825fc/code/cache/2072c14a6957396af4409b2ae9d9ca99c1462cc8

@@ -0,0 +1,5 @@
+{
+  "code": "export class CheckMain {\r\n}\r\nCheckMain.Creat = false;\r\n//# sourceMappingURL=CheckMain.js.map",
+  "references": [],
+  "map": "{\"version\":3,\"file\":\"CheckMain.js\",\"sourceRoot\":\"\",\"sources\":[\"../../../src/Main/CheckMain.ts\"],\"names\":[],\"mappings\":\"AAAA,MAAM,OAAO,SAAS;;AACJ,eAAK,GAAY,KAAK,CAAC\"}"
+}

bin/GiftPrefab/Gift.json

@@ -0,0 +1 @@
+{"type":"Image","props":{"y":0,"x":0,"width":110,"var":"Gift","skin":"InGameView/giftbox.png","presetID":1,"name":"Gift","isPresetRoot":true,"height":110,"anchorY":0.5,"anchorX":0.5},"compId":740,"child":[{"type":"Script","props":{"presetID":3,"gravityScale":3,"runtime":"laya.physics.RigidBody"},"compId":747},{"type":"Script","props":{"restitution":0.5,"radius":55,"presetID":4,"runtime":"laya.physics.CircleCollider"},"compId":748}],"loadList":["InGameView/giftbox.png"],"loadList3D":[]}

bin/h5/.rec

@@ -66,11 +66,14 @@ P B34E5C7C BoosterHammer1_00238.png
 P 545B3AB1 BoosterShoot1_00240.png
 P 47D8D47E border2.png
 P 8F4A6E0E borderbottom.png
+P 259B3037 Box-01.png
 R 44254EA5 colliderbottom.png
+P C3508F90 giftbox.png
 P 23B7C586 groundplane.png
 P CB491264 jindutiao-1-2$bar.png
 P 59C421CC jindutiao-1-2.png
 P 4BE2F47C jindutiao-1-3.png
+P 2734AAC8 kuang.png
 P 3303B7C6 yindao.png
 R A181F51D youxinei-1-1.png
 R 151DA56A youxinei-1-2.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;
@@ -46,7 +46,7 @@ import Scene=Laya.Scene;]]>   </codeImportsTS>
    <idePath/>
    <ver>2.0   </ver>
    <stat>false   </stat>
-   <physicsDebug>false   </physicsDebug>
+   <physicsDebug>true   </physicsDebug>
    <toJsonScene>true   </toJsonScene>
    <compressTexture>false   </compressTexture>
    <libProjectPath/>

laya/pages/GetRewardView.scene

@@ -2,7 +2,7 @@
     "x":0,
     "type":"Scene",
     "selectedBox":2,
-    "selecteID":9,
+    "selecteID":3,
     "searchKey":"Scene",
     "props":{"width":720,"sceneColor":"#000000","height":1280},
     "nodeParent":-1,
@@ -18,7 +18,7 @@
             "x":15,
             "type":"Image",
             "searchKey":"Image",
-            "props":{"y":488,"x":360,"width":696,"skin":"WinView/guoguan-1-7.png","pivotY":376,"pivotX":348,"height":720},
+            "props":{"y":472,"x":360,"width":696,"skin":"WinView/guoguan-1-7.png","height":720,"anchorY":0.5,"anchorX":0.5},
             "nodeParent":2,
             "label":"Image",
             "isOpen":false,

laya/pages/InGameScene.scene

@@ -662,121 +662,6 @@
                         ]
                 }],
             "$HIDDEN":true
-        },
-        {
-            "x":15,
-            "type":"Image",
-            "searchKey":"Image",
-            "props":{"y":827,"x":280,"presetID":1,"preset":"laya/pages/GiftPrefab/Gift.prefab"},
-            "nodeParent":2,
-            "label":"Image(Gift)",
-            "isOpen":false,
-            "isDirectory":true,
-            "isAniNode":true,
-            "hasChild":true,
-            "compId":748,
-            "child":[
-                {
-                    "type":"ChainCollider",
-                    "switchAble":true,
-                    "searchKey":"ChainCollider",
-                    "removeAble":true,
-                    "props":{"presetID":2,"preset":"laya/pages/GiftPrefab/Gift.prefab"},
-                    "nodeParent":748,
-                    "label":"ChainCollider(Gift)",
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":746,
-                    "child":[
-                        ]
-                },
-                {
-                    "type":"RigidBody",
-                    "switchAble":true,
-                    "searchKey":"RigidBody",
-                    "removeAble":true,
-                    "props":{"presetID":3,"preset":"laya/pages/GiftPrefab/Gift.prefab"},
-                    "nodeParent":748,
-                    "label":"RigidBody(Gift)",
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":747,
-                    "child":[
-                        ]
-                }]
-        },
-        {
-            "x":15,
-            "type":"Image",
-            "searchKey":"Image",
-            "props":{"y":809,"x":415,"presetID":1,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-            "nodeParent":2,
-            "label":"Image(TimeGift)",
-            "isOpen":false,
-            "isDirectory":true,
-            "isAniNode":true,
-            "hasChild":true,
-            "compId":749,
-            "child":[
-                {
-                    "type":"Image",
-                    "searchKey":"Image",
-                    "props":{"presetID":2,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-                    "nodeParent":749,
-                    "label":"kuang",
-                    "isOpen":true,
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":742,
-                    "child":[
-                        ]
-                },
-                {
-                    "type":"ChainCollider",
-                    "switchAble":true,
-                    "searchKey":"ChainCollider",
-                    "removeAble":true,
-                    "props":{"presetID":3,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-                    "nodeParent":749,
-                    "label":"ChainCollider(TimeGift)",
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":744,
-                    "child":[
-                        ]
-                },
-                {
-                    "type":"RigidBody",
-                    "switchAble":true,
-                    "searchKey":"RigidBody",
-                    "removeAble":true,
-                    "props":{"presetID":4,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-                    "nodeParent":749,
-                    "label":"RigidBody(TimeGift)",
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":745,
-                    "child":[
-                        ]
-                },
-                {
-                    "type":"Text",
-                    "searchKey":"Text",
-                    "props":{"presetID":5,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-                    "nodeParent":749,
-                    "label":"CountDown",
-                    "isDirectory":false,
-                    "isAniNode":true,
-                    "hasChild":false,
-                    "compId":743,
-                    "child":[
-                        ]
-                }]
         }],
     "animations":[
         {

src/GameConfig.ts

@@ -14,7 +14,7 @@ export default class GameConfig{
     static sceneRoot:string="";
     static debug:boolean=false;
     static stat:boolean=false;
-    static physicsDebug:boolean=false;
+    static physicsDebug:boolean=true;
     static exportSceneToJson:boolean=true;
     constructor(){}
     static init(){

src/Main/Gift.ts

@@ -1,5 +1,15 @@
+import { ViewManager, ViewType } from "../View/ViewManager";
+import { GamePool } from "../Tool/GamePool";
+
 export default class Gift extends Laya.Script{
     private static ins:Gift;
+    //礼盒种类
+    public type:number = 0;
+    //礼物序号
+    public GiftIndex:number = 0;
+    //礼物数量
+    public GiftNum:number = 0;
+
     constructor(){
         super();
         Gift.ins = this;
@@ -12,14 +22,71 @@ export default class Gift extends Laya.Script{
             return new Gift();
         }
     }
+   
     onAwake(){
-
+        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        if(countdown){
+            Laya.timer.loop(1000,this,this.CountTime);
+        }
+        this.owner.on(Laya.Event.CLICK,this,this.ClickBox);
     }
     onUpdate(){
-
+       
     }
     onEnable(){
-
+        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        if(countdown){
+            Laya.timer.loop(1000,this,this.CountTime);
+        }
+        this.owner.on(Laya.Event.CLICK,this,this.ClickBox);
+    }
+   
+    time = 9;
+    count = false;
+    fuhuo = false;
+    //倒计时
+    CountTime()
+    {
+        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        let _rig = this.owner.getComponent(Laya.RigidBody) as Laya.RigidBody;
+        let _collider = this.owner.getComponent(Laya.ChainCollider) as Laya.ChainCollider;
+        let owner = this.owner as Laya.Image;
+        if(this.count && this.time > 0)
+        {
+            this.time -= 1;
+            countdown.text = this.time.toString();
+            if(this.time < 1)
+            {
+               Laya.timer.clear(this,this.CountTime);
+            //    _rig.enabled = false;
+            //    _collider.isSensor = true;
+            //    _collider.enabled = false;
+               this.owner.removeSelf();
+               let name = this.type == 0?"Gift":"GiftTime";
+               GamePool.Instance.RecoverModel(owner,name);
+            //    this.owner.destroy();
+            }
+        }
+    }
+    //响应点击事件
+    ClickBox(){
+        let owner = this.owner as Laya.Image;
+        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        if(countdown){
+            Laya.timer.clear(this,this.CountTime);
+        }
+        let array = [];
+        array.push(this.GiftIndex);
+        array.push(this.GiftNum);
+        ViewManager.Instance.OpenPopView(ViewType.GetRewardView,array);
+        let _rig = this.owner.getComponent(Laya.RigidBody) as Laya.RigidBody;
+        let _collider = this.owner.getComponent(Laya.ChainCollider) as Laya.ChainCollider;
+        // _rig.enabled = false;
+        // _collider.enabled = false;
+        this.owner.removeSelf();
+        let name = this.type == 0?"Gift":"GiftTime";
+        GamePool.Instance.RecoverModel(owner,name)
+        // this.owner.destroy();       
     }
     
 }

src/Net/PlayerData.ts

@@ -145,6 +145,10 @@ export class PlayerData {
     public get Distance():number{
         return this.netzheshe["Distance"]
     }
+    //获取礼盒大小
+    public get GiftSize():number{
+        return this.netzheshe["GiftSize"];
+    }
     //获取球的溢出线
     public get OverRun():number{
         return this.netzheshe["OverRun"]

src/Tool/DropRule.ts

@@ -7,6 +7,7 @@ import { ServerManager, BlastToMerge } from "../Net/ServerManager";
 import { AudioManager, MusicType } from "./AudioManager";
 import { GamePool } from "./GamePool";
 import { AssetManager } from "../Main/AssetManager";
+import Gift from "../Main/Gift";
 
 export class DropRule{
     private static ins:DropRule;
@@ -15,8 +16,9 @@ export class DropRule{
         DropRule.ins = this;
         this.Init();
         this.InitEffect();
-        // EventManager.StageOn(StageMode.ReStart,this,this.Init);
+        this.InitGift();
         EventManager.StageOn(StageMode.Refresh,this,this.Init);
+        EventManager.StageOn(StageMode.ReStart,this,this.Pass);
     }
     public static get Instance():DropRule{
         if(DropRule.ins){
@@ -26,6 +28,11 @@ export class DropRule{
             return new DropRule();
         }
     }
+    //礼盒名字数组
+    public GiftName:string[] = new Array<string>("Gift","TimeGift");
+    //礼盒预制体数组
+    public GiftArray:Laya.Prefab[] = [];
+
     //特效名字数组
     public EffectName:string[] = new Array<string>("blue","yellow","purple","green");
     //特效预制体数组
@@ -83,7 +90,6 @@ export class DropRule{
                     this.DropHeight = Number(Level.hight);
                     this.GoalScore = Number(Level.goal);
                     this.SizeIndex = Level.index.split(";");
-                    console.log(this.SizeIndex);
                     this.BallNum = Level.edge.split(";");
                     this.StartNum = Number(Level.start_number);
                     this.DropNum = Level.drop_number.split(";");
@@ -101,17 +107,32 @@ export class DropRule{
     //特效
     InitEffect(){
         for (let i = 0; i < this.EffectName.length; i++) {
-            this.ReadJson(i)
+            this.EffectReadJson(i)
         }
     }
-    ReadJson(i:number){
-        Laya.loader.create("Effect/"+this.EffectName[i]+".json",Laya.Handler.create(this,this.creat));
+    EffectReadJson(i:number){
+        Laya.loader.create("Effect/"+this.EffectName[i]+".json",Laya.Handler.create(this,this.EffectCreat));
     }
-    creat(Prefab:any){
+    EffectCreat(Prefab:any){
         let obj = new Laya.Prefab();
         obj.json = Prefab;
         this.EffectArray.push(obj);
     }
+
+    //礼盒
+    InitGift(){
+        for (let i = 0; i < this.GiftName.length; i++) {
+            this.GiftReadJson(i)
+        }
+    }
+    GiftReadJson(i:number){
+        Laya.loader.create("GiftPrefab/"+this.GiftName[i]+".json",Laya.Handler.create(this,this.GiftCreat));
+    }
+    GiftCreat(Prefab:any){
+        let obj = new Laya.Prefab();
+        obj.json = Prefab;
+        this.GiftArray.push(obj);
+    }
     
     /**传入分数及位置  克隆相应销毁特效 */
     CreateEffect(_score:number,_pos:Laya.Vector2){
@@ -141,6 +162,134 @@ export class DropRule{
             pre.destroy();
         })
     }
+    /**过关 2-7关 关卡开始掉落普通礼盒 数量2 第八关开始每关掉落普通礼盒 数量1*/
+    Pass(_data?){
+        if(_data){
+            if(this.STAGE >=2 && this.STAGE<=6){
+                let X = GameTools.RandomANumber(100,500);
+                let pos = new Laya.Vector2(X, 0);
+                switch (this.STAGE) {
+                    case 2:
+                    this.CreateGift(0,pos,5,2);
+                        break;
+                    case 3:
+                    this.CreateGift(0,pos,4,2);
+                        break;
+                    case 4:
+                    this.CreateGift(0,pos,3,2);
+                        break;
+                    case 5:
+                    this.CreateGift(0,pos,2,2);
+                        break;
+                    case 6:
+                    this.CreateGift(0,pos,1,2);
+                        break;
+                }
+            }
+            if(this.STAGE >= 9){
+                for (let i = 0; i < Laya.stage.numChildren; i++) {
+                    if(Laya.stage.getChildAt(i).name == "Gift"){
+                        return 
+                    }
+                    else{
+                        let X = GameTools.RandomANumber(100,500);
+                        let pos = new Laya.Vector2(X, 0);
+                        this.CreateGift(0,pos,this.JudgePropNum(),1);
+                    }
+                }
+            }
+        }
+    }
+    //判断玩家持有的各种道具的数量
+    JudgePropNum():number{
+        let proparray = [];
+        let one = {"key":"1","value":AccountManager.Instance.curplayerData.GetPropNum(1)};
+        let two = {"key":"2","value":AccountManager.Instance.curplayerData.GetPropNum(2)};
+        let three = {"key":"3","value":AccountManager.Instance.curplayerData.GetPropNum(3)};
+        let four = {"key":"4","value":AccountManager.Instance.curplayerData.GetPropNum(4)};
+        let five = {"key":"5","value":AccountManager.Instance.curplayerData.GetPropNum(5)};
+        proparray.push(one);
+        proparray.push(two);
+        proparray.push(three);
+        proparray.push(four);
+        proparray.push(five);
+        for (let i = 0; i < proparray.length; i++) {
+            for (let j = 0; j < proparray.length-i-1; j++) { 
+                if(proparray[j].value < proparray[j+1].value){
+                    let temp = proparray[j].value;
+                    proparray[j].value = proparray[j+1].value;
+                    proparray[j+1].value = temp;
+                }
+            }
+        }
+        return proparray[0].value;
+    }
+    /** 传入盒子序号  传入道具类型 传入道具数量   创建礼盒 */
+    CreateGift(index:number,_pos:Laya.Vector2,giftindex:number,giftnum:number){
+         // let effect = this.GiftArray[index];
+        // let pre = Laya.Pool.getItemByCreateFun(this.GiftName[index],effect.create,effect) as Laya.Image;
+        //礼盒图片
+        let giftname = index == 0?"Gift":"TimeGift";
+        let pre = GamePool.Instance.GetModel(giftname);
+        pre.skin = "Game/res/Skin/"+ giftname + ".png";
+        pre.anchorX = 0.5;
+        pre.anchorY = 0.5;
+        pre.height = AccountManager.Instance.curplayerData.GiftSize;
+        pre.width = AccountManager.Instance.curplayerData.GiftSize;
+        pre.name = giftname;
+        //刚体碰撞器
+        let _rig = pre.getComponent(Laya.RigidBody) as Laya.RigidBody;
+        if(!_rig){
+            let rig = pre.addComponent(Laya.RigidBody) as Laya.RigidBody;
+            rig.gravityScale = 3;
+        }
+        else{
+            pre.getComponent(Laya.RigidBody).enabled = true;
+        }
+        let _collider = pre.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
+        if(!_collider){
+            let collider = pre.addComponent(Laya.CircleCollider) as Laya.CircleCollider;
+            collider.radius = AccountManager.Instance.curplayerData.GiftSize/2;
+            collider.restitution = AccountManager.Instance.curplayerData.Restitution;
+        }
+        else{
+            pre.getComponent(Laya.CircleCollider).enabled = true;
+        }
+
+        if(index == 1 ){
+            //倒计时框
+            let kuang:Laya.Image = new Laya.Image();
+            kuang.skin = "Game/res/Skin/kuang.png";
+            kuang.anchorX = 0.5;
+            kuang.anchorY = 0.5;
+            pre.addChild(kuang);
+            kuang.centerX = 0;
+            kuang.centerY = 0;
+            //文本
+            let countdown:Laya.Text = new Laya.Text();
+            countdown.width = 33;
+            countdown.height = 24;
+            countdown.color = "#ffffff";
+            countdown.align = "center";
+            countdown.valign = "middle";
+            countdown.fontSize = 20;
+            pre.addChild(countdown);
+            countdown.x = pre.x;
+            countdown.y = pre.y;
+        }
+        let script = pre.getComponent(Gift) as Gift;
+        if(!script){
+            let giftscript = pre.addComponent(Gift) as Gift;
+            //道具种类
+            giftscript.GiftIndex = giftindex;
+            //道具数量
+            giftscript.GiftNum = giftnum;
+            //礼盒种类
+            giftscript.type = index;
+        }
+        pre.pos(_pos.x,_pos.y);
+        Laya.stage.addChild(pre);
+    }
     /** 传入分数获取球的序号*/
     GetBallIndex(_score:number):number{
         let num;
@@ -209,15 +358,13 @@ export class DropRule{
     }
     /**创建球的预制  合成克隆*/
     CreatBall(_index:number,size:number,pos:Laya.Vector2){
-        // let ball = GamePool.Instance.GetModel(AssetManager.Instance.Ball.get(_index),_index.toString());
         let ball = GamePool.Instance.GetModel("img"+_index.toString());
-        // let ball = Laya.Pool.getItemByClass("img" + _index.toString(),Laya.Image);
-        // let ball:Laya.Image = new Laya.Image();
         ball.skin = "Game/res/Ball/blast"+ _index + ".png";
         ball.anchorX = 0.5;
         ball.anchorY = 0.5;
         ball.height = size;
         ball.width = size;
+        ball.name = "ball";
         //刚体碰撞器
         let _rig = ball.getComponent(Laya.RigidBody) as Laya.RigidBody;
         if(!_rig ){//|| _rig.destroyed
@@ -288,7 +435,6 @@ export class DropRule{
             let script = ball.addComponent(Ball) as Ball;
         }
         ball.pos(pos.x,pos.y);
-        // this.SetPosition(ball,pos);
         Laya.timer.once(1,this,()=>{
             EventManager.StageTrigger(StageMode.Clone,[ball]);
         })
@@ -298,14 +444,12 @@ export class DropRule{
     /**创建球的预制  自动掉球*/
     CreatBall2(_index:number,size:number,pos:Laya.Vector2){
         let ball = GamePool.Instance.GetModel("img"+_index.toString());
-        // let ball = GamePool.Instance.GetModel(AssetManager.Instance.Ball.get(_index),_index.toString());
-        // let ball = Laya.Pool.getItemByClass("img" +_index.toString(),Laya.Image);
-        // let ball:Laya.Image = new Laya.Image();
         ball.skin = "Game/res/Ball/blast"+ _index + ".png";
         ball.anchorX = 0.5;
         ball.anchorY = 0.5;
         ball.height = size;
         ball.width = size;
+        ball.name = "ball";
         //碰撞器
         let _collider = ball.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
         if(!_collider ){//|| _collider.destroyed
@@ -381,7 +525,6 @@ export class DropRule{
             let script = ball.addComponent(Ball) as Ball;
         }
         ball.pos(pos.x,pos.y);
-        // this.SetPosition(ball,pos);
         Laya.timer.once(1,this,()=>{
             EventManager.StageTrigger(StageMode.Clone,[ball]);
         })
@@ -574,13 +717,18 @@ export class DropRule{
     RecoverScene(){
         for (let i = 0; i < this.progress.length-3; i++) {
             let item = this.progress[i];
-            this.CreatBall2(Number(item.index)-1,Number(item.size),new Laya.Vector2(Number(item.pos.x),Number(item.pos.y)));
+            if(item.itemtype == 0){
+                this.CreatBall2(Number(item.index)-1,Number(item.size),new Laya.Vector2(Number(item.pos.x),Number(item.pos.y)));
+            }
+            else if(item.itemtype == 1){
+                this.CreateGift(item.type,new Laya.Vector2(Number(item.pos.x),Number(item.pos.y)),Number(item.proptype),Number(item.giftnum));
+            }
         }
     }
     /**读取进度*/
     Read(){
         if(this.STAGE>1){
-            var args =[{"stage":"0"}] 
+            let args =[{"stage":"0"}] 
             ServerManager.Instance.SendHttp(BlastToMerge.GetProgress,args,Laya.Handler.create(this,(res)=>{
                 let json =JSON.parse(res.user_game.detail);
                 this.progress = json;

src/View/GetRewardView.ts

@@ -1,10 +1,16 @@
 import { ui } from "../ui/layaMaxUI";
-import { SC } from "./ViewManager";
+import { SC, ViewManager, ViewType } from "./ViewManager";
 import { AccountManager } from "../Net/AccountManager";
+import { ServerManager, BlastToMerge } from "../Net/ServerManager";
+import InGameView from "./InGameView";
 
 export default class SetView extends ui.GetRewardViewUI implements SC{
     private static ins:SetView;
-   
+    //道具类型
+    public index = 0;
+    //道具数量
+    public num = 0;
+
     constructor(){
         super();
     }
@@ -17,9 +23,16 @@ export default class SetView extends ui.GetRewardViewUI implements SC{
         }
     }
     Show(data?){
-        this.FreshDescribe(data);
-        this.GetBtn.clickHandler = Laya.Handler.create(this,this.GetReward);
-        this.VideoGetBtn.clickHandler = Laya.Handler.create(this,this.VideoGetReward);
+        this.index = data[0];
+        this.num = data[1];
+        this.FreshDescribe(this.index);
+        this.VideoGetBtn.visible = false;
+        // this.GetBtn.visible = false;
+        // Laya.timer.once(2000,this,()=>{
+        //     this.GetBtn.visible = true;
+            this.GetBtn.clickHandler = Laya.Handler.create(this,this.GetReward);
+        // })
+        // this.VideoGetBtn.clickHandler = Laya.Handler.create(this,this.VideoGetReward);
         this.height = Laya.stage.height; 
         Laya.stage.on(Laya.Event.RESIZE,this,()=>
         {
@@ -43,11 +56,17 @@ export default class SetView extends ui.GetRewardViewUI implements SC{
     }
     //普通领取
     GetReward(){
-
+        var agrs = [{"reward_item":("1000"+ this.index.toString())},{"reward_num":this.num.toString()},{ "t": AccountManager.Instance.ServerTime.toString() },{"channel":"video:game"}];
+        ServerManager.Instance.SendHttp(BlastToMerge.vd, agrs, Laya.Handler.create(this, this.Complete), null);
     }
     //看视频双倍领取
     VideoGetReward(){
-
+        var agrs = [{"reward_item":("1000"+ this.index.toString())},{"reward_num":(this.num * 2).toString()},{ "t": AccountManager.Instance.ServerTime.toString() },{"channel":"video:game"}];
+        ServerManager.Instance.SendHttp(BlastToMerge.vd, agrs, Laya.Handler.create(this, this.Complete), null);
+    }
+    Complete(){
+        InGameView.Instance.SkillNumRefresh();
+        ViewManager.Instance.ClosePopView(ViewType.GetRewardView);
     }
         
 }

src/View/InGameView.ts

@@ -8,6 +8,7 @@ import { GameManager } from "../Main/GameManager";
 import { DropRule } from "../Tool/DropRule";
 import { ServerManager, BlastToMerge } from "../Net/ServerManager";
 import { GamePool } from "../Tool/GamePool";
+import Gift from "../Main/Gift";
 
 export default class InGameView extends ui.InGameSceneUI implements SC{
     private static ins:InGameView;
@@ -19,6 +20,12 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     public WinView = false;
     //球是否溢出
     public OverRun = false;
+    //0.25时是否掉落礼盒
+    public lingdianerwu = false;
+    //0.50时是否掉落礼盒
+    public lingdianwu = false;
+    //0.75时是否掉落礼盒
+    public lingdianqiwu = false;
 
     constructor(){
         super();
@@ -187,13 +194,33 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             }
             this.NowScore.text = GameManager.Instance.ScoreProgress.toString();
         }
+        if(DropRule.Instance.STAGE >= 7){
+            let X = GameTools.RandomANumber(100,500);
+            let pos = new Laya.Vector2(X, 10);
+            if(this.Ratio >= 0.25 && this.Ratio < 0.5 && !this.lingdianerwu){
+                DropRule.Instance.CreateGift(1,pos,DropRule.Instance.JudgePropNum(),1);
+                this.lingdianerwu = true;
+            }
+            if(this.Ratio >= 0.5 && this.Ratio < 0.75 && !this.lingdianwu){
+                DropRule.Instance.CreateGift(1,pos,DropRule.Instance.JudgePropNum(),1);
+                this.lingdianwu = true;
+            }
+            if(this.Ratio >= 0.75 && this.Ratio < 1 && !this.lingdianqiwu){
+                DropRule.Instance.CreateGift(1,pos,DropRule.Instance.JudgePropNum(),1);
+                this.lingdianqiwu =true;
+            }
+        }
+       
     }
     //推球道具
     ClickArrow(){
         console.log("点到了推球道具--");
+        // var agrs = [{ "t": AccountManager.Instance.ServerTime.toString() }];
+        // ServerManager.Instance.SendHttp(BlastToMerge.KaiShi,agrs,Laya.Handler.create(this, this.StartNextLevel), null);
+
         if(Number(this.Func5num.text)>0){
-            var args = [{"t":AccountManager.Instance.ServerTime.toString()},{"play_id":GameManager.Instance.play_id},{"fid":"5"}]
-            ServerManager.Instance.SendHttp(BlastToMerge.Use,args,Laya.Handler.create(this,()=>{
+            let args = [{"t":AccountManager.Instance.ServerTime.toString()},{"play_id":GameManager.Instance.play_id},{"fid":"5"}]
+            ServerManager.Instance.SendHttp(BlastToMerge.Use,args,Laya.Handler.create(this,(res)=>{
                 for (let i = 0; i < this.prefabbox.numChildren; i++) {
                     let ball = this.prefabbox.getChildAt(i) as Laya.Image;
                     if(ball.destroyed){
@@ -205,8 +232,8 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                     }
                 }
                 this.SkillNumRefresh();
-            }),Laya.Handler.create(this,()=>{
-
+            }),Laya.Handler.create(this,(res)=>{
+                console.log(res);
             }))
         }
     }
@@ -221,7 +248,6 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             this.EffectMode(false);
             return;
         }
-       
         if(Number(this.Func1num.text)>0){
             EventManager.EventTrigger(PropEffecf.DOUBLE);
             console.log("切换为双倍模式");
@@ -313,6 +339,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         ServerManager.Instance.SendHttp(BlastToMerge.Use,args,Laya.Handler.create(this,()=>{
             for (let i = this.prefabbox.numChildren-1; i >-1 ; i--) {
                 let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+                if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                    continue;
+                }
                 let ball = prefab.getComponent(Ball) as Ball;
                 if(ball.score == DropRule.Instance.MinBall){
                     GameManager.Instance.ScoreProgress += ball.score;
@@ -346,6 +375,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         ServerManager.Instance.SendHttp(BlastToMerge.Use,args,Laya.Handler.create(this,()=>{
             for (let i = this.prefabbox.numChildren-1; i >-1 ; i--) {
                 let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+                if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                    continue;
+                }
                 let ball = prefab.getComponent(Ball) as Ball;
                 if(ball.score == DropRule.Instance.MinNextBall){
                     GameManager.Instance.ScoreProgress += ball.score;
@@ -369,9 +401,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             this.Effect.visible = false;
             this.EffectBtn.clickHandler = null;
             EventManager.PropState = PropEffecf.NONE;
-        }),Laya.Handler.create(this,()=>{
-            console.log("道具使用失败");
-        }))
+        }),null)
     }
     /**传入分数 获取球的icon */
     GetIcon(_score:number):string{
@@ -388,6 +418,20 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         if(!this.prefabbox.destroyed){
             for (let i = this.prefabbox.numChildren-1; i > -1; i--) {
                 let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+                if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                    let giftscript = prefab.getComponent(Gift) as Gift;
+                    let _rig = prefab.getComponent(Laya.RigidBody) as Laya.RigidBody;
+                    let _collider = prefab.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
+                    _collider.enabled = false;
+                    _rig.enabled = false;
+                    _collider.destroy();
+                    _rig.destroy();
+                    Laya.timer.clearAll(prefab);
+                    prefab.removeSelf();
+                    let name = giftscript.type == 0?"Gift":"TimeGift";
+                    GamePool.Instance.RecoverModel(prefab,name);
+                    continue;
+                }
                 let ball = prefab.getComponent(Ball) as Ball;
                 let _rig = prefab.getComponent(Laya.RigidBody) as Laya.RigidBody;
                 let _collider = prefab.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
@@ -397,7 +441,6 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                 _rig.destroy();
                 Laya.timer.clearAll(prefab);
                 prefab.removeSelf();
-                // ball.destroy();
                 let _index = DropRule.Instance.GetBallIndex(ball.score);
                 GamePool.Instance.RecoverModel(prefab,_index.toString());
                 // Laya.Pool.recover("img"+_index.toString,ball);
@@ -423,6 +466,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     Revive(){
         for (let i = this.prefabbox.numChildren-1; i >-1 ; i--) {
             let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+            if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                continue;
+            }
             let ball = prefab.getComponent(Ball) as Ball;
             for (let j = 0; j < DropRule.Instance.BallNum.length; j++) {
                 let Score = DropRule.Instance.GetBallIndex(ball.score);
@@ -462,6 +508,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         if(_data){
             for (let i = this.prefabbox.numChildren-1; i >-1 ; i--) {
                 let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
+                if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                    continue;
+                }
                 let ball = prefab.getComponent(Ball) as Ball;
                 for (let j = 0; j < DropRule.Instance.BallNum.length; j++) {
                     let Score = DropRule.Instance.GetBallIndex(ball.score);
@@ -491,6 +540,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                 }
                 for (let k = this.prefabbox.numChildren-1; k > -1; k--) {
                     let prefab = this.prefabbox.getChildAt(k) as Laya.Image;
+                    if(prefab.name == "Gift" || prefab.name == "TimeGift"){
+                        continue;
+                    }
                     let ball = prefab.getComponent(Ball) as Ball;
                     let dispear = true;
                     for (let l = 0; l < ballarray2.length; l++) {
@@ -517,6 +569,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             }
             Laya.timer.loop(5000,this,this.Save);
             this.WinView = false;
+            this.lingdianerwu = false;
+            this.lingdianwu = false;
+            this.lingdianqiwu = false;
             this.ScoreRefresh();
             this.Progress();
             DropRule.Instance.FallDown(DropRule.Instance.StartNum);
@@ -526,6 +581,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             this.ClearStage();
             this.LoseView = false;
             this.WinView = false;
+            this.lingdianerwu = false;
+            this.lingdianwu = false;
+            this.lingdianqiwu = false;
             this.ScoreRefresh();
             this.Progress();
             if(DropRule.Instance.STAGE == 1){
@@ -596,6 +654,10 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
 
     //保存关卡进度
     Save(_data?){
+        let type;
+        let proptype;
+        let propnum;
+        
         let str = "";
         let ball;
         let score;
@@ -607,18 +669,27 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         if(!_data){
             for (let i = 0; i < this.prefabbox.numChildren; i++) {
                 let prefab = this.prefabbox.getChildAt(i) as Laya.Image;
-                ball = prefab.getComponent(Ball) as Ball;
-                //分数
-                score = ball.score;
-                index =(DropRule.Instance.GetBallIndex(score) + 1).toString();
-                //尺寸
-                size = prefab.width.toString();
-                //坐标
-                point = new Laya.Vector2(prefab.x,prefab.y);
-                obj =  {"index":index,"size":size,"pos":point};
+                if(prefab.name == "ball"){
+                    ball = prefab.getComponent(Ball) as Ball;
+                    //分数
+                    score = ball.score;
+                    index =(DropRule.Instance.GetBallIndex(score) + 1).toString();
+                    //尺寸
+                    size = prefab.width.toString();
+                    //坐标
+                    point = new Laya.Vector2(prefab.x,prefab.y);
+                    obj =  {"index":index,"size":size,"pos":point,"itemtype":0};//itemtype 0为球  1为礼盒
+                }
+                else if(prefab.name == "Gift"){
+                   let giftscript = prefab.getComponent(Gift) as Gift;
+                   type = giftscript.type;
+                   proptype = giftscript.GiftIndex;
+                   propnum = giftscript.GiftNum;
+                   point = new Laya.Vector2(prefab.x,prefab.y);
+                   obj = {"type":type,"proptype":proptype,"propnum":propnum,"pos":point,"itemtype":1};//itemtype 0为球  1为礼盒
+                }
                 objarray.push(obj);
             }
-            
             let jindutiao = {"jindu":GameManager.Instance.ScoreProgress.toString()};
             let sizeindex = {"sizeindex":DropRule.Instance.SizeIndex};
             let edgeindex = {"edgeindex":DropRule.Instance.EdgeIndex};

src/View/MainView.ts

@@ -48,7 +48,7 @@ export default class MainView extends ui.MainSceneUI implements SC{
     GameStart(_data:any){
         GameManager.Instance.play_id = _data.play_id;
         // ViewManager.Instance.ShowView(ViewType.InGameView);
-        EventManager.StageTrigger(StageMode.Start);
+        EventManager.StageTrigger(StageMode.Start,[true]);
     }
     ClickRank(){
         ViewManager.Instance.ShowView(ViewType.RankView);

src/View/ViewManager.ts

@@ -8,9 +8,9 @@ import FailureView from "./FailureView";
 import WinView from "./WinView";
 import ReviveView from "./ReviveView";
 import GuangGao from "../Net/GuangGao";
+import GetRewardView from "../View/GetRewardView";
 
-
-export enum ViewType{MainView,SignView,SetView,LotteryView,InGameView,RankView,WinView,FailureView,ReviveView};
+export enum ViewType{MainView,SignView,SetView,LotteryView,InGameView,RankView,WinView,FailureView,ReviveView,GetRewardView};
 
 export interface SC{
     Show();
@@ -122,6 +122,8 @@ export class ViewManager{
             return new WinView();
             case ViewType.ReviveView:
             return new ReviveView();
+            case ViewType.GetRewardView:
+            return new GetRewardView();
         }
         return null;
     }

src/View/WinView.ts

@@ -47,7 +47,6 @@ export default class WinView extends ui.WinViewUI implements SC{
     }
     //返回主界面
     BackMain(){
-        
         EventManager.StageTrigger(StageMode.Over);
         EventManager.StageTrigger(StageMode.Refresh);
         ViewManager.Instance.ShowView(ViewType.MainView);