Compare commits

..

No commits in common. "99ede74d0324ee676c46caba0a20073fe2ef1918" and "fa4c6036b7da7eb1daa4de3bd9a059c041cfa63a" have entirely different histories.

14 changed files with 2822 additions and 3577 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +0,0 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "3da1f9de-d18f-40f5-a7f8-94737743b012",
"files": [],
"subMetas": {},
"userData": {}
}

View File

@ -1,440 +0,0 @@
Entering Scatter.png
size: 2033,1250
format: RGBA8888
filter: Linear,Linear
repeat: none
a/lizi_00
rotate: false
xy: 1441, 2
size: 86, 122
orig: 300, 300
offset: 107, 178
index: -1
a/lizi_01
rotate: false
xy: 380, 2
size: 89, 126
orig: 300, 300
offset: 106, 174
index: -1
a/lizi_02
rotate: false
xy: 1694, 5
size: 92, 130
orig: 300, 300
offset: 104, 170
index: -1
a/lizi_03
rotate: true
xy: 1260, 18
size: 96, 135
orig: 300, 300
offset: 102, 165
index: -1
a/lizi_04
rotate: true
xy: 1075, 6
size: 99, 139
orig: 300, 300
offset: 101, 161
index: -1
a/lizi_05
rotate: true
xy: 471, 2
size: 103, 143
orig: 300, 300
offset: 99, 157
index: -1
a/lizi_06
rotate: true
xy: 926, 26
size: 107, 147
orig: 300, 300
offset: 97, 153
index: -1
a/lizi_07
rotate: true
xy: 1620, 335
size: 110, 151
orig: 300, 300
offset: 96, 149
index: -1
a/lizi_08
rotate: false
xy: 810, 25
size: 114, 155
orig: 300, 300
offset: 94, 145
index: -1
a/lizi_09
rotate: true
xy: 1788, 3
size: 117, 159
orig: 300, 300
offset: 93, 141
index: -1
a/lizi_10
rotate: true
xy: 1529, 3
size: 121, 163
orig: 300, 300
offset: 91, 137
index: -1
a/lizi_11
rotate: false
xy: 810, 182
size: 124, 168
orig: 300, 300
offset: 90, 132
index: -1
a/lizi_12
rotate: true
xy: 616, 8
size: 128, 172
orig: 300, 300
offset: 88, 128
index: -1
a/lizi_13
rotate: true
xy: 1422, 740
size: 132, 176
orig: 300, 300
offset: 87, 124
index: -1
a/lizi_14
rotate: true
xy: 1241, 736
size: 136, 179
orig: 300, 300
offset: 85, 121
index: -1
a/lizi_15
rotate: false
xy: 951, 537
size: 140, 183
orig: 300, 300
offset: 84, 117
index: -1
a/lizi_16
rotate: true
xy: 1813, 122
size: 144, 187
orig: 300, 300
offset: 82, 113
index: -1
a/lizi_17
rotate: false
xy: 1093, 537
size: 147, 191
orig: 300, 300
offset: 81, 109
index: -1
a/lizi_18
rotate: false
xy: 936, 135
size: 151, 195
orig: 300, 300
offset: 79, 105
index: -1
a/lizi_19
rotate: true
xy: 566, 821
size: 154, 199
orig: 300, 300
offset: 78, 101
index: -1
a/lizi_20
rotate: false
xy: 937, 332
size: 158, 203
orig: 300, 300
offset: 76, 97
index: -1
a/lizi_21
rotate: false
xy: 1097, 326
size: 161, 209
orig: 300, 300
offset: 75, 91
index: -1
a/lizi_22
rotate: false
xy: 1260, 329
size: 165, 212
orig: 300, 300
offset: 73, 85
index: -1
a/lizi_23
rotate: false
xy: 1089, 107
size: 169, 217
orig: 300, 300
offset: 72, 79
index: -1
a/lizi_24
rotate: true
xy: 1017, 730
size: 173, 222
orig: 300, 300
offset: 70, 74
index: -1
a/lizi_25
rotate: true
xy: 1097, 905
size: 176, 227
orig: 300, 300
offset: 69, 68
index: -1
a/lizi_26
rotate: true
xy: 1326, 874
size: 179, 232
orig: 300, 300
offset: 68, 62
index: -1
a/lizi_27
rotate: true
xy: 705, 537
size: 183, 244
orig: 300, 300
offset: 66, 56
index: -1
a/lizi_28
rotate: false
xy: 510, 359
size: 187, 249
orig: 300, 300
offset: 65, 51
index: -1
a/lizi_29
rotate: true
xy: 1588, 1058
size: 190, 255
orig: 300, 300
offset: 64, 45
index: -1
a/lizi_30
rotate: true
xy: 1326, 1055
size: 193, 260
orig: 300, 300
offset: 63, 40
index: -1
a/lizi_31
rotate: false
xy: 276, 606
size: 195, 266
orig: 300, 300
offset: 63, 34
index: -1
a/lizi_32
rotate: false
xy: 566, 977
size: 199, 271
orig: 300, 300
offset: 61, 29
index: -1
a/lizi_33
rotate: false
xy: 1600, 856
size: 203, 200
orig: 300, 300
offset: 59, 100
index: -1
a/lizi_34
rotate: true
xy: 1441, 126
size: 207, 206
orig: 300, 300
offset: 57, 94
index: -1
a/lizi_35
rotate: false
xy: 597, 138
size: 211, 212
orig: 300, 300
offset: 55, 88
index: -1
a/lizi_36
rotate: false
xy: 380, 130
size: 215, 218
orig: 300, 300
offset: 53, 82
index: -1
a/lizi_37
rotate: false
xy: 174, 82
size: 204, 224
orig: 300, 300
offset: 52, 76
index: -1
a/lizi_38
rotate: true
xy: 473, 610
size: 209, 230
orig: 300, 300
offset: 50, 70
index: -1
a/lizi_39
rotate: true
xy: 699, 352
size: 183, 236
orig: 300, 300
offset: 78, 64
index: -1
a/lizi_40
rotate: false
xy: 1845, 1006
size: 186, 242
orig: 300, 300
offset: 77, 58
index: -1
a/lizi_41
rotate: true
xy: 767, 722
size: 188, 248
orig: 300, 300
offset: 77, 52
index: -1
a/lizi_42
rotate: false
xy: 341, 350
size: 167, 254
orig: 300, 300
offset: 76, 46
index: -1
a/lizi_43
rotate: false
xy: 185, 337
size: 154, 260
orig: 300, 300
offset: 91, 40
index: -1
a/lizi_44
rotate: true
xy: 767, 912
size: 159, 266
orig: 300, 300
offset: 89, 34
index: -1
a/lizi_45
rotate: true
xy: 1052, 1083
size: 165, 272
orig: 300, 300
offset: 86, 28
index: -1
a/lizi_46
rotate: false
xy: 2, 28
size: 170, 278
orig: 300, 300
offset: 84, 22
index: -1
a/lizi_47
rotate: true
xy: 767, 1073
size: 175, 283
orig: 300, 300
offset: 82, 17
index: -1
a/lizi_48
rotate: false
xy: 2, 308
size: 181, 289
orig: 300, 300
offset: 79, 11
index: -1
a/lizi_49
rotate: true
xy: 1813, 268
size: 185, 172
orig: 300, 300
offset: 77, 128
index: -1
a/lizi_50
rotate: true
xy: 1426, 547
size: 191, 175
orig: 300, 300
offset: 74, 125
index: -1
a/lizi_51
rotate: true
xy: 1649, 137
size: 196, 162
orig: 300, 300
offset: 72, 138
index: -1
a/lizi_52
rotate: true
xy: 1620, 447
size: 201, 167
orig: 300, 300
offset: 70, 133
index: -1
a/lizi_53
rotate: false
xy: 1805, 831
size: 206, 173
orig: 300, 300
offset: 67, 127
index: -1
a/lizi_54
rotate: true
xy: 1260, 116
size: 211, 179
orig: 300, 300
offset: 65, 121
index: -1
a/lizi_55
rotate: false
xy: 1789, 455
size: 177, 185
orig: 300, 300
offset: 63, 115
index: -1
a/lizi_56
rotate: false
xy: 1242, 543
size: 182, 191
orig: 300, 300
offset: 60, 109
index: -1
a/lizi_57
rotate: true
xy: 1792, 642
size: 187, 198
orig: 300, 300
offset: 58, 102
index: -1
a/lizi_58
rotate: false
xy: 1603, 650
size: 187, 204
orig: 300, 300
offset: 56, 96
index: -1
a/lizi_59
rotate: false
xy: 1427, 335
size: 191, 210
orig: 300, 300
offset: 54, 90
index: -1
g40
rotate: false
xy: 2, 599
size: 272, 273
orig: 283, 289
offset: 6, 10
index: -1
sg
rotate: false
xy: 2, 874
size: 562, 374
orig: 562, 374
offset: 0, 0
index: -1

View File

@ -1,12 +0,0 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "94e1d9e0-4e68-4331-8532-513a89d5ce87",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

View File

@ -1,11 +0,0 @@
{
"ver": "1.2.6",
"importer": "spine-data",
"imported": true,
"uuid": "bcdec64d-b16f-460d-99ed-d115f9226426",
"files": [
".json"
],
"subMetas": {},
"userData": {}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 937 KiB

View File

@ -1,134 +0,0 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "f07b133b-d924-4fa6-a0c9-52c48c852b5f",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "f07b133b-d924-4fa6-a0c9-52c48c852b5f@6c48a",
"displayName": "Entering Scatter",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "f07b133b-d924-4fa6-a0c9-52c48c852b5f",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "f07b133b-d924-4fa6-a0c9-52c48c852b5f@f9941",
"displayName": "Entering Scatter",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 2,
"trimY": 2,
"width": 2029,
"height": 1246,
"rawWidth": 2033,
"rawHeight": 1250,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-1014.5,
-623,
0,
1014.5,
-623,
0,
-1014.5,
623,
0,
1014.5,
623,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
2,
1248,
2031,
1248,
2,
2,
2031,
2
],
"nuv": [
0.000983767830791933,
0.0016,
0.9990162321692081,
0.0016,
0.000983767830791933,
0.9984,
0.9990162321692081,
0.9984
],
"minPos": [
-1014.5,
-623,
0
],
"maxPos": [
1014.5,
623,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "f07b133b-d924-4fa6-a0c9-52c48c852b5f@6c48a",
"atlasUuid": ""
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"hasAlpha": true,
"fixAlphaTransparencyArtifacts": false,
"redirect": "f07b133b-d924-4fa6-a0c9-52c48c852b5f@6c48a"
}
}

View File

@ -578,15 +578,10 @@ export class SlotGame extends Component {
if (this.rollerManager.checkNextRollerExpect(6, 3)) {
AudioManager.instance.playSFX('Appear_Scatter_Sound_elimin', 1, true)
this.rollerManager.iconFallDown(this.spinData, true);
this.scheduleOnce(() => {
this.node.getChildByName('awaitScatter').active = true
}, 0.2)
this.scheduleOnce(() => {
AudioManager.instance.stopAllSFX()
this.setWaysCount(this.spinData.Symbol.WaysNum);
this.rollerManager.iconFallDown(this.spinData, false);
this.node.getChildByName('awaitScatter').active = false
}, 2.5)
} else {
this.scheduleOnce(() => {

View File

@ -268,12 +268,8 @@ export class RollerManager extends Component {
AudioManager.instance.playSFX('Appear_Scatter_Sound');
}
if (!isWild && !isScatter) {
if (this._isFastSpin) {
AudioManager.instance.playSFX('Scroll_Stop_Sound_fast');
} else {
AudioManager.instance.playSFX('Scroll_Stop_Sound_normal');
}
if (!isWild && !isScatter && this._isFastSpin) {
AudioManager.instance.playSFX('Scroll_Stop_Sound');
}
}