增加礼盒道具

.laya/wxgame.json

@@ -64,5 +64,5 @@
     "forceCompile": false,
     "onlyIndexJS": true,
     "projectType": "ts",
-    "pubTime": 1579336636861
+    "pubTime": 1579510325148
 }

.rpt2_cache/rpt2_596ef66ef1fe2aeed3119ab24f1893567fd58f33/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\"}"
+}

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>true   </physicsDebug>
+   <physicsDebug>false   </physicsDebug>
    <toJsonScene>true   </toJsonScene>
    <compressTexture>false   </compressTexture>
    <libProjectPath/>

laya/pages/GiftPrefab/Gift.prefab

@@ -1,58 +0,0 @@
-{
-    "x":0,
-    "type":"Image",
-    "selectedBox":740,
-    "selecteID":746,
-    "searchKey":"Image,Gift,Gift",
-    "props":{"y":0,"x":0,"width":110,"var":"Gift","skin":"InGameView/giftbox.png","presetID":1,"preset":"laya/pages/GiftPrefab/Gift.prefab","name":"Gift","isPresetRoot":true,"height":110,"anchorY":0.5,"anchorX":0.5},
-    "nodeParent":-1,
-    "maxID":749,
-    "label":"Gift",
-    "isOpen":true,
-    "isDirectory":true,
-    "isAniNode":true,
-    "hasChild":true,
-    "compId":740,
-    "child":[
-        {
-            "x":15,
-            "type":"RigidBody",
-            "switchAble":true,
-            "searchKey":"RigidBody",
-            "removeAble":true,
-            "props":{"presetID":3,"preset":"laya/pages/GiftPrefab/Gift.prefab","gravityScale":3},
-            "nodeParent":740,
-            "label":"RigidBody(Gift)",
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":747,
-            "child":[
-                ]
-        },
-        {
-            "x":15,
-            "type":"CircleCollider",
-            "switchAble":true,
-            "searchKey":"CircleCollider",
-            "removeAble":true,
-            "props":{"restitution":0.5,"radius":55,"presetID":4,"preset":"laya/pages/GiftPrefab/Gift.prefab"},
-            "nodeParent":740,
-            "label":"CircleCollider(Gift)",
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":748,
-            "child":[
-                ]
-        }],
-    "animations":[
-        {
-            "nodes":[
-                ],
-            "name":"ani1",
-            "id":1,
-            "frameRate":24,
-            "action":0
-        }]
-}

laya/pages/GiftPrefab/TimeGift.prefab

@@ -1,87 +0,0 @@
-{
-    "x":0,
-    "type":"Image",
-    "selectedBox":741,
-    "selecteID":742,
-    "searchKey":"Image,TimeGift,TimeGift",
-    "props":{"y":0,"x":0,"width":110,"var":"TimeGift","skin":"InGameView/Box-01.png","presetID":1,"preset":"laya/pages/GiftPrefab/TimeGift.prefab","name":"TimeGift","isPresetRoot":true,"height":110,"anchorY":0.5,"anchorX":0.5},
-    "nodeParent":-1,
-    "maxID":747,
-    "label":"TimeGift",
-    "isOpen":true,
-    "isDirectory":true,
-    "isAniNode":true,
-    "hasChild":true,
-    "compId":741,
-    "child":[
-        {
-            "x":15,
-            "type":"Image",
-            "searchKey":"Image,kuang",
-            "props":{"width":62,"skin":"InGameView/kuang.png","sizeGrid":"5,11,5,17","presetID":2,"preset":"laya/pages/GiftPrefab/TimeGift.prefab","name":"kuang","height":39,"centerY":0,"centerX":0,"anchorY":0.5,"anchorX":0.5},
-            "nodeParent":741,
-            "label":"kuang",
-            "isOpen":true,
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":742,
-            "child":[
-                ]
-        },
-        {
-            "x":15,
-            "type":"RigidBody",
-            "switchAble":true,
-            "searchKey":"RigidBody",
-            "removeAble":true,
-            "props":{"presetID":4,"preset":"laya/pages/GiftPrefab/TimeGift.prefab","gravityScale":3},
-            "nodeParent":741,
-            "label":"RigidBody(TimeGift)",
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":745,
-            "child":[
-                ]
-        },
-        {
-            "x":15,
-            "type":"Text",
-            "searchKey":"Text,CountDown",
-            "props":{"y":55,"x":55,"width":33,"valign":"middle","text":"9","presetID":5,"preset":"laya/pages/GiftPrefab/TimeGift.prefab","pivotY":12,"pivotX":17,"name":"CountDown","height":24,"fontSize":20,"color":"#ffffff","align":"center"},
-            "nodeParent":741,
-            "label":"CountDown",
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":743,
-            "child":[
-                ]
-        },
-        {
-            "x":15,
-            "type":"CircleCollider",
-            "switchAble":true,
-            "searchKey":"CircleCollider",
-            "removeAble":true,
-            "props":{"y":0,"x":0,"restitution":0.5,"radius":55,"presetID":6,"preset":"laya/pages/GiftPrefab/TimeGift.prefab"},
-            "nodeParent":741,
-            "label":"CircleCollider(TimeGift)",
-            "isDirectory":false,
-            "isAniNode":true,
-            "hasChild":false,
-            "compId":746,
-            "child":[
-                ]
-        }],
-    "animations":[
-        {
-            "nodes":[
-                ],
-            "name":"ani1",
-            "id":1,
-            "frameRate":24,
-            "action":0
-        }]
-}

laya/pages/InGameScene.scene

@@ -2,11 +2,11 @@
     "x":0,
     "type":"Scene",
     "selectedBox":2,
-    "selecteID":749,
+    "selecteID":558,
     "searchKey":"Scene",
     "props":{"width":720,"sceneColor":"#000000","pref":"@Prefab:Pr","height":1280,"autoDestroyAtClosed":true},
     "nodeParent":-1,
-    "maxID":750,
+    "maxID":751,
     "label":"Scene",
     "isOpen":true,
     "isDirectory":true,
@@ -632,6 +632,21 @@
                     "child":[
                         ],
                     "$HIDDEN":true
+                },
+                {
+                    "type":"Text",
+                    "searchKey":"Text,describe3",
+                    "props":{"y":52,"x":362,"width":304,"valign":"middle","text":"将你点到的球分数翻倍","pivotY":28,"pivotX":152,"name":"describe3","height":55,"fontSize":30,"font":"Microsoft YaHei","color":"#ffffff","align":"left"},
+                    "nodeParent":558,
+                    "label":"describe3",
+                    "isOpen":true,
+                    "isDirectory":false,
+                    "isAniNode":true,
+                    "hasChild":false,
+                    "compId":750,
+                    "child":[
+                        ],
+                    "$HIDDEN":false
                 }],
             "$HIDDEN":true
         },

release/wxgame/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":[]}

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=true;
+    static physicsDebug:boolean=false;
     static exportSceneToJson:boolean=true;
     constructor(){}
     static init(){

src/Main/Ball.ts

@@ -106,6 +106,9 @@ export  default class Ball extends Laya.Script{
         let _node = this.owner as Laya.Image;
         for (let i = 0; i < InGameView.Instance.prefabbox.numChildren; i++){
             let other = InGameView.Instance.prefabbox.getChildAt(i) as Laya.Image;
+            if(other.name == "Gift" || other.name == "TimeGift"){
+                continue;
+            }
             let ball = other.getComponent(Ball) as Ball;
             if(other.x == _node.x && other.y == _node.y){
                 continue
@@ -169,6 +172,7 @@ export  default class Ball extends Laya.Script{
             InGameView.Instance.SkillNumRefresh();
     
             EventManager.EventTrigger(PropEffecf.NONE);
+            InGameView.Instance.EffectMode(false);
         }),Laya.Handler.create(this,()=>{
             console.log("道具使用失败");
         }))
@@ -405,6 +409,9 @@ export  default class Ball extends Laya.Script{
         let _nodeball = _node.getComponent(Ball) as Ball;
         for (let i = 0; i < InGameView.Instance.prefabbox.numChildren; i++){
             let other = InGameView.Instance.prefabbox.getChildAt(i) as Laya.Image;
+            if(other.name == "Gift" || other.name == "TimeGift"){
+                continue;
+            }
             let ball = other.getComponent(Ball) as Ball;
             if(other.x == _node.x && other.y == _node.y){
                 continue

src/Main/Gift.ts

@@ -9,6 +9,7 @@ export default class Gift extends Laya.Script{
     public GiftIndex:number = 0;
     //礼物数量
     public GiftNum:number = 0;
+    public countdown;
 
     constructor(){
         super();
@@ -24,8 +25,9 @@ export default class Gift extends Laya.Script{
     }
    
     onAwake(){
-        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
-        if(countdown){
+        this.count = true;
+        this.countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        if(this.countdown){
             Laya.timer.loop(1000,this,this.CountTime);
         }
         this.owner.on(Laya.Event.CLICK,this,this.ClickBox);
@@ -34,8 +36,10 @@ export default class Gift extends Laya.Script{
        
     }
     onEnable(){
-        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
-        if(countdown){
+        this.count = true;
+        this.time = 9;
+        this.countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        if(this.countdown){
             Laya.timer.loop(1000,this,this.CountTime);
         }
         this.owner.on(Laya.Event.CLICK,this,this.ClickBox);
@@ -47,20 +51,20 @@ export default class Gift extends Laya.Script{
     //倒计时
     CountTime()
     {
-        let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
+        // 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 _collider = this.owner.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
         let owner = this.owner as Laya.Image;
         if(this.count && this.time > 0)
         {
             this.time -= 1;
-            countdown.text = this.time.toString();
+            this.countdown.text = this.time.toString();
             if(this.time < 1)
             {
                Laya.timer.clear(this,this.CountTime);
-            //    _rig.enabled = false;
+               _rig.enabled = false;
             //    _collider.isSensor = true;
-            //    _collider.enabled = false;
+               _collider.enabled = false;
                this.owner.removeSelf();
                let name = this.type == 0?"Gift":"GiftTime";
                GamePool.Instance.RecoverModel(owner,name);
@@ -73,18 +77,19 @@ export default class Gift extends Laya.Script{
         let owner = this.owner as Laya.Image;
         let countdown = this.owner.getChildByName("CountDown") as Laya.Text;
         if(countdown){
-            Laya.timer.clear(this,this.CountTime);
+            Laya.timer.clear(this.owner,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;
+        let _collider = this.owner.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
+        _rig.enabled = false;
+        _collider.enabled = false;
+        this.time = 9;
         this.owner.removeSelf();
-        let name = this.type == 0?"Gift":"GiftTime";
+        let name = this.type == 0?"Gift":"TimeGift";
         GamePool.Instance.RecoverModel(owner,name)
         // this.owner.destroy();       
     }

src/Net/PlayerData.ts

@@ -153,6 +153,10 @@ export class PlayerData {
     public get OverRun():number{
         return this.netzheshe["OverRun"]
     }
+    //获取推球向上的力度
+    public get AddForce():number{
+        return this.netzheshe["AddForce"]
+    }
     public get touchsize():number
     {
         return Number(this.netzheshe["touchsize"]);

src/Net/ServerManager.ts

@@ -109,7 +109,7 @@ export class ServerManager {
             sfaasfsfa = `token=${AccountManager.Instance.curplayerData.zhengshu}&`;
         }
         //WXSDK.openload("连接网络中...");
-        if (protocol == BlastToMerge.KaiShi || protocol == BlastToMerge.JieShu || protocol == BlastToMerge.vd || protocol == BlastToMerge.Lottery) {
+        if (protocol == BlastToMerge.KaiShi || protocol == BlastToMerge.JieShu || protocol == BlastToMerge.vd || protocol == BlastToMerge.Lottery ||protocol == BlastToMerge.Use) {
             let asddsa = "abcdefghijkimnopqrstuvwxyz0123456789";
             let adsassda = "{";
             let saafsafs = "";

src/Tool/DropRule.ts

@@ -8,7 +8,7 @@ import { AudioManager, MusicType } from "./AudioManager";
 import { GamePool } from "./GamePool";
 import { AssetManager } from "../Main/AssetManager";
 import Gift from "../Main/Gift";
-
+import InGameView from "../View/InGameView";
 export class DropRule{
     private static ins:DropRule;
     public progress:any;
@@ -16,7 +16,6 @@ export class DropRule{
         DropRule.ins = this;
         this.Init();
         this.InitEffect();
-        this.InitGift();
         EventManager.StageOn(StageMode.Refresh,this,this.Init);
         EventManager.StageOn(StageMode.ReStart,this,this.Pass);
     }
@@ -119,20 +118,6 @@ export class DropRule{
         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){
@@ -187,16 +172,17 @@ export class DropRule{
                 }
             }
             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);
+                let have = false;
+                for (let i = 0; i < InGameView.Instance.prefabbox.numChildren; i++) {
+                    if(InGameView.Instance.prefabbox.getChildAt(i).name == "Gift"){
+                        have = true; 
                     }
                 }
+                if(!have){
+                    let X = GameTools.RandomANumber(100,500);
+                    let pos = new Laya.Vector2(X, 0);
+                    this.CreateGift(0,pos,this.JudgePropNum(),1);
+                }
             }
         }
     }
@@ -215,14 +201,14 @@ export class DropRule{
         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){
+                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;
+        return Number(proparray[0].key);
     }
     /** 传入盒子序号  传入道具类型 传入道具数量   创建礼盒 */
     CreateGift(index:number,_pos:Laya.Vector2,giftindex:number,giftnum:number){
@@ -255,27 +241,31 @@ export class DropRule{
         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 _countdown = pre.getChildByName("CountDown") as Laya.Text;
+        if(!_countdown){
+            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();
+                let collider = pre.getComponent(Laya.CircleCollider) as Laya.CircleCollider;
+                pre.addChild(countdown);
+                countdown.color = "#ffffff";
+                countdown.align = "left";
+                countdown.valign = "top";
+                countdown.fontSize = 25;
+                countdown.name = "CountDown";
+                countdown.width = 15;
+                countdown.height = 30;
+                countdown.x = collider.radius-5;
+                countdown.y = collider.radius-10;
+            }
         }
         let script = pre.getComponent(Gift) as Gift;
         if(!script){
@@ -287,8 +277,18 @@ export class DropRule{
             //礼盒种类
             giftscript.type = index;
         }
+        else{
+            //道具种类
+            script.GiftIndex = giftindex;
+            //道具数量
+            script.GiftNum = giftnum;
+            //礼盒种类
+            script.type = index;
+        }
         pre.pos(_pos.x,_pos.y);
-        Laya.stage.addChild(pre);
+        Laya.timer.once(1,this,()=>{
+            EventManager.StageTrigger(StageMode.Clone,[pre]);
+        })
     }
     /** 传入分数获取球的序号*/
     GetBallIndex(_score:number):number{
@@ -721,7 +721,7 @@ export class DropRule{
                 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));
+                this.CreateGift(item.type,new Laya.Vector2(Number(item.pos.x),Number(item.pos.y)),Number(item.proptype),Number(item.propnum));
             }
         }
     }

src/View/InGameView.ts

@@ -106,6 +106,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
             let lose = true;
             for (let i = 0; i < this.prefabbox.numChildren; i++) {
                 let ball = this.prefabbox.getChildAt(i) as Laya.Image;
+                if(ball.name == "Gift" || ball.name == "TimeGift"){
+                    continue;
+                }
                 let light = ball.getChildByName("light") as Laya.Image;
                 if(light.visible){
                     lose = false;
@@ -228,7 +231,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                     }
                     else{
                         let _rig = ball.getComponent(Laya.RigidBody) as Laya.RigidBody;
-                        _rig.applyLinearImpulseToCenter({x:0,y:-1000});
+                        _rig.applyLinearImpulseToCenter({x:0,y:-AccountManager.Instance.curplayerData.AddForce});
                     }
                 }
                 this.SkillNumRefresh();
@@ -239,19 +242,28 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     }
     //双倍道具
     ClickDouble(){
-        if(EventManager.PropState == PropEffecf.DOUBLE){
-            EventManager.EventTrigger(PropEffecf.NONE);
-            console.log("切换为普通模式");
-            return;
-        }
-        if(EventManager.PropState != PropEffecf.NONE){
-            this.EffectMode(false);
-            return;
-        }
         if(Number(this.Func1num.text)>0){
-            EventManager.EventTrigger(PropEffecf.DOUBLE);
-            console.log("切换为双倍模式");
+            if(EventManager.PropState == PropEffecf.NONE){
+                this.EffectMode(true,PropEffecf.DOUBLE);
+            }
+            else{
+                this.EffectMode(false);
+            }
         }
+
+        // if(EventManager.PropState == PropEffecf.DOUBLE){
+        //     EventManager.EventTrigger(PropEffecf.NONE);
+        //     console.log("切换为普通模式");
+        //     return;
+        // }
+        // if(EventManager.PropState != PropEffecf.NONE){
+        //     this.EffectMode(false);
+        //     return;
+        // }
+        // if(Number(this.Func1num.text)>0){
+        //     EventManager.EventTrigger(PropEffecf.DOUBLE);
+        //     console.log("切换为双倍模式");
+        // }
     }
     //消除最小的球道具
     ClickZhunXin1(){
@@ -282,7 +294,6 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
     //锤子道具
     ClickHammer(){
         console.log("点到了锤子道具--");
-        
         if(Number(this.Func4num.text)>0){
             if(EventManager.PropState == PropEffecf.NONE){
                 this.EffectMode(true,PropEffecf.HAMMER);
@@ -297,6 +308,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         this.Effect.visible = _open;
         if (_open) {
             EventManager.PropState = _type;
+            let describe3 = this.Effect.getChildByName("describe3") as Laya.Text;
             let describe2 = this.Effect.getChildByName("describe2") as Laya.Text;
             let describe = this.Effect.getChildByName("describe") as Laya.Text;
             let icon = this.Effect.getChildByName("ICON") as Laya.Image;
@@ -305,6 +317,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                     this.EffectBtn.visible = true;
                     describe.visible = true;
                     describe2.visible = false;
+                    describe3.visible = false;
                     icon.visible = true;
                     icon.skin = this.GetIcon(DropRule.Instance.MinBall);
                     this.ClearNum.text = DropRule.Instance.MinBall.toString();
@@ -314,6 +327,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                     this.EffectBtn.visible = true;
                     describe.visible = true;
                     describe2.visible = false;
+                    describe3.visible = false;
                     icon.visible = true;
                     icon.skin = this.GetIcon(DropRule.Instance.MinNextBall);
                     this.ClearNum.text = DropRule.Instance.MinNextBall.toString();
@@ -323,9 +337,19 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                     this.EffectBtn.visible = false;
                     describe.visible = false;
                     describe2.visible = true;
+                    describe3.visible = false;
                     icon.visible = false;
                     EventManager.EventTrigger(PropEffecf.HAMMER);
                     break;
+                case PropEffecf.DOUBLE:
+                    this.EffectBtn.visible = false;
+                    describe.visible = false;
+                    describe2.visible = false;
+                    describe3.visible = true;
+                    icon.visible = false;
+                    EventManager.EventTrigger(PropEffecf.DOUBLE);
+                    break;
+
             }
         }
         else{
@@ -411,7 +435,7 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
                 index = i.toString();
             }
         }
-        return "Ball/blast"+ index + ".png"
+        return "Game/res/Ball/blast"+ index + ".png"
     }
     //清除舞台上的球
     ClearStage(){
@@ -622,6 +646,9 @@ export default class InGameView extends ui.InGameSceneUI implements SC{
         let array2 = [];
         for (let i = 0; i < this.prefabbox.numChildren; 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(array.length == 0){
                 array.push(ball.score);