Compare commits

..

No commits in common. "87b89c26e55fa39511df7e115c57299dcb190787" and "d6eb489f91fe660079ac8de839f0cf022963d217" have entirely different histories.

4 changed files with 2771 additions and 3058 deletions

File diff suppressed because it is too large Load Diff

View File

@ -28,14 +28,14 @@
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 90
},
{
"__id__": 96
"__id__": 92
}
],
"_prefab": {
"__id__": 98
"__id__": 94
},
"_lpos": {
"__type__": "cc.Vec3",
@ -227,29 +227,29 @@
"__id__": 11
},
{
"__id__": 47
"__id__": 43
},
{
"__id__": 59
"__id__": 55
}
],
"_active": true,
"_components": [
{
"__id__": 81
},
{
"__id__": 83
},
{
"__id__": 85
},
{
"__id__": 87
},
{
"__id__": 89
},
{
"__id__": 91
}
],
"_prefab": {
"__id__": 93
"__id__": 89
},
"_lpos": {
"__type__": "cc.Vec3",
@ -293,23 +293,23 @@
"__id__": 12
},
{
"__id__": 32
"__id__": 28
}
],
"_active": true,
"_components": [
{
"__id__": 36
},
{
"__id__": 38
},
{
"__id__": 40
},
{
"__id__": 42
},
{
"__id__": 44
}
],
"_prefab": {
"__id__": 46
"__id__": 42
},
"_lpos": {
"__type__": "cc.Vec3",
@ -351,26 +351,26 @@
"_children": [
{
"__id__": 13
},
{
"__id__": 19
}
],
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 21
},
{
"__id__": 29
"__id__": 23
},
{
"__id__": 25
}
],
"_prefab": {
"__id__": 31
"__id__": 27
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 70,
"x": 75.802,
"y": 94,
"z": 0
},
@ -413,15 +413,18 @@
},
{
"__id__": 16
},
{
"__id__": 18
}
],
"_prefab": {
"__id__": 18
"__id__": 20
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -242.00000000000003,
"y": 20,
"x": -333.405,
"y": 22.338,
"z": 0
},
"_lrot": {
@ -546,6 +549,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "4143eGnsZLGKtRmgjOp70S"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 13
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_alignFlags": 8,
"_target": null,
"_left": -150,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_alignMode": 2,
"_lockFlags": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b6g/z07sBFlZE9hCst2rRM"
},
{
"__type__": "cc.PrefabInfo",
"root": {
@ -559,70 +598,17 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "freeSpin",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 12
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
},
{
"__id__": 22
},
{
"__id__": 24
}
],
"_prefab": {
"__id__": 26
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 58.59499999999997,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 12
},
"_enabled": true,
"__prefab": {
"__id__": 21
"__id__": 22
},
"_contentSize": {
"__type__": "cc.Size",
@ -638,7 +624,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "6chw8ZUlpPhKz6Ubm4q694"
"fileId": "1fODyF851Pj6iyo4oQL0Ep"
},
{
"__type__": "cc.Sprite",
@ -646,11 +632,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 12
},
"_enabled": true,
"__prefab": {
"__id__": 23
"__id__": 24
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -683,7 +669,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "c5Anfk2rJGA79+HRJXL8y7"
"fileId": "12ND6Own9OzIBaU0vlvlq/"
},
{
"__type__": "e6c8d4szahIuLbtf6yx+hH6",
@ -691,97 +677,18 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 19
"__id__": 12
},
"_enabled": true,
"__prefab": {
"__id__": 25
"__id__": 26
},
"spriteName": "30",
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "2bJNR+OXJGkZibBs9mJGdJ"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "6f1+4lIepPHIPya0CoE+1F",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 12
},
"_enabled": true,
"__prefab": {
"__id__": 28
},
"_contentSize": {
"__type__": "cc.Size",
"width": 571.19,
"height": 104
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "1fODyF851Pj6iyo4oQL0Ep"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 12
},
"_enabled": true,
"__prefab": {
"__id__": 30
},
"_resizeMode": 1,
"_layoutType": 1,
"_cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_startAxis": 0,
"_paddingLeft": 0,
"_paddingRight": 0,
"_paddingTop": 0,
"_paddingBottom": 0,
"_spacingX": 30,
"_spacingY": 0,
"_verticalDirection": 1,
"_horizontalDirection": 0,
"_constraint": 0,
"_constraintNum": 2,
"_affectedByScale": false,
"_isAlign": false,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "08UTp66llO9awEZzmd4go6"
"fileId": "45BX2vxTFAEoqI+r5ZvIcK"
},
{
"__type__": "cc.PrefabInfo",
@ -807,18 +714,18 @@
"_children": [],
"_active": true,
"_components": [
{
"__id__": 29
},
{
"__id__": 31
},
{
"__id__": 33
},
{
"__id__": 35
},
{
"__id__": 37
}
],
"_prefab": {
"__id__": 39
"__id__": 35
},
"_lpos": {
"__type__": "cc.Vec3",
@ -855,11 +762,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 34
"__id__": 30
},
"_contentSize": {
"__type__": "cc.Size",
@ -883,11 +790,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 36
"__id__": 32
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -928,11 +835,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 32
"__id__": 28
},
"_enabled": true,
"__prefab": {
"__id__": 38
"__id__": 34
},
"spriteName": "29",
"_id": ""
@ -964,7 +871,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 41
"__id__": 37
},
"_contentSize": {
"__type__": "cc.Size",
@ -992,7 +899,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 43
"__id__": 39
},
"_opacity": 255,
"_id": ""
@ -1011,7 +918,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 45
"__id__": 41
},
"_resizeMode": 1,
"_layoutType": 2,
@ -1062,20 +969,20 @@
},
"_children": [
{
"__id__": 48
"__id__": 44
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 50
},
{
"__id__": 56
"__id__": 52
}
],
"_prefab": {
"__id__": 58
"__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1112,20 +1019,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 47
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 45
},
{
"__id__": 51
"__id__": 47
}
],
"_prefab": {
"__id__": 53
"__id__": 49
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1162,11 +1069,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 48
"__id__": 44
},
"_enabled": true,
"__prefab": {
"__id__": 50
"__id__": 46
},
"_contentSize": {
"__type__": "cc.Size",
@ -1190,11 +1097,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 48
"__id__": 44
},
"_enabled": true,
"__prefab": {
"__id__": 52
"__id__": 48
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1274,11 +1181,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 47
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 55
"__id__": 51
},
"_contentSize": {
"__type__": "cc.Size",
@ -1302,11 +1209,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 47
"__id__": 43
},
"_enabled": true,
"__prefab": {
"__id__": 57
"__id__": 53
},
"_opacity": 255,
"_id": ""
@ -1338,17 +1245,17 @@
},
"_children": [
{
"__id__": 60
"__id__": 56
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 78
}
],
"_prefab": {
"__id__": 84
"__id__": 80
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1385,30 +1292,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 59
"__id__": 55
},
"_children": [
{
"__id__": 61
"__id__": 57
},
{
"__id__": 69
"__id__": 65
}
],
"_active": true,
"_components": [
{
"__id__": 71
},
{
"__id__": 73
},
{
"__id__": 75
},
{
"__id__": 77
},
{
"__id__": 79
}
],
"_prefab": {
"__id__": 81
"__id__": 77
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1445,23 +1352,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 58
},
{
"__id__": 60
},
{
"__id__": 62
},
{
"__id__": 64
},
{
"__id__": 66
}
],
"_prefab": {
"__id__": 68
"__id__": 64
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1498,11 +1405,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 57
},
"_enabled": true,
"__prefab": {
"__id__": 63
"__id__": 59
},
"_contentSize": {
"__type__": "cc.Size",
@ -1526,11 +1433,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 57
},
"_enabled": true,
"__prefab": {
"__id__": 65
"__id__": 61
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1571,11 +1478,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 61
"__id__": 57
},
"_enabled": true,
"__prefab": {
"__id__": 67
"__id__": 63
},
"spriteName": "25",
"_id": ""
@ -1603,20 +1510,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 60
"__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 66
},
{
"__id__": 72
"__id__": 68
}
],
"_prefab": {
"__id__": 74
"__id__": 70
},
"_lpos": {
"__type__": "cc.Vec3",
@ -1653,11 +1560,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 69
"__id__": 65
},
"_enabled": true,
"__prefab": {
"__id__": 71
"__id__": 67
},
"_contentSize": {
"__type__": "cc.Size",
@ -1681,11 +1588,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 69
"__id__": 65
},
"_enabled": true,
"__prefab": {
"__id__": 73
"__id__": 69
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1739,11 +1646,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 56
},
"_enabled": true,
"__prefab": {
"__id__": 76
"__id__": 72
},
"_contentSize": {
"__type__": "cc.Size",
@ -1767,11 +1674,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 56
},
"_enabled": true,
"__prefab": {
"__id__": 78
"__id__": 74
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1812,11 +1719,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 60
"__id__": 56
},
"_enabled": true,
"__prefab": {
"__id__": 80
"__id__": 76
},
"clickEvents": [],
"_interactable": true,
@ -1881,11 +1788,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 59
"__id__": 55
},
"_enabled": true,
"__prefab": {
"__id__": 83
"__id__": 79
},
"_contentSize": {
"__type__": "cc.Size",
@ -1926,7 +1833,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 86
"__id__": 82
},
"_contentSize": {
"__type__": "cc.Size",
@ -1954,7 +1861,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 88
"__id__": 84
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@ -1999,7 +1906,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 90
"__id__": 86
},
"_opacity": 255,
"_id": ""
@ -2018,7 +1925,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 92
"__id__": 88
},
"_resizeMode": 0,
"_layoutType": 2,
@ -2069,7 +1976,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 95
"__id__": 91
},
"_contentSize": {
"__type__": "cc.Size",
@ -2097,7 +2004,7 @@
},
"_enabled": true,
"__prefab": {
"__id__": 97
"__id__": 93
},
"_alignFlags": 45,
"_target": null,

View File

@ -105,7 +105,7 @@ export class SlotGame extends Component {
this.grayNode = this.node.getChildByName('grayNode');
this.winLayer = this.node.getChildByName('winLayer');
this.readyHand = this.node.getChildByName('readyHand');
this.scatterLayer = this.node.getChildByPath('scatterLayer/layer')
this.scatterLayer = this.node.getChildByName('scatterLayer');
this.winType = this.node.getChildByName('winType');
@ -860,9 +860,8 @@ export class SlotGame extends Component {
}
setFeatureBuyInteractable(isInteractable: boolean) {
// this.featureBuyNode.getComponent(Sprite).grayscale = !isInteractable;
// this.featureBuyNode.getChildByName('FEATUREBUY').getComponent(Sprite).grayscale = !isInteractable;
this.featureBuyNode.getComponent(UIOpacity).opacity = isInteractable ? 255 : 160
this.featureBuyNode.getComponent(Sprite).grayscale = !isInteractable;
this.featureBuyNode.getChildByName('FEATUREBUY').getComponent(Sprite).grayscale = !isInteractable;
this.featureBuyNode.getComponent(Button).interactable = isInteractable;
}

View File

@ -212,9 +212,6 @@ export class SlotScene extends Component {
}
this.slotBar.reconnectState(true);
this.slotGame.changeBg(this.gameState.isInFreeSpin);
// this.slotGame.rollerManager.checkNextRollerExpect(6, 1)
// this.slotGame.showScatterOnIsScroll();
if (this.gameState.isInFreeSpin) {
AudioManager.instance.playBGM("Free_Mode_BGM");
} else {
@ -497,8 +494,6 @@ export class SlotScene extends Component {
allRollerStop() {
this.slotGame.setFastSpin(this.gameState.isFastSpin);
this.checkHasGame();
// this.slotGame.rollerManager.checkNextRollerExpect(6, 1)
// this.slotGame.showScatterOnIsScroll();
// this.TotalWin.show(35, () => {
// this.slotBar.resetAllState();
// });