Merge branch 'dev' of http://gitlab2.dui88.com/laoqifeng/zeroing-libs into dev

src/custom/dxbcyj-game/src/game/GameWrapper.ts

@@ -23,5 +23,4 @@ export class GameWrapper extends engine.Container {
 	start(event: engine.Event) {
 		this._gameView.start(event.data.guide);
 	}
-
 }

src/custom/pick-tea/src/game/GameView.ts

@@ -468,7 +468,6 @@ export default class GameView extends engine.Container {
 		//按照采茶叶的多少来 设置茶叶是不是满的图片
 		let teaBucketframes = JSON.parse(JSON.stringify(originframes.frames));
 		//let teaNumImg = this.teaHalfImg;
-
 		if (teaPercentage == 1) {
 			this.teaHalfImg = new engine.Image(getTextureByName('茶叶-少'));
 		}

src/custom/pick-tea/src/game/Goods.ts

+/**
+ * Created by rockyl on 2020-02-02.
+ *
+ * 掉落物品
+ */
+import {getTextureByName} from "./utils";
+import {props} from "../props";
+
+export class Goods extends engine.Container {
+	private _body:engine.Rect
+	private _toY;
+
+	constructor() {
+		super();
+
+		let body
+		body = this._body =new engine.Rect()
+		
+		
+		let rain = new engine.Sprite(getTextureByName('雨滴'));
+		rain["npcType"]="rain"
+		let stone = new engine.Sprite(getTextureByName('石块'));
+		stone["npcType"]="stone"
+		let boom = new engine.Sprite(getTextureByName('炸弹'));
+		boom["npcType"]="boom"
+
+		rain.visible=false;
+		stone.visible=false;
+		boom.visible=false;
+		body.addChild(rain)
+		body.addChild(stone)
+		body.addChild(boom)
+		
+		this.addChild(body);
+		body.width=.0001;
+		body.height=.0001;
+		body.mouseEnabled=false;
+	}
+
+
+	getRandomNumberByRange(start, end) {
+		return Math.floor(Math.random() * (end - start) + start)
+	}
+
+	reset() {
+		this.visible = true;
+		this.rotation = 0;
+		this.anchorOffsetY = 0;
+		this.y = 0;
+		this.x = (750-120)*Math.random()+30;
+		this.rotation = 0;
+		let random=Math.random()
+
+		if(random<props.goodsProbability[0]){
+			this.showNpc("rain")
+		}else if(random>=props.goodsProbability[0]&&random<=(props.goodsProbability[0]+props.goodsProbability[1])){
+			this.showNpc("stone")
+		}else if(random>(props.goodsProbability[0]+props.goodsProbability[1])){
+			this.showNpc("boom")
+		}
+	}
+
+
+	showNpc(type){
+		for(let i=0;i<this._body.children.length;i++){
+			this._body.children[i].visible=false;
+			this._body.children[i].mouseEnabled=false;
+		}
+
+		for(let i=0;i<this._body.children.length;i++){
+			if(this._body.children[i]["npcType"]==type){
+				this["npcType"]=type
+				this._body.children[i].visible=true;
+				this._body.children[i].mouseEnabled=false;
+			}
+		}
+		
+	}
+
+	set anchorOffsetY(v) {
+		this._body.y = v;
+	}
+}

src/custom/pick-tea/src/game/object-pool-init.ts

+/**
+ * Created by rockyl on 2020-02-03.
+ */
+
+import {Goods} from "./Goods";
+import ObjectPool = engine.ObjectPool;
+
+export const PoolName: string = 'goods';
+
+ObjectPool.registerPool(PoolName, function () {
+	return new Goods();
+}, function (item: Goods, data) {
+	item.reset();
+});