Skip to content

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

fix block input event

parent 7273b42a
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 127 deletions
assets/main.fire
View file @ ae8bab5a
...@@ -81,22 +81,22 @@ ...@@ -81,22 +81,22 @@
"__id__": 190 "__id__": 190
}, },
{ {
"__id__": 223 "__id__": 222
}, },
{ {
"__id__": 225 "__id__": 224
}, },
{ {
"__id__": 242 "__id__": 241
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 252 "__id__": 251
}, },
{ {
"__id__": 253 "__id__": 252
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8581,16 +8581,16 @@ ...@@ -8581,16 +8581,16 @@
"__id__": 191 "__id__": 191
}, },
{ {
"__id__": 214 "__id__": 213
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 221 "__id__": 220
}, },
{ {
"__id__": 222 "__id__": 221
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8604,8 +8604,8 @@ ...@@ -8604,8 +8604,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1100,
"height": 0 "height": 2000
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -8684,9 +8684,6 @@ ...@@ -8684,9 +8684,6 @@
"_components": [ "_components": [
{ {
"__id__": 212 "__id__": 212
},
{
"__id__": 213
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9688,46 +9685,6 @@ ...@@ -9688,46 +9685,6 @@
"_enabled": true, "_enabled": true,
"_id": "ce7kjbfMJI6azmjgef3qfN" "_id": "ce7kjbfMJI6azmjgef3qfN"
}, },
{
"__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
},
"_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": null,
"_N$_defaultCacheMode": 0,
"_N$debugSlots": false,
"_N$debugBones": false,
"_N$debugMesh": false,
"_N$useTint": false,
"_N$enableBatch": false,
"_id": "fdPLj1BaNCl5GR/GJsz/7+"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "SelectButton", "_name": "SelectButton",
...@@ -9737,13 +9694,13 @@ ...@@ -9737,13 +9694,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 215 "__id__": 214
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 220 "__id__": 219
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9799,20 +9756,20 @@ ...@@ -9799,20 +9756,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 214 "__id__": 213
}, },
"_children": [ "_children": [
{ {
"__id__": 216 "__id__": 215
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 218 "__id__": 217
}, },
{ {
"__id__": 219 "__id__": 218
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9868,13 +9825,13 @@ ...@@ -9868,13 +9825,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 215 "__id__": 214
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 217 "__id__": 216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9930,7 +9887,7 @@ ...@@ -9930,7 +9887,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 216 "__id__": 215
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9965,7 +9922,7 @@ ...@@ -9965,7 +9922,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 215 "__id__": 214
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9997,7 +9954,7 @@ ...@@ -9997,7 +9954,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 215 "__id__": 214
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -10024,7 +9981,7 @@ ...@@ -10024,7 +9981,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 214 "__id__": 213
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10097,7 +10054,7 @@ ...@@ -10097,7 +10054,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 215 "__id__": 214
}, },
"_id": "009jyGf0JGyaWytJquX/r/" "_id": "009jyGf0JGyaWytJquX/r/"
}, },
...@@ -10110,7 +10067,7 @@ ...@@ -10110,7 +10067,7 @@
}, },
"_enabled": true, "_enabled": true,
"selectBtnNode": { "selectBtnNode": {
"__id__": 214 "__id__": 213
}, },
"_id": "12WntYtI5C+bsPwyWnA236" "_id": "12WntYtI5C+bsPwyWnA236"
}, },
...@@ -10135,7 +10092,7 @@ ...@@ -10135,7 +10092,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 224 "__id__": 223
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10191,7 +10148,7 @@ ...@@ -10191,7 +10148,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 223 "__id__": 222
}, },
"_enabled": true, "_enabled": true,
"_id": "96hHP+ssxLNpn8/i2AKAyI" "_id": "96hHP+ssxLNpn8/i2AKAyI"
...@@ -10205,22 +10162,22 @@ ...@@ -10205,22 +10162,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 226 "__id__": 225
}, },
{ {
"__id__": 228 "__id__": 227
}, },
{ {
"__id__": 233 "__id__": 232
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 240 "__id__": 239
}, },
{ {
"__id__": 241 "__id__": 240
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10276,13 +10233,13 @@ ...@@ -10276,13 +10233,13 @@
"_name": "Mask copy", "_name": "Mask copy",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 225 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 227 "__id__": 226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10338,7 +10295,7 @@ ...@@ -10338,7 +10295,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 226 "__id__": 225
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10370,20 +10327,20 @@ ...@@ -10370,20 +10327,20 @@
"_name": "The", "_name": "The",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 225 "__id__": 224
}, },
"_children": [ "_children": [
{ {
"__id__": 229 "__id__": 228
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 231 "__id__": 230
}, },
{ {
"__id__": 232 "__id__": 231
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10439,13 +10396,13 @@ ...@@ -10439,13 +10396,13 @@
"_name": "text1", "_name": "text1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 228 "__id__": 227
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 230 "__id__": 229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10501,7 +10458,7 @@ ...@@ -10501,7 +10458,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 229 "__id__": 228
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10533,7 +10490,7 @@ ...@@ -10533,7 +10490,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 227
}, },
"_enabled": true, "_enabled": true,
"frames": [ "frames": [
...@@ -10551,7 +10508,7 @@ ...@@ -10551,7 +10508,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 227
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10593,17 +10550,17 @@ ...@@ -10593,17 +10550,17 @@
"_name": "Replay Button", "_name": "Replay Button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 225 "__id__": 224
}, },
"_children": [ "_children": [
{ {
"__id__": 234 "__id__": 233
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 239 "__id__": 238
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10659,20 +10616,20 @@ ...@@ -10659,20 +10616,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 233 "__id__": 232
}, },
"_children": [ "_children": [
{ {
"__id__": 235 "__id__": 234
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 237 "__id__": 236
}, },
{ {
"__id__": 238 "__id__": 237
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10728,13 +10685,13 @@ ...@@ -10728,13 +10685,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 234 "__id__": 233
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 236 "__id__": 235
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10790,7 +10747,7 @@ ...@@ -10790,7 +10747,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 235 "__id__": 234
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10825,7 +10782,7 @@ ...@@ -10825,7 +10782,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 234 "__id__": 233
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10857,7 +10814,7 @@ ...@@ -10857,7 +10814,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 234 "__id__": 233
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -10884,7 +10841,7 @@ ...@@ -10884,7 +10841,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 233 "__id__": 232
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10957,7 +10914,7 @@ ...@@ -10957,7 +10914,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 234 "__id__": 233
}, },
"_id": "adCMRaOEVD5LOjd7MAm9EO" "_id": "adCMRaOEVD5LOjd7MAm9EO"
}, },
...@@ -10966,7 +10923,7 @@ ...@@ -10966,7 +10923,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 225 "__id__": 224
}, },
"_enabled": true, "_enabled": true,
"_id": "bcaw0ZNyRPGoK8ATotq1yF" "_id": "bcaw0ZNyRPGoK8ATotq1yF"
...@@ -10976,7 +10933,7 @@ ...@@ -10976,7 +10933,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 225 "__id__": 224
}, },
"_enabled": true, "_enabled": true,
"_id": "17J7OqMb1NsbF4iJiNTrDS" "_id": "17J7OqMb1NsbF4iJiNTrDS"
...@@ -10990,22 +10947,22 @@ ...@@ -10990,22 +10947,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 243 "__id__": 242
}, },
{ {
"__id__": 245 "__id__": 244
}, },
{ {
"__id__": 247 "__id__": 246
}, },
{ {
"__id__": 249 "__id__": 248
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 251 "__id__": 250
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11061,13 +11018,13 @@ ...@@ -11061,13 +11018,13 @@
"_name": "beer-bottle-rolling-on-a-sidewalk-82234", "_name": "beer-bottle-rolling-on-a-sidewalk-82234",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 241
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 244 "__id__": 243
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11123,7 +11080,7 @@ ...@@ -11123,7 +11080,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 243 "__id__": 242
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -11142,13 +11099,13 @@ ...@@ -11142,13 +11099,13 @@
"_name": "Cartoon Short Version 2_01", "_name": "Cartoon Short Version 2_01",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 241
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 246 "__id__": 245
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11204,7 +11161,7 @@ ...@@ -11204,7 +11161,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 245 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -11223,13 +11180,13 @@ ...@@ -11223,13 +11180,13 @@
"_name": "tieng_va_cham_chai_thuy_tinh-www_tiengdong_com", "_name": "tieng_va_cham_chai_thuy_tinh-www_tiengdong_com",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 241
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 248 "__id__": 247
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11285,7 +11242,7 @@ ...@@ -11285,7 +11242,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 247 "__id__": 246
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -11304,13 +11261,13 @@ ...@@ -11304,13 +11261,13 @@
"_name": "breaking-a-vase-remix-87091", "_name": "breaking-a-vase-remix-87091",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 242 "__id__": 241
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 250 "__id__": 249
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11366,7 +11323,7 @@ ...@@ -11366,7 +11323,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 249 "__id__": 248
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -11385,17 +11342,17 @@ ...@@ -11385,17 +11342,17 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 241
}, },
"_enabled": true, "_enabled": true,
"rollingSound": { "rollingSound": {
"__id__": 244 "__id__": 243
}, },
"breakingSound": { "breakingSound": {
"__id__": 250 "__id__": 249
}, },
"dropSound": { "dropSound": {
"__id__": 248 "__id__": 247
}, },
"_id": "a5vu6IE1ROn6VO7UPM9J3p" "_id": "a5vu6IE1ROn6VO7UPM9J3p"
}, },
......
assets/scripts/GamePlay/BreakingJarController.ts
View file @ ae8bab5a
...@@ -184,6 +184,7 @@ export default class BreakingJarController extends cc.Component { ...@@ -184,6 +184,7 @@ export default class BreakingJarController extends cc.Component {
} }
private onTouchStart(event: cc.Event.EventTouch) { private onTouchStart(event: cc.Event.EventTouch) {
console.log('onTouchStart', 1)
eventTarget.emit(STOP_GUILD_TAP); eventTarget.emit(STOP_GUILD_TAP);
const pos = event.getLocation(); const pos = event.getLocation();
const nodePos = this.node.convertToNodeSpaceAR(pos); const nodePos = this.node.convertToNodeSpaceAR(pos);
......
assets/scripts/GamePlay/HuController.ts
View file @ ae8bab5a
...@@ -5,7 +5,6 @@ const { ccclass, property } = cc._decorator; ...@@ -5,7 +5,6 @@ const { ccclass, property } = cc._decorator;
@ccclass @ccclass
export default class HuController extends cc.Component { export default class HuController extends cc.Component {
private _spine: sp.Skeleton = null;
private _x: number = 0; private _x: number = 0;
private _y: number = 0; private _y: number = 0;
private _z: number = 0; private _z: number = 0;
...@@ -14,7 +13,6 @@ export default class HuController extends cc.Component { ...@@ -14,7 +13,6 @@ export default class HuController extends cc.Component {
private _debug: cc.Label = null; private _debug: cc.Label = null;
protected onLoad(): void { protected onLoad(): void {
this._spine = this.node.getComponent(sp.Skeleton);
this._debug = this.node.getComponentInChildren(cc.Label); this._debug = this.node.getComponentInChildren(cc.Label);
if (cc.sys.os === cc.sys.OS_IOS) { if (cc.sys.os === cc.sys.OS_IOS) {
...@@ -23,8 +21,6 @@ export default class HuController extends cc.Component { ...@@ -23,8 +21,6 @@ export default class HuController extends cc.Component {
else { else {
this.scheduleOnce(this.setDeviceMotion, 2); this.scheduleOnce(this.setDeviceMotion, 2);
} }
this._spine.timeScale = 0;
} }
private setDeviceMotionIOS() { private setDeviceMotionIOS() {
......
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