Skip to content

D
dap-hu
Commit 6e6b468c authored by Vũ Gia Vương's avatar Vũ Gia Vương
Browse files
Options

update main logic, hide hammer when show card

parent 22254b11
Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 274 deletions
assets/main.fire
View file @ 6e6b468c
...@@ -78,28 +78,28 @@ ...@@ -78,28 +78,28 @@
"__id__": 11 "__id__": 11
}, },
{ {
"__id__": 55 "__id__": 52
}, },
{ {
"__id__": 64 "__id__": 61
}, },
{ {
"__id__": 27 "__id__": 24
}, },
{ {
"__id__": 66 "__id__": 63
}, },
{ {
"__id__": 79 "__id__": 76
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 80
}, },
{ {
"__id__": 84 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -538,15 +538,12 @@ ...@@ -538,15 +538,12 @@
}, },
{ {
"__id__": 15 "__id__": 15
},
{
"__id__": 18
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 22
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -597,124 +594,6 @@ ...@@ -597,124 +594,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "b7S+1yVWdOVpUbhfVUW5pm" "_id": "b7S+1yVWdOVpUbhfVUW5pm"
}, },
{
"__type__": "cc.Node",
"_name": "hu-old",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 13
},
{
"__id__": 14
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1080,
"height": 1920
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
18.083,
100,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a1cvtw1qhIDr/2EJIt0sL8"
},
{
"__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_materials": [
{
"__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
}
],
"paused": false,
"defaultSkin": "default",
"defaultAnimation": "",
"_preCacheMode": 0,
"_cacheMode": 0,
"loop": true,
"premultipliedAlpha": true,
"timeScale": 1,
"_accTime": 0,
"_playCount": 0,
"_frameCache": null,
"_curFrame": null,
"_skeletonCache": null,
"_animationName": "",
"_animationQueue": [],
"_headAniInfo": null,
"_playTimes": 0,
"_isAniComplete": true,
"_N$skeletonData": {
"__uuid__": "5642aaa9-3574-4d72-b579-98c42b029375"
},
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
"_N$debugBones": false,
"_N$debugMesh": false,
"_N$useTint": false,
"_N$enableBatch": false,
"_id": "38uz79AhVAAICrmmI0C6r6"
},
{
"__type__": "ba0b5Nq4fNP4KvnrykIXx3T",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"text": null,
"_id": "38z0bMJaVM5a4LWQUt9f2c"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "hu-3s", "_name": "hu-3s",
...@@ -726,10 +605,10 @@ ...@@ -726,10 +605,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 16 "__id__": 13
}, },
{ {
"__id__": 17 "__id__": 14
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -785,7 +664,7 @@ ...@@ -785,7 +664,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"text": { "text": {
...@@ -798,7 +677,7 @@ ...@@ -798,7 +677,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 15 "__id__": 12
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -844,13 +723,13 @@ ...@@ -844,13 +723,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 19 "__id__": 16
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 24 "__id__": 21
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -906,20 +785,20 @@ ...@@ -906,20 +785,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 18 "__id__": 15
}, },
"_children": [ "_children": [
{ {
"__id__": 20 "__id__": 17
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 19
}, },
{ {
"__id__": 23 "__id__": 20
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -946,7 +825,7 @@ ...@@ -946,7 +825,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, -20,
0, 0,
0, 0,
0, 0,
...@@ -975,13 +854,13 @@ ...@@ -975,13 +854,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 19 "__id__": 16
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 21 "__id__": 18
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1037,7 +916,7 @@ ...@@ -1037,7 +916,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 20 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1070,7 +949,7 @@ ...@@ -1070,7 +949,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1102,7 +981,7 @@ ...@@ -1102,7 +981,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 19 "__id__": 16
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -1110,8 +989,8 @@ ...@@ -1110,8 +989,8 @@
"_alignFlags": 45, "_alignFlags": 45,
"_left": -25, "_left": -25,
"_right": -25, "_right": -25,
"_top": -25, "_top": -5,
"_bottom": -25, "_bottom": -45,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -1129,7 +1008,7 @@ ...@@ -1129,7 +1008,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 15
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1202,7 +1081,7 @@ ...@@ -1202,7 +1081,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 19 "__id__": 16
}, },
"_id": "009jyGf0JGyaWytJquX/r/" "_id": "009jyGf0JGyaWytJquX/r/"
}, },
...@@ -1215,13 +1094,13 @@ ...@@ -1215,13 +1094,13 @@
}, },
"_enabled": true, "_enabled": true,
"selectBtnNode": { "selectBtnNode": {
"__id__": 18 "__id__": 15
}, },
"contentNode": { "contentNode": {
"__id__": 26 "__id__": 23
}, },
"checkedNode": { "checkedNode": {
"__id__": 34 "__id__": 31
}, },
"_id": "12WntYtI5C+bsPwyWnA236" "_id": "12WntYtI5C+bsPwyWnA236"
}, },
...@@ -1230,29 +1109,29 @@ ...@@ -1230,29 +1109,29 @@
"_name": "Conttent", "_name": "Conttent",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [ "_children": [
{ {
"__id__": 45 "__id__": 42
}, },
{ {
"__id__": 47 "__id__": 44
}, },
{ {
"__id__": 49 "__id__": 46
}, },
{ {
"__id__": 51 "__id__": 48
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 53 "__id__": 50
}, },
{ {
"__id__": 54 "__id__": 51
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1312,31 +1191,31 @@ ...@@ -1312,31 +1191,31 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 28 "__id__": 25
}, },
{ {
"__id__": 30 "__id__": 27
}, },
{ {
"__id__": 32 "__id__": 29
}, },
{ {
"__id__": 26 "__id__": 23
}, },
{ {
"__id__": 34 "__id__": 31
}, },
{ {
"__id__": 36 "__id__": 33
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 43 "__id__": 40
}, },
{ {
"__id__": 44 "__id__": 41
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1392,13 +1271,13 @@ ...@@ -1392,13 +1271,13 @@
"_name": "Mask", "_name": "Mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 29 "__id__": 26
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1454,7 +1333,7 @@ ...@@ -1454,7 +1333,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 28 "__id__": 25
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1486,13 +1365,13 @@ ...@@ -1486,13 +1365,13 @@
"_name": "BG", "_name": "BG",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 31 "__id__": 28
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1548,7 +1427,7 @@ ...@@ -1548,7 +1427,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 30 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1580,13 +1459,13 @@ ...@@ -1580,13 +1459,13 @@
"_name": "Title", "_name": "Title",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1642,7 +1521,7 @@ ...@@ -1642,7 +1521,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 32 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1675,13 +1554,13 @@ ...@@ -1675,13 +1554,13 @@
"_name": "Checked", "_name": "Checked",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1737,7 +1616,7 @@ ...@@ -1737,7 +1616,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 31
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1769,17 +1648,17 @@ ...@@ -1769,17 +1648,17 @@
"_name": "OkButton", "_name": "OkButton",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 27 "__id__": 24
}, },
"_children": [ "_children": [
{ {
"__id__": 37 "__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 42 "__id__": 39
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1835,20 +1714,20 @@ ...@@ -1835,20 +1714,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 36 "__id__": 33
}, },
"_children": [ "_children": [
{ {
"__id__": 38 "__id__": 35
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 37
}, },
{ {
"__id__": 41 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1904,13 +1783,13 @@ ...@@ -1904,13 +1783,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 37 "__id__": 34
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 39 "__id__": 36
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1966,7 +1845,7 @@ ...@@ -1966,7 +1845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 35
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1999,7 +1878,7 @@ ...@@ -1999,7 +1878,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2031,7 +1910,7 @@ ...@@ -2031,7 +1910,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 34
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -2058,7 +1937,7 @@ ...@@ -2058,7 +1937,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 36 "__id__": 33
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2131,7 +2010,7 @@ ...@@ -2131,7 +2010,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 37 "__id__": 34
}, },
"_id": "e8Z5R1m9xLJZ0M9KGeyDSC" "_id": "e8Z5R1m9xLJZ0M9KGeyDSC"
}, },
...@@ -2140,7 +2019,7 @@ ...@@ -2140,7 +2019,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_id": "f1aq5xMrVN341tWAhOykW0" "_id": "f1aq5xMrVN341tWAhOykW0"
...@@ -2150,7 +2029,7 @@ ...@@ -2150,7 +2029,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 27 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_id": "69dYJ1wBlP5Z6QRZCRykh8" "_id": "69dYJ1wBlP5Z6QRZCRykh8"
...@@ -2160,13 +2039,13 @@ ...@@ -2160,13 +2039,13 @@
"_name": "Bua", "_name": "Bua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 46 "__id__": 43
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2222,7 +2101,7 @@ ...@@ -2222,7 +2101,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 45 "__id__": 42
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2264,13 +2143,13 @@ ...@@ -2264,13 +2143,13 @@
"_name": "ga", "_name": "ga",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 45
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2326,7 +2205,7 @@ ...@@ -2326,7 +2205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 44
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2368,13 +2247,13 @@ ...@@ -2368,13 +2247,13 @@
"_name": "gai lung", "_name": "gai lung",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 50 "__id__": 47
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2430,7 +2309,7 @@ ...@@ -2430,7 +2309,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 49 "__id__": 46
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2472,13 +2351,13 @@ ...@@ -2472,13 +2351,13 @@
"_name": "gay", "_name": "gay",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 26 "__id__": 23
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2534,7 +2413,7 @@ ...@@ -2534,7 +2413,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 48
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2576,7 +2455,7 @@ ...@@ -2576,7 +2455,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 23
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -2608,7 +2487,7 @@ ...@@ -2608,7 +2487,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 26 "__id__": 23
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -2644,16 +2523,16 @@ ...@@ -2644,16 +2523,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 56 "__id__": 53
}, },
{ {
"__id__": 59 "__id__": 56
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2709,16 +2588,16 @@ ...@@ -2709,16 +2588,16 @@
"_name": "Chum", "_name": "Chum",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 52
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 54
}, },
{ {
"__id__": 58 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2774,7 +2653,7 @@ ...@@ -2774,7 +2653,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2816,7 +2695,7 @@ ...@@ -2816,7 +2695,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_id": "32Nb7fXTdNIYe2FGNiHQD8" "_id": "32Nb7fXTdNIYe2FGNiHQD8"
...@@ -2826,11 +2705,11 @@ ...@@ -2826,11 +2705,11 @@
"_name": "buaPos", "_name": "buaPos",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 52
}, },
"_children": [ "_children": [
{ {
"__id__": 60 "__id__": 57
} }
], ],
"_active": true, "_active": true,
...@@ -2888,16 +2767,16 @@ ...@@ -2888,16 +2767,16 @@
"_name": "Bua", "_name": "Bua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 59 "__id__": 56
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 58
}, },
{ {
"__id__": 62 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2953,11 +2832,11 @@ ...@@ -2953,11 +2832,11 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"chumNode": { "chumNode": {
"__id__": 56 "__id__": 53
}, },
"_id": "de4Eqj7wlDIqqcvtH5WY/o" "_id": "de4Eqj7wlDIqqcvtH5WY/o"
}, },
...@@ -2966,7 +2845,7 @@ ...@@ -2966,7 +2845,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3008,7 +2887,7 @@ ...@@ -3008,7 +2887,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 55 "__id__": 52
}, },
"_enabled": true, "_enabled": true,
"_id": "45yzC1EPtJP4Z8W/DF1iwD" "_id": "45yzC1EPtJP4Z8W/DF1iwD"
...@@ -3024,7 +2903,7 @@ ...@@ -3024,7 +2903,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 65 "__id__": 62
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3080,7 +2959,7 @@ ...@@ -3080,7 +2959,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_id": "96hHP+ssxLNpn8/i2AKAyI" "_id": "96hHP+ssxLNpn8/i2AKAyI"
...@@ -3094,19 +2973,19 @@ ...@@ -3094,19 +2973,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 67 "__id__": 64
}, },
{ {
"__id__": 70 "__id__": 67
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 74
}, },
{ {
"__id__": 78 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3162,16 +3041,16 @@ ...@@ -3162,16 +3041,16 @@
"_name": "The", "_name": "The",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 63
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 65
}, },
{ {
"__id__": 69 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3227,7 +3106,7 @@ ...@@ -3227,7 +3106,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 64
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3269,7 +3148,7 @@ ...@@ -3269,7 +3148,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 64
}, },
"_enabled": true, "_enabled": true,
"_id": "8aU9CpQKRFmJMSMUCpaItu" "_id": "8aU9CpQKRFmJMSMUCpaItu"
...@@ -3279,17 +3158,17 @@ ...@@ -3279,17 +3158,17 @@
"_name": "Replay Button", "_name": "Replay Button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 63
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 73
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3345,20 +3224,20 @@ ...@@ -3345,20 +3224,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 70 "__id__": 67
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 69
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 71
}, },
{ {
"__id__": 75 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3414,13 +3293,13 @@ ...@@ -3414,13 +3293,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 71 "__id__": 68
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3476,7 +3355,7 @@ ...@@ -3476,7 +3355,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3509,7 +3388,7 @@ ...@@ -3509,7 +3388,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3541,7 +3420,7 @@ ...@@ -3541,7 +3420,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -3568,7 +3447,7 @@ ...@@ -3568,7 +3447,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3641,7 +3520,7 @@ ...@@ -3641,7 +3520,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 71 "__id__": 68
}, },
"_id": "adCMRaOEVD5LOjd7MAm9EO" "_id": "adCMRaOEVD5LOjd7MAm9EO"
}, },
...@@ -3650,7 +3529,7 @@ ...@@ -3650,7 +3529,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_id": "bcaw0ZNyRPGoK8ATotq1yF" "_id": "bcaw0ZNyRPGoK8ATotq1yF"
...@@ -3660,7 +3539,7 @@ ...@@ -3660,7 +3539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_id": "17J7OqMb1NsbF4iJiNTrDS" "_id": "17J7OqMb1NsbF4iJiNTrDS"
...@@ -3674,13 +3553,13 @@ ...@@ -3674,13 +3553,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 80 "__id__": 77
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3736,13 +3615,13 @@ ...@@ -3736,13 +3615,13 @@
"_name": "beer-bottle-rolling-on-a-sidewalk-82234", "_name": "beer-bottle-rolling-on-a-sidewalk-82234",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 76
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3798,7 +3677,7 @@ ...@@ -3798,7 +3677,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -3817,11 +3696,11 @@ ...@@ -3817,11 +3696,11 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"rollingSound": { "rollingSound": {
"__id__": 81 "__id__": 78
}, },
"_id": "a5vu6IE1ROn6VO7UPM9J3p" "_id": "a5vu6IE1ROn6VO7UPM9J3p"
}, },
......
assets/scripts/GamePlay/BuaController.ts
View file @ 6e6b468c
...@@ -27,7 +27,8 @@ export default class BuaController extends cc.Component { ...@@ -27,7 +27,8 @@ export default class BuaController extends cc.Component {
} }
public onSetTool() { public onSetTool() {
this.spine.setSkin(this._skins[Global.tool % this._skins.length]) this.spine.setSkin(this._skins[Global.tool % this._skins.length]);
this.node.position = cc.v3(0, 0, 0);
} }
private onTouchStart(): void { private onTouchStart(): void {
...@@ -62,9 +63,12 @@ export default class BuaController extends cc.Component { ...@@ -62,9 +63,12 @@ export default class BuaController extends cc.Component {
this.playSound(); this.playSound();
this._chumCtrl.playAnimationNut4(); this._chumCtrl.playAnimationNut4();
this.scheduleOnce(() => { cc.tween(this.node)
eventTarget.emit(SHOW_CARD_POPUP); .by(0.5, { position: cc.v3(300,) })
}, 0.5) .call(() => {
eventTarget.emit(SHOW_CARD_POPUP);
})
.start();
} }
private playSound() { private playSound() {
......
assets/scripts/GamePlay/HuController.ts
View file @ 6e6b468c
...@@ -28,20 +28,18 @@ export default class HuController extends cc.Component { ...@@ -28,20 +28,18 @@ export default class HuController extends cc.Component {
} }
protected start(): void { protected start(): void {
this.scheduleOnce(() => this.testDevice, 1); this.scheduleOnce(() => this.testDevice, 3);
console.log('testDevice',)
} }
private testDevice() { private testDevice() {
this.text.string = 'testDevice';
console.log('testDevice',)
window.addEventListener("devicemotion", (event) => { window.addEventListener("devicemotion", (event) => {
if (!event.accelerationIncludingGravity) { if (!event.accelerationIncludingGravity) {
return; return;
} }
this.text.string = ` this.text.string = `lac`;
x: ${event.accelerationIncludingGravity.x},
y: ${event.accelerationIncludingGravity.y},
z: ${event.accelerationIncludingGravity.z}`;
const x = event.accelerationIncludingGravity.x; const x = event.accelerationIncludingGravity.x;
const y = event.accelerationIncludingGravity.y; const y = event.accelerationIncludingGravity.y;
const z = event.accelerationIncludingGravity.z; const z = event.accelerationIncludingGravity.z;
......
assets/scripts/UI/ActionScreen.ts
View file @ 6e6b468c
import { eventTarget, SHOW_ACTION_SCREEN, SHOW_CARD_POPUP } from "../Events"; import { eventTarget, SHOW_ACTION_SCREEN, SHOW_CARD_POPUP, SHOW_START_SCREEN } from "../Events";
import BuaController from "../GamePlay/BuaController"; import BuaController from "../GamePlay/BuaController";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
...@@ -11,7 +11,8 @@ export default class ActionScreen extends cc.Component { ...@@ -11,7 +11,8 @@ export default class ActionScreen extends cc.Component {
onLoad() { onLoad() {
this.node.position = cc.v3(); this.node.position = cc.v3();
this.node.active = false; this.node.active = false;
eventTarget.on(SHOW_ACTION_SCREEN, this.showScreen, this); eventTarget.on(SHOW_ACTION_SCREEN, this.showScreen, this);
eventTarget.on(SHOW_START_SCREEN, this.hideScreen, this);
this._buaController = this.getComponentInChildren(BuaController); this._buaController = this.getComponentInChildren(BuaController);
} }
...@@ -20,4 +21,8 @@ export default class ActionScreen extends cc.Component { ...@@ -20,4 +21,8 @@ export default class ActionScreen extends cc.Component {
this._buaController.onSetTool(); this._buaController.onSetTool();
} }
private hideScreen() {
this.node.active = false;
}
} }
assets/scripts/UI/CardPopup.ts
View file @ 6e6b468c
import { eventTarget, SHOW_CARD_POPUP, STOP_ANIM_CHUM } from "../Events"; import { eventTarget, SHOW_CARD_POPUP, SHOW_START_SCREEN, STOP_ANIM_CHUM } from "../Events";
const { ccclass, property } = cc._decorator; const { ccclass, property } = cc._decorator;
...@@ -25,6 +25,7 @@ export default class CardPopup extends cc.Component { ...@@ -25,6 +25,7 @@ export default class CardPopup extends cc.Component {
private onReplayBtnClick() { private onReplayBtnClick() {
this.node.active = false; this.node.active = false;
eventTarget.emit(SHOW_START_SCREEN);
eventTarget.emit(STOP_ANIM_CHUM); eventTarget.emit(STOP_ANIM_CHUM);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment