Compare commits

..

No commits in common. "a8b314b5fafbc6d7dacfd54250e28a9b4be38293" and "a97065a11526769d83ad6ead964564eb7de3e1d3" have entirely different histories.

8 changed files with 1373 additions and 1420 deletions

View File

@ -438,9 +438,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 160, "r": 255,
"g": 111, "g": 255,
"b": 78, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@ -577,9 +577,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 134, "r": 255,
"g": 85, "g": 255,
"b": 62, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@ -1067,9 +1067,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 134, "r": 255,
"g": 85, "g": 255,
"b": 62, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {

File diff suppressed because it is too large Load Diff

View File

@ -140,7 +140,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1919.9999999999998 "height": 1920
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -583,9 +583,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 134, "r": 255,
"g": 85, "g": 255,
"b": 62, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@ -858,9 +858,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 134, "r": 255,
"g": 85, "g": 255,
"b": 62, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@ -997,9 +997,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 134, "r": 255,
"g": 85, "g": 255,
"b": 62, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {
@ -2071,7 +2071,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1919.9999999999998 "height": 1920
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
@ -2148,7 +2148,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1080, "width": 1080,
"height": 1919.9999999999998 "height": 1920
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",

View File

@ -617,7 +617,7 @@ export class SlotBar extends Component {
BTNS3_ACTIVE = false; BTNS3_ACTIVE = false;
enterFreeSpin(leftCount: number) { enterFreeSpin(leftCount: number) {
this.freeSpinBg.active = true; this.freeSpinBg.active = true;
this.Msg.setPosition(0, -910, 0) this.Msg.setPosition(0, -1300, 0)
this.BTNS1_ACTIVE = this.btns1.active; this.BTNS1_ACTIVE = this.btns1.active;
this.BTNS2_ACTIVE = this.btns2.active; this.BTNS2_ACTIVE = this.btns2.active;

View File

@ -22,7 +22,7 @@ export class SlotGame extends Component {
// 跑马灯信息 // 跑马灯信息
private moveSprite: Sprite[] = []; private moveSprite: Sprite[] = [];
private startPos: Vec3 = new Vec3(540, 0, 0); private startPos: Vec3 = new Vec3(540, 0, 0);
private moveSpeed: number = 250; private moveSpeed: number = 200;
private moveIndex: number = 0; private moveIndex: number = 0;
private grayNode: Node = null; private grayNode: Node = null;
@ -161,12 +161,8 @@ export class SlotGame extends Component {
//小游戏中只显示一个文本并且不移动 //小游戏中只显示一个文本并且不移动
if (this.isInfreeSpin) { if (this.isInfreeSpin) {
let sprite = this.moveSprite[0]; let sprite = this.moveSprite[0];
sprite.node.setPosition(-sprite.node.getComponent(UITransform).width / 2, 0, 0); sprite.node.setPosition(-250, 0, 0);
return return
} else {
let sprite = this.moveSprite[0];
sprite.node.setPosition(540, 0, 0);
} }
// 如果所有精灵都播放完了,重置索引 // 如果所有精灵都播放完了,重置索引
@ -178,7 +174,7 @@ export class SlotGame extends Component {
let spriteWidth = sprite.node.getComponent(UITransform).width; let spriteWidth = sprite.node.getComponent(UITransform).width;
sprite.node.setPosition(this.startPos.x, 0, 0); sprite.node.setPosition(this.startPos.x, 0, 0);
let targetPos = -spriteWidth - 1000; let targetPos = -spriteWidth - 600;
let duration = Math.abs(this.startPos.x - targetPos) / this.moveSpeed; let duration = Math.abs(this.startPos.x - targetPos) / this.moveSpeed;

View File

@ -715,8 +715,6 @@ export class SlotScene extends Component {
this.slotGame.showWinScore(true, false, true, isReconnect, false, false, this.spinData.AllScore); this.slotGame.showWinScore(true, false, true, isReconnect, false, false, this.spinData.AllScore);
this.slotBar.setWin(this.spinData.AllScore); this.slotBar.setWin(this.spinData.AllScore);
this.slotGame.changeBg(false); this.slotGame.changeBg(false);
this.slotGame.playNextSprite()
this.checkAutoSpin(true, isReconnect); this.checkAutoSpin(true, isReconnect);
AudioManager.instance.playBGM('Normal_Mode_BGM'); AudioManager.instance.playBGM('Normal_Mode_BGM');
}); });
@ -725,8 +723,6 @@ export class SlotScene extends Component {
this.slotBar.setWin(this.spinData.AllScore); this.slotBar.setWin(this.spinData.AllScore);
this.slotBar.setBalance(this.spinData.Balance); this.slotBar.setBalance(this.spinData.Balance);
this.slotGame.changeBg(false); this.slotGame.changeBg(false);
this.slotGame.playNextSprite()
this.checkAutoSpin(true, isReconnect); this.checkAutoSpin(true, isReconnect);
AudioManager.instance.playBGM('Normal_Mode_BGM'); AudioManager.instance.playBGM('Normal_Mode_BGM');
} }
@ -734,8 +730,6 @@ export class SlotScene extends Component {
} else { } else {
this.checkAutoSpin(true, isReconnect); this.checkAutoSpin(true, isReconnect);
this.slotGame.changeBg(false); this.slotGame.changeBg(false);
this.slotGame.playNextSprite()
} }
} }
@ -800,6 +794,8 @@ export class SlotScene extends Component {
this.slotBar.spinAniStop() this.slotBar.spinAniStop()
this.slotBar.setGraySpinBtn(false) this.slotBar.setGraySpinBtn(false)
}, delay) }, delay)
} }
isfirstSpinInFreeMode() { isfirstSpinInFreeMode() {

View File

@ -1571,7 +1571,7 @@
"__id__": 41 "__id__": 41
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 44
@ -1894,7 +1894,7 @@
"__id__": 9 "__id__": 9
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 50

View File

@ -28,7 +28,7 @@ export function getHistoryUrl() {
} }
export function getLanguage() { export function getLanguage() {
// return 'ko'; // return 'zh';
return language; return language;
} }
export function getIsRB7() { export function getIsRB7() {