[fix] HoldButton 點擊事件衝突

This commit is contained in:
2022-05-05 19:19:28 +08:00
parent 4aabd0b866
commit d771dd7593
20 changed files with 3594 additions and 6079 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -30,26 +30,26 @@
"__id__": 14
},
{
"__id__": 21
"__id__": 22
},
{
"__id__": 24
"__id__": 25
}
],
"_active": true,
"_components": [
{
"__id__": 28
},
{
"__id__": 29
},
{
"__id__": 30
},
{
"__id__": 31
}
],
"_prefab": {
"__id__": 31
"__id__": 32
},
"_opacity": 255,
"_color": {
@@ -545,12 +545,18 @@
],
"_active": true,
"_components": [
{
"__id__": 18
},
{
"__id__": 19
},
{
"__id__": 20
}
],
"_prefab": {
"__id__": 20
"__id__": 21
},
"_opacity": 255,
"_color": {
@@ -562,7 +568,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 170,
"width": 141,
"height": 95
},
"_anchorPoint": {
@@ -574,7 +580,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
24.968,
40.145,
0,
0,
0,
@@ -611,13 +617,10 @@
"_components": [
{
"__id__": 16
},
{
"__id__": 17
}
],
"_prefab": {
"__id__": 18
"__id__": 17
},
"_opacity": 255,
"_color": {
@@ -641,7 +644,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-15.785,
6.2,
0,
0,
@@ -666,78 +669,6 @@
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 0.9,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 1,
"transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 230,
"g": 230,
"b": 230,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 120,
"g": 120,
"b": 120,
"a": 200
},
"_N$normalSprite": {
"__uuid__": "eacf7329-d93d-41c2-a973-4065b01b6041"
},
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 15
},
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
@@ -788,7 +719,7 @@
"node": {
"__id__": 14
},
"_enabled": false,
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
@@ -801,6 +732,92 @@
"_N$inverted": false,
"_id": ""
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 1,
"transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 200,
"g": 200,
"b": 200,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 245,
"g": 245,
"b": 245,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 245,
"g": 245,
"b": 245,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 15
},
"_id": ""
},
{
"__type__": "0d1d5HfnyFLAK2RYSpW387d",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
},
"_enabled": true,
"MaxTime": 0.3,
"IsHaveHoldLine": false,
"HoldLine": null,
"ProgressBG": null,
"ProgressLine": null,
"OnInvoke": [],
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -823,11 +840,11 @@
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 23
}
],
"_prefab": {
"__id__": 23
"__id__": 24
},
"_opacity": 255,
"_color": {
@@ -881,7 +898,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 22
},
"_enabled": true,
"_materials": [
@@ -931,14 +948,14 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 26
},
{
"__id__": 26
"__id__": 27
}
],
"_prefab": {
"__id__": 27
"__id__": 28
},
"_opacity": 255,
"_color": {
@@ -992,7 +1009,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 25
},
"_enabled": true,
"_normalMaterial": null,
@@ -1055,7 +1072,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 24
"__id__": 25
},
"_id": ""
},
@@ -1064,7 +1081,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 25
},
"_enabled": true,
"_materials": [
@@ -1207,13 +1224,13 @@
},
"_enabled": true,
"MaxTime": 2,
"Button": {
"__id__": 16
},
"holdLine": null,
"progressBG": null,
"progressLine": null,
"OnInvoke": [],
"IsHaveHoldLine": false,
"HoldLine": null,
"ProgressBG": null,
"ProgressLine": null,
"OnInvoke": [
null
],
"_id": ""
},
{