Compare commits
No commits in common. "0def2ba2a8321cf2eac4cbcd7000303e3b91f531" and "09527d58d928f96596d3ad6453def8151c9a1cb7" have entirely different histories.
0def2ba2a8
...
09527d58d9
@ -239,7 +239,10 @@
|
|||||||
"_fillRange": 0,
|
"_fillRange": 0,
|
||||||
"_isTrimmedMode": true,
|
"_isTrimmedMode": true,
|
||||||
"_useGrayscale": false,
|
"_useGrayscale": false,
|
||||||
"_atlas": null,
|
"_atlas": {
|
||||||
|
"__uuid__": "7b015c97-60ec-4ce8-bdf3-3dce8e615665",
|
||||||
|
"__expectedType__": "cc.SpriteAtlas"
|
||||||
|
},
|
||||||
"_id": ""
|
"_id": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
@ -69,7 +69,7 @@
|
|||||||
"__id__": 1
|
"__id__": 1
|
||||||
},
|
},
|
||||||
"_children": [],
|
"_children": [],
|
||||||
"_active": true,
|
"_active": false,
|
||||||
"_components": [
|
"_components": [
|
||||||
{
|
{
|
||||||
"__id__": 3
|
"__id__": 3
|
||||||
@ -165,7 +165,7 @@
|
|||||||
"__expectedType__": "sp.SkeletonData"
|
"__expectedType__": "sp.SkeletonData"
|
||||||
},
|
},
|
||||||
"defaultSkin": "default",
|
"defaultSkin": "default",
|
||||||
"defaultAnimation": "anim1",
|
"defaultAnimation": "<None>",
|
||||||
"_premultipliedAlpha": false,
|
"_premultipliedAlpha": false,
|
||||||
"_timeScale": 1,
|
"_timeScale": 1,
|
||||||
"_preCacheMode": 0,
|
"_preCacheMode": 0,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -581,21 +581,10 @@ export class SlotBar extends Component {
|
|||||||
showLeftCount(leftCount: number) {
|
showLeftCount(leftCount: number) {
|
||||||
if (leftCount >= 1) {
|
if (leftCount >= 1) {
|
||||||
let rfs = this.left_1.getChildByName('rfs');
|
let rfs = this.left_1.getChildByName('rfs');
|
||||||
let leftCount_1 = this.leftCount.node.getChildByName('leftCount_1').getComponent(sp.Skeleton)
|
|
||||||
rfs.getComponent(LocalizedSprite).updateSprite();
|
rfs.getComponent(LocalizedSprite).updateSprite();
|
||||||
this.left_1.getComponent(Layout).updateLayout();
|
this.left_1.getComponent(Layout).updateLayout();
|
||||||
this.left_1.active = true;
|
this.left_1.active = true;
|
||||||
if (leftCount >= 10) {
|
|
||||||
let num1 = leftCount / 10
|
|
||||||
let num2 = leftCount % 10
|
|
||||||
leftCount_1.node.active = true
|
|
||||||
this.leftCount.setAnimation(0, `anim_${num1}`, true)
|
|
||||||
leftCount_1.setAnimation(0, `anim_${num2}`, true)
|
|
||||||
} else {
|
|
||||||
leftCount_1.node.active = false
|
|
||||||
this.leftCount.setAnimation(0, `anim_${leftCount}`, true)
|
this.leftCount.setAnimation(0, `anim_${leftCount}`, true)
|
||||||
|
|
||||||
}
|
|
||||||
this.left_2.active = false;
|
this.left_2.active = false;
|
||||||
} else {
|
} else {
|
||||||
this.left_1.active = false;
|
this.left_1.active = false;
|
||||||
|
|||||||
@ -430,6 +430,8 @@ export class SlotGame extends Component {
|
|||||||
|
|
||||||
let multi = this.node.getChildByPath('free/multi')
|
let multi = this.node.getChildByPath('free/multi')
|
||||||
let multiCopy = instantiate(multi)
|
let multiCopy = instantiate(multi)
|
||||||
|
// let bigMultiNode = this.node.parent.getChildByName('showMulti')
|
||||||
|
// let bigMultiLabel = bigMultiNode.getChildByName('multi')
|
||||||
multiCopy.parent = this.node
|
multiCopy.parent = this.node
|
||||||
multiCopy.setWorldPosition(multi.getWorldPosition())
|
multiCopy.setWorldPosition(multi.getWorldPosition())
|
||||||
|
|
||||||
|
|||||||
@ -623,7 +623,7 @@ export class HRoller extends BaseRoller {
|
|||||||
iconComponent.playDeleteAni();
|
iconComponent.playDeleteAni();
|
||||||
this.scheduleOnce(() => {
|
this.scheduleOnce(() => {
|
||||||
this.iconFactory.recycleIcon(iconNode);
|
this.iconFactory.recycleIcon(iconNode);
|
||||||
}, 1.3)
|
}, 1.5)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
|
this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
|
||||||
|
|||||||
@ -431,10 +431,11 @@ export class Icon extends Component {
|
|||||||
this.iconSpine.clearTracks();
|
this.iconSpine.clearTracks();
|
||||||
this.iconSpine.setCompleteListener(null);
|
this.iconSpine.setCompleteListener(null);
|
||||||
if (this._iconId == 0) {
|
if (this._iconId == 0) {
|
||||||
this.iconSpine.setAnimation(0, 'win', false);
|
this.iconSpine.setAnimation(0, 'win', true);
|
||||||
} else if (this._iconId == 1) {
|
} else if (this._iconId == 1) {
|
||||||
this.iconSpine.setAnimation(0, 'win_1', false);
|
this.iconSpine.setAnimation(0, 'win_1', true);
|
||||||
}
|
}
|
||||||
|
this.iconSpine.setAnimation(0, 'win_1', false);
|
||||||
}
|
}
|
||||||
} else if (this.iconSpine && this.iconSpine.node) {
|
} else if (this.iconSpine && this.iconSpine.node) {
|
||||||
// this.iconSpine.node.active = true;
|
// this.iconSpine.node.active = true;
|
||||||
@ -504,10 +505,10 @@ export class Icon extends Component {
|
|||||||
let bigMultiLabel = bigMultiNode.getChildByName('multi')
|
let bigMultiLabel = bigMultiNode.getChildByName('multi')
|
||||||
let isFreeSpin = slotGame.getComponent(SlotGame).isInfreeSpin
|
let isFreeSpin = slotGame.getComponent(SlotGame).isInfreeSpin
|
||||||
let isHasScore = XnInfo.Win != ""
|
let isHasScore = XnInfo.Win != ""
|
||||||
let multiMovePos = -500
|
let multiMovePos = -450
|
||||||
|
|
||||||
if (isFreeSpin && !isHasScore) {
|
if (isFreeSpin && !isHasScore) {
|
||||||
multiMovePos = -400
|
multiMovePos = -350
|
||||||
}
|
}
|
||||||
|
|
||||||
multiMoveNode.parent = slotGame
|
multiMoveNode.parent = slotGame
|
||||||
@ -540,7 +541,7 @@ export class Icon extends Component {
|
|||||||
.to(0.4, { position: new Vec3(0, multiMovePos, 0) })
|
.to(0.4, { position: new Vec3(0, multiMovePos, 0) })
|
||||||
.to(0.3, { scale: new Vec3(0.3, 0.3, 1) })
|
.to(0.3, { scale: new Vec3(0.3, 0.3, 1) })
|
||||||
.call(() => {
|
.call(() => {
|
||||||
bigMultiLabel.setPosition(0, 100, 0)
|
bigMultiLabel.setPosition(0, 0, 0)
|
||||||
bigMultiLabel.setScale(0.2, 0.2, 1)
|
bigMultiLabel.setScale(0.2, 0.2, 1)
|
||||||
bigMultiNode.active = false
|
bigMultiNode.active = false
|
||||||
})
|
})
|
||||||
@ -564,7 +565,6 @@ export class Icon extends Component {
|
|||||||
if (this._isWildOrScatter) {
|
if (this._isWildOrScatter) {
|
||||||
// this.iconSpine.setAnimation(0, 'spawn_1', false);
|
// this.iconSpine.setAnimation(0, 'spawn_1', false);
|
||||||
// this.iconSpine.setCompleteListener(() => {
|
// this.iconSpine.setCompleteListener(() => {
|
||||||
// this.iconSpine.node.active = true;
|
|
||||||
if (!this.iconSpine) return;
|
if (!this.iconSpine) return;
|
||||||
if (this._iconId == 0) {
|
if (this._iconId == 0) {
|
||||||
this.iconSpine.setAnimation(0, 'idle', true);
|
this.iconSpine.setAnimation(0, 'idle', true);
|
||||||
@ -596,9 +596,9 @@ export class Icon extends Component {
|
|||||||
this.iconSpine.clearTracks();
|
this.iconSpine.clearTracks();
|
||||||
this.iconSpine.setCompleteListener(null);
|
this.iconSpine.setCompleteListener(null);
|
||||||
if (this._iconId == 0) {
|
if (this._iconId == 0) {
|
||||||
this.iconSpine.setAnimation(0, 'idle', false);
|
this.iconSpine.setAnimation(0, 'idle', true);
|
||||||
} else if (this._iconId == 1) {
|
} else if (this._iconId == 1) {
|
||||||
this.iconSpine.setAnimation(0, 'idle_1', false);
|
this.iconSpine.setAnimation(0, 'idle_1', true);
|
||||||
}
|
}
|
||||||
} else if (this.iconSpine) {
|
} else if (this.iconSpine) {
|
||||||
this.iconSpine.node.active = false;
|
this.iconSpine.node.active = false;
|
||||||
|
|||||||
@ -686,12 +686,12 @@ export class Roller extends BaseRoller {
|
|||||||
iconComponent.playDeleteAni();
|
iconComponent.playDeleteAni();
|
||||||
this.scheduleOnce(() => {
|
this.scheduleOnce(() => {
|
||||||
this.iconFactory.recycleIcon(iconNode);
|
this.iconFactory.recycleIcon(iconNode);
|
||||||
}, 1.3)
|
}, 1.5)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.scheduleOnce(() => {
|
this.scheduleOnce(() => {
|
||||||
this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
|
this.node.emit(ROLLER_EVENT.ICON_DELETED, this._rollerId);
|
||||||
}, 1.3)
|
}, 1.5)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2788,13 +2788,13 @@
|
|||||||
"__prefab": null,
|
"__prefab": null,
|
||||||
"_contentSize": {
|
"_contentSize": {
|
||||||
"__type__": "cc.Size",
|
"__type__": "cc.Size",
|
||||||
"width": 266.489990234375,
|
"width": 174.24000549316406,
|
||||||
"height": 355.0199890136719
|
"height": 522.280029296875
|
||||||
},
|
},
|
||||||
"_anchorPoint": {
|
"_anchorPoint": {
|
||||||
"__type__": "cc.Vec2",
|
"__type__": "cc.Vec2",
|
||||||
"x": 0.4957034445734158,
|
"x": 0.49988519127737446,
|
||||||
"y": 0.539406247327176
|
"y": 0.5001339833091739
|
||||||
},
|
},
|
||||||
"_id": "5eCOl9iDBOqrx+o9MzHH/Q"
|
"_id": "5eCOl9iDBOqrx+o9MzHH/Q"
|
||||||
},
|
},
|
||||||
@ -2819,11 +2819,11 @@
|
|||||||
"a": 255
|
"a": 255
|
||||||
},
|
},
|
||||||
"_skeletonData": {
|
"_skeletonData": {
|
||||||
"__uuid__": "4dae9577-b214-4e57-94ad-2f1e9d7c24ed",
|
"__uuid__": "c4c5d54b-a1e3-4eba-b866-11cc9129f20c",
|
||||||
"__expectedType__": "sp.SkeletonData"
|
"__expectedType__": "sp.SkeletonData"
|
||||||
},
|
},
|
||||||
"defaultSkin": "default",
|
"defaultSkin": "default",
|
||||||
"defaultAnimation": "idle_1",
|
"defaultAnimation": "anim3",
|
||||||
"_premultipliedAlpha": false,
|
"_premultipliedAlpha": false,
|
||||||
"_timeScale": 1,
|
"_timeScale": 1,
|
||||||
"_preCacheMode": 0,
|
"_preCacheMode": 0,
|
||||||
@ -2834,7 +2834,7 @@
|
|||||||
"_debugBones": false,
|
"_debugBones": false,
|
||||||
"_debugSlots": false,
|
"_debugSlots": false,
|
||||||
"_enableBatch": false,
|
"_enableBatch": false,
|
||||||
"loop": true,
|
"loop": false,
|
||||||
"_id": "ab7skyMJ5L9pSQgJ0kmqWb"
|
"_id": "ab7skyMJ5L9pSQgJ0kmqWb"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user