|
@@ -8,6 +8,7 @@ import InGameView from "../View/InGameView";
|
|
import { AccountManager } from "../Net/AccountManager";
|
|
import { AccountManager } from "../Net/AccountManager";
|
|
import { BlastToMerge, ServerManager } from "../Net/ServerManager";
|
|
import { BlastToMerge, ServerManager } from "../Net/ServerManager";
|
|
import { AudioManager, MusicType } from "../Tool/AudioManager";
|
|
import { AudioManager, MusicType } from "../Tool/AudioManager";
|
|
|
|
+import { WXSDK } from "../Net/WXSDK";
|
|
export default class Ball extends Laya.Script{
|
|
export default class Ball extends Laya.Script{
|
|
private static ins:Ball;
|
|
private static ins:Ball;
|
|
private _rig:Laya.RigidBody;
|
|
private _rig:Laya.RigidBody;
|
|
@@ -210,6 +211,14 @@ export default class Ball extends Laya.Script{
|
|
Move(_position: Laya.Vector2) {
|
|
Move(_position: Laya.Vector2) {
|
|
if(!this.moved){
|
|
if(!this.moved){
|
|
let owner = this.owner as Laya.Image;
|
|
let owner = this.owner as Laya.Image;
|
|
|
|
+ //消除数量加1 判读是否震动
|
|
|
|
+ GameManager.Instance.EliminateNum += 1;
|
|
|
|
+ //加分
|
|
|
|
+
|
|
|
|
+ let ball = owner.getComponent(Ball) as Ball;
|
|
|
|
+ let ownerscore = ball.score;
|
|
|
|
+ GameManager.Instance.ScoreRecord += ownerscore;
|
|
|
|
+ GameManager.Instance.ScoreRecord2 = GameManager.Instance.ScoreRecord;
|
|
let move = Laya.Tween.to(this.owner, {
|
|
let move = Laya.Tween.to(this.owner, {
|
|
x: _position.x, y: _position.y, update: new Laya.Handler(this, function(){
|
|
x: _position.x, y: _position.y, update: new Laya.Handler(this, function(){
|
|
|
|
|
|
@@ -219,16 +228,22 @@ export default class Ball extends Laya.Script{
|
|
this.owner.removeSelf();
|
|
this.owner.removeSelf();
|
|
this.owner.destroy();
|
|
this.owner.destroy();
|
|
if(!DropRule.Instance.Cloned){
|
|
if(!DropRule.Instance.Cloned){
|
|
- let num = DropRule.Instance.GetBallIndex(GameManager.Instance.ScoreRecord);
|
|
|
|
- let size = DropRule.Instance.GetBallSize(GameManager.Instance.ScoreRecord);
|
|
|
|
- let score = DropRule.Instance.GetScore(GameManager.Instance.ScoreRecord);
|
|
|
|
|
|
+ let num = DropRule.Instance.GetBallIndex(GameManager.Instance.ScoreRecord2);
|
|
|
|
+ let size = DropRule.Instance.GetBallSize(GameManager.Instance.ScoreRecord2);
|
|
|
|
+ let score = DropRule.Instance.GetScore(GameManager.Instance.ScoreRecord2);
|
|
let ball = DropRule.Instance.CreatBall(num,size,GameManager.Instance.TargetPosition);
|
|
let ball = DropRule.Instance.CreatBall(num,size,GameManager.Instance.TargetPosition);
|
|
GameManager.Instance.ScoreProgress += score;
|
|
GameManager.Instance.ScoreProgress += score;
|
|
|
|
+ //判读消除数量 是否震动
|
|
|
|
+ if(GameManager.Instance.EliminateNum >= AccountManager.Instance.curplayerData.ShakeNum){
|
|
|
|
+ WXSDK.Shake();
|
|
|
|
+ }
|
|
|
|
+ //将本波消除数量归0
|
|
|
|
+ GameManager.Instance.EliminateNum = 0;
|
|
//合成之后把本波消除分数归0
|
|
//合成之后把本波消除分数归0
|
|
GameManager.Instance.ScoreRecord = 0;
|
|
GameManager.Instance.ScoreRecord = 0;
|
|
GameManager.Instance.played = false;
|
|
GameManager.Instance.played = false;
|
|
- console.log("分数++++",score);
|
|
|
|
- console.log("总进度分数---",GameManager.Instance.ScoreProgress);
|
|
|
|
|
|
+ // console.log("分数++++",score);
|
|
|
|
+ // console.log("总进度分数---",GameManager.Instance.ScoreProgress);
|
|
GameManager.Instance.Wave += 1;
|
|
GameManager.Instance.Wave += 1;
|
|
AudioManager.playMusic(MusicType.clear);
|
|
AudioManager.playMusic(MusicType.clear);
|
|
if(DropRule.Instance.STAGE == 1){
|
|
if(DropRule.Instance.STAGE == 1){
|
|
@@ -256,7 +271,6 @@ export default class Ball extends Laya.Script{
|
|
let num = this.TargetArray[i].getChildByName("num") as Laya.FontClip;
|
|
let num = this.TargetArray[i].getChildByName("num") as Laya.FontClip;
|
|
}
|
|
}
|
|
DropRule.Instance.Cloned = false;
|
|
DropRule.Instance.Cloned = false;
|
|
-
|
|
|
|
GameManager.Instance.TargetPosition =new Vector2(owner.x,owner.y);
|
|
GameManager.Instance.TargetPosition =new Vector2(owner.x,owner.y);
|
|
this.DisPose(owner);
|
|
this.DisPose(owner);
|
|
}
|
|
}
|
|
@@ -267,18 +281,16 @@ export default class Ball extends Laya.Script{
|
|
if(ball.TargetArray.length>0){
|
|
if(ball.TargetArray.length>0){
|
|
//被点击的球的分数
|
|
//被点击的球的分数
|
|
if(!ball.mark){
|
|
if(!ball.mark){
|
|
- let ownerscore = ball.score;
|
|
|
|
- GameManager.Instance.ScoreRecord += ownerscore;
|
|
|
|
- console.log("ownerscore---",ownerscore,GameManager.Instance.ScoreRecord);
|
|
|
|
|
|
+ // let ownerscore = ball.score;
|
|
|
|
+ // GameManager.Instance.ScoreRecord += ownerscore;
|
|
ball.mark = true;
|
|
ball.mark = true;
|
|
}
|
|
}
|
|
ball.clear = true;
|
|
ball.clear = true;
|
|
for (let i = 0; i < ball.TargetArray.length; i++) {
|
|
for (let i = 0; i < ball.TargetArray.length; i++) {
|
|
if(ball.TargetArray[i].getComponent(Ball).mark)continue;
|
|
if(ball.TargetArray[i].getComponent(Ball).mark)continue;
|
|
//记录分数
|
|
//记录分数
|
|
- let score = ball.TargetArray[i].getChildByName("num") as Laya.FontClip;
|
|
|
|
- console.log("score.value---",Number(score.value),GameManager.Instance.ScoreRecord)
|
|
|
|
- GameManager.Instance.ScoreRecord += Number(score.value,);
|
|
|
|
|
|
+ // let score = ball.TargetArray[i].getChildByName("num") as Laya.FontClip;
|
|
|
|
+ // GameManager.Instance.ScoreRecord += Number(score.value);
|
|
ball.TargetArray[i].getComponent(Ball).mark = true;
|
|
ball.TargetArray[i].getComponent(Ball).mark = true;
|
|
ball.TargetArray[i].getComponent(Ball).clear = true;
|
|
ball.TargetArray[i].getComponent(Ball).clear = true;
|
|
|
|
|
|
@@ -298,5 +310,23 @@ export default class Ball extends Laya.Script{
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //鼠标点击
|
|
|
|
+ MouseClick(_node:Laya.Image){
|
|
|
|
+ for (let i = 0; i < InGameView.Instance.prefabbox.numChildren; i++){
|
|
|
|
+ let other = InGameView.Instance.prefabbox.getChildAt(i) as Laya.Image;
|
|
|
|
+ if(other.x == _node.x && other.y == _node.y){
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ let distanceX = Math.abs(_node.x - other.x) ;
|
|
|
|
+ let distanceY = Math.abs(_node.y - other.y) ;
|
|
|
|
+ let dis = _node.width/2 + other.width/2;
|
|
|
|
+ if(distanceX-dis <=3 || distanceY-dis <=3){
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|