123

src/custom/basket/src/game/GameTest.ts

@@ -179,6 +179,8 @@ export default class GameTest extends engine.Container {
         var boardPointBody:p2.Body = new p2.Body({
             position:[100/this.factor,800/this.factor]
         })
+        boardPointBody.addShape(boardPoint);
+        boardPointBody.displays = []
 
          // 篮球
         var boxShape: p2.Shape = new p2.Circle({radius: 60 / this.factor});

src/custom/pictures/debug/app.js

@@ -52,15 +52,9 @@ function launchWithCustomModule(customModule) {
 			engine.globalEvent.dispatchEvent('pictures-start', {
 				picUrl: "http://yun.duiba.com.cn/aurora/assets/e1593b97c27077b85b92f7eaaeae1ed64a1eb79a.png",
 				blockUrl: "888",
-<<<<<<< HEAD
-				row: 3,
-				column: 3,
-				gameTime: 50
-=======
 				column:"2",
 				row:"2",
 				gameTime:"50"
->>>>>>> 33823dbdb9c3b079aa71a545ab5472146df6429b
 			});
 
 			const d = engine.gameStage.sceneContainer.getChildAt(0);

src/custom/pictures/debug/main.js

@@ -12,6 +12,7 @@
 	function injectProps(p) {
 	    engine.injectProp(props, p);
 	}
+	//# sourceMappingURL=props.js.map
 
 	var picMap = {};
 	var posMap = {};
@@ -64,6 +65,7 @@
 	    posMap[url] = pos.concat([]);
 	    return [spr, pos];
 	});
+	//# sourceMappingURL=qietu.js.map
 
 	function getIndexFromRC(row, col, maxCol) {
 	    var index;
@@ -75,6 +77,7 @@
 	        return .5 - Math.random();
 	    });
 	}
+	//# sourceMappingURL=utils.js.map
 
 	var MAX_COL;
 	var MAX_ROW;
@@ -95,9 +98,9 @@
 	    }
 	    GameView.prototype.start = function () {
 	        var _this = this;
-	        MAX_COL = props.column || props.MAX_COL;
-	        MAX_ROW = props.row || props.MAX_ROW;
-	        GAME_TIME = props.gameTime || props.GAME_TIME;
+	        MAX_COL = props.MAX_COL;
+	        MAX_ROW = props.MAX_ROW;
+	        GAME_TIME = props.GAME_TIME;
 	        console.log('start', props.column, props.row, props.gameTime);
 	        if (!this.guideHole) {
 	            this.guideHole = new engine.Image();
@@ -151,7 +154,7 @@
 	        if (GAME_TIME < 10) {
 	            GAME_TIME = '0' + GAME_TIME;
 	        }
-	        console.log(GAME_TIME);
+	        console.log(GAME_TIME, "gametime1");
 	        engine.globalEvent.dispatchEvent('pictures-time-update', {
 	            second: this.getSecond(),
 	        });
@@ -187,10 +190,7 @@
 	        MAX_COL = props.MAX_COL;
 	        MAX_ROW = props.MAX_ROW;
 	        GAME_TIME = props.GAME_TIME;
-<<<<<<< HEAD
 	        console.log(GAME_TIME, 'setuptime');
-=======
->>>>>>> 33823dbdb9c3b079aa71a545ab5472146df6429b
 	        W = props.W;
 	        H = props.H;
 	        GAP = props.GAP;
@@ -296,6 +296,7 @@
 	    };
 	    return GameWrapper;
 	}(engine.Container));
+	//# sourceMappingURL=GameWrapper.js.map
 
 	function index (props) {
 	    prepareProps();
@@ -303,6 +304,7 @@
 	    var instance = new GameWrapper();
 	    return instance;
 	}
+	//# sourceMappingURL=index.js.map
 
 	return index;
 

src/custom/pictures/src/game/GameView.ts

-/**
- * Created by rockyl on 2018/8/16.
- */
-
-import { props } from "../props";
+//Created by rockyl on 2018/8/16.
 import qietu from "./qietu";
 import { getIndexFromRC, getRandomArray, getTexture } from "./utils";
+import {props} from '../props'
 import ObjectPool = engine.ObjectPool;
 
 // let OFFSET_X;
@@ -27,27 +24,16 @@ export default class GameView extends engine.Container {
   private date
 
   start() {
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    //优先获取start事件接收到的参数
->>>>>>> 2533efe07c13d1586974175c8874bc3dad71643a
-=======
-    //优先获取start事件接收到的参数
->>>>>>> 33823dbdb9c3b079aa71a545ab5472146df6429b
-    MAX_COL = props.column || props.MAX_COL;
-    MAX_ROW = props.row || props.MAX_ROW;
-    GAME_TIME = props.gameTime || props.GAME_TIME;
-    console.log('start',props.column,props.row,props.gameTime)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-=======
 
->>>>>>> 2533efe07c13d1586974175c8874bc3dad71643a
-=======
+    //优先获取start事件接收到的参数
 
->>>>>>> 33823dbdb9c3b079aa71a545ab5472146df6429b
+    // MAX_COL = props.column || props.MAX_COL;
+    // MAX_ROW = props.row || props.MAX_ROW;
+    // GAME_TIME = props.gameTime || props.GAME_TIME;
+    MAX_COL =  props.MAX_COL;
+    MAX_ROW =  props.MAX_ROW;
+    GAME_TIME =  props.GAME_TIME;
+    console.log('start',props.column,props.row,props.gameTime)
     if (!this.guideHole) {
       this.guideHole = new engine.Image();
       this.guideHole.source = 'asset://' + props.blockUrl;