diff --git a/README.md b/README.md
index d29aa5a..9e7ed3a 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,12 @@
-# 仿Unity Animator可视化动画状态机编辑器
+# Cocos Animator
+一个用于Cocos Creator的可视化动画状态机编辑器。
+编辑器地址：https://leeyip.github.io/cocos-animator/
-## TODO
-- [ ] 加载界面
-- [ ] 导入animation、spine、dragon bone文件生成状态节点
-- [x] 选中状态节点时，可更改transition排序，用于决定优先级（inspector中的transition显示需要做特殊表现用以表示此时可以进行排序）
-- [x] 状态节点与子状态机节点可以拖入到子状态机节点内，需解决跨越多层连线的问题
-- [x] 连向状态机的连线选项显示多层状态
-- [ ] 优化ui与代码、drawcall
-- [ ] *?每个状态机的entry和exit，状态机和状态一样也可以绑定逻辑脚本*
+## 目录
+
+## 前言
+
+## 使用
## 注意点
- 参数名、子状态机名、状态名都不可重名
@@ -16,8 +15,8 @@
- 当transition未勾选hasExitTime以及没有添加任何condition时，transition会被忽略
- Parameters和Inspector两个界面如果内容超出，使用鼠标滚轮滚动，因为为了防止与拖拽行为产生冲突，触摸事件已被屏蔽
-## 文件格式
-### 1. 编辑器工程文件格式
+## 数据格式
+### 1. 编辑器工程数据格式
```
{
/** 编辑器版本号 */
@@ -121,7 +120,7 @@
}
```
-### 2. runtime解析所需的文件格式
+### 2. runtime解析所需的数据格式
```
{
parameters: [
diff --git a/animator-editor/assets/res/texture/ui/add.png b/animator-editor/assets/res/texture/ui/add.png
new file mode 100644
index 0000000..d2dfca5
Binary files /dev/null and b/animator-editor/assets/res/texture/ui/add.png differ
diff --git a/animator-editor/assets/res/texture/ui/add.png.meta b/animator-editor/assets/res/texture/ui/add.png.meta
new file mode 100644
index 0000000..32bcf09
--- /dev/null
+++ b/animator-editor/assets/res/texture/ui/add.png.meta
@@ -0,0 +1,34 @@
+{
+ "ver": "2.3.3",
+ "uuid": "23ea6c0c-f477-404d-b16a-71bd87ca688c",
+ "type": "sprite",
+ "wrapMode": "clamp",
+ "filterMode": "point",
+ "premultiplyAlpha": false,
+ "genMipmaps": false,
+ "packable": true,
+ "platformSettings": {},
+ "subMetas": {
+ "add": {
+ "ver": "1.0.4",
+ "uuid": "6ac85e90-e7bb-4c26-83d1-63b3e2c67b5b",
+ "rawTextureUuid": "23ea6c0c-f477-404d-b16a-71bd87ca688c",
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 0,
+ "trimY": 0,
+ "width": 21,
+ "height": 21,
+ "rawWidth": 21,
+ "rawHeight": 21,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "subMetas": {}
+ }
+ }
+}
\ No newline at end of file
diff --git a/animator-editor/assets/res/texture/ui/rect_round.png.meta b/animator-editor/assets/res/texture/ui/rect_round.png.meta
index 2a27356..ae17166 100644
--- a/animator-editor/assets/res/texture/ui/rect_round.png.meta
+++ b/animator-editor/assets/res/texture/ui/rect_round.png.meta
@@ -24,10 +24,10 @@
"height": 250,
"rawWidth": 250,
"rawHeight": 250,
- "borderTop": 20,
- "borderBottom": 20,
- "borderLeft": 20,
- "borderRight": 20,
+ "borderTop": 15,
+ "borderBottom": 15,
+ "borderLeft": 15,
+ "borderRight": 15,
"subMetas": {}
}
}
diff --git a/animator-editor/assets/resources/prefab/Editor.prefab b/animator-editor/assets/resources/prefab/Editor.prefab
index d55f617..d9d3b31 100644
--- a/animator-editor/assets/resources/prefab/Editor.prefab
+++ b/animator-editor/assets/resources/prefab/Editor.prefab
@@ -21,13 +21,13 @@
"__id__": 2
},
{
- "__id__": 41
+ "__id__": 38
},
{
- "__id__": 265
+ "__id__": 267
},
{
- "__id__": 314
+ "__id__": 317
},
{
"__id__": 25
@@ -36,14 +36,14 @@
"_active": true,
"_components": [
{
- "__id__": 546
+ "__id__": 553
},
{
- "__id__": 547
+ "__id__": 554
}
],
"_prefab": {
- "__id__": 548
+ "__id__": 555
},
"_opacity": 255,
"_color": {
@@ -117,7 +117,7 @@
}
],
"_prefab": {
- "__id__": 40
+ "__id__": 37
},
"_opacity": 255,
"_color": {
@@ -876,15 +876,12 @@
},
{
"__id__": 33
- },
- {
- "__id__": 36
}
],
"_active": true,
"_components": [],
"_prefab": {
- "__id__": 39
+ "__id__": 36
},
"_opacity": 255,
"_color": {
@@ -908,8 +905,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 42.432,
- 117.053,
+ 42,
+ 117,
0,
0,
0,
@@ -1242,15 +1239,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 50,
+ "g": 200,
+ "b": 40,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 5,
- "height": 20
+ "width": 21,
+ "height": 21
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1302,10 +1299,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ "__uuid__": "6ac85e90-e7bb-4c26-83d1-63b3e2c67b5b"
},
"_type": 0,
- "_sizeMode": 0,
+ "_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
@@ -1329,113 +1326,6 @@
"fileId": "50tz/a7FBMW55QrXQG07mG",
"sync": false
},
- {
- "__type__": "cc.Node",
- "_name": "New Sprite(Splash) copy",
- "_objFlags": 0,
- "_parent": {
- "__id__": 24
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 37
- }
- ],
- "_prefab": {
- "__id__": 38
- },
- "_opacity": 255,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 20,
- "height": 5
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_trs": {
- "__type__": "TypedArray",
- "ctor": "Float64Array",
- "array": [
- 0,
- 0,
- 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": ""
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "node": {
- "__id__": 36
- },
- "_enabled": true,
- "_materials": [
- {
- "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
- }
- ],
- "_srcBlendFactor": 770,
- "_dstBlendFactor": 771,
- "_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
- },
- "_type": 0,
- "_sizeMode": 0,
- "_fillType": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
- },
- "fileId": "2134PgYTZHr5eUqXSfvOOL",
- "sync": false
- },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -1467,38 +1357,41 @@
},
"_children": [
{
- "__id__": 42
+ "__id__": 39
},
{
- "__id__": 50
+ "__id__": 47
},
{
- "__id__": 247
+ "__id__": 51
},
{
- "__id__": 256
+ "__id__": 249
+ },
+ {
+ "__id__": 258
}
],
"_active": true,
"_components": [
- {
- "__id__": 259
- },
{
"__id__": 261
},
- {
- "__id__": 262
- },
- {
- "__id__": 252
- },
{
"__id__": 263
+ },
+ {
+ "__id__": 264
+ },
+ {
+ "__id__": 254
+ },
+ {
+ "__id__": 265
}
],
"_prefab": {
- "__id__": 264
+ "__id__": 266
},
"_opacity": 255,
"_color": {
@@ -1552,24 +1445,24 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
- "__id__": 41
+ "__id__": 38
},
"_children": [
{
- "__id__": 43
+ "__id__": 40
}
],
"_active": true,
"_components": [
{
- "__id__": 47
+ "__id__": 44
},
{
- "__id__": 48
+ "__id__": 45
}
],
"_prefab": {
- "__id__": 49
+ "__id__": 46
},
"_opacity": 255,
"_color": {
@@ -1623,20 +1516,20 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 42
+ "__id__": 39
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 44
+ "__id__": 41
},
{
- "__id__": 45
+ "__id__": 42
}
],
"_prefab": {
- "__id__": 46
+ "__id__": 43
},
"_opacity": 255,
"_color": {
@@ -1690,7 +1583,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 43
+ "__id__": 40
},
"_enabled": true,
"_materials": [
@@ -1720,7 +1613,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 43
+ "__id__": 40
},
"_enabled": true,
"_color": {
@@ -1749,7 +1642,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 42
+ "__id__": 39
},
"_enabled": true,
"alignMode": 1,
@@ -1776,7 +1669,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 42
+ "__id__": 39
},
"_enabled": true,
"_materials": [
@@ -1787,7 +1680,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "dcfeb2dd-7662-49c9-8df7-3d4f208a752c"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 0,
"_sizeMode": 0,
@@ -1814,29 +1707,166 @@
"fileId": "787dJlELdFVL2eB8+Q/DqK",
"sync": false
},
+ {
+ "__type__": "cc.Node",
+ "_name": "edge",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 38
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 49
+ }
+ ],
+ "_prefab": {
+ "__id__": 50
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 40,
+ "g": 40,
+ "b": 40,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 2,
+ "height": 1080
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ -200,
+ 0,
+ 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": ""
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 47
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 13,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 36,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 47
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": {
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ },
+ "_type": 0,
+ "_sizeMode": 0,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
+ },
+ "fileId": "c7TwhNXTZPl7Pny8r31gPi",
+ "sync": false
+ },
{
"__type__": "cc.Node",
"_name": "view",
"_objFlags": 0,
"_parent": {
- "__id__": 41
+ "__id__": 38
},
"_children": [
{
- "__id__": 51
+ "__id__": 52
}
],
"_active": true,
"_components": [
{
- "__id__": 244
+ "__id__": 246
},
{
- "__id__": 245
+ "__id__": 247
}
],
"_prefab": {
- "__id__": 246
+ "__id__": 248
},
"_opacity": 255,
"_color": {
@@ -1890,30 +1920,30 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 50
+ "__id__": 51
},
"_children": [
{
- "__id__": 52
+ "__id__": 53
},
{
- "__id__": 142
+ "__id__": 147
},
{
- "__id__": 174
+ "__id__": 179
}
],
"_active": true,
"_components": [
{
- "__id__": 241
+ "__id__": 243
},
{
- "__id__": 242
+ "__id__": 244
}
],
"_prefab": {
- "__id__": 243
+ "__id__": 245
},
"_opacity": 255,
"_color": {
@@ -1967,36 +1997,36 @@
"_name": "UnitInfo",
"_objFlags": 0,
"_parent": {
- "__id__": 51
+ "__id__": 52
},
"_children": [
{
- "__id__": 53
+ "__id__": 54
},
{
- "__id__": 73
+ "__id__": 74
},
{
- "__id__": 93
+ "__id__": 94
},
{
- "__id__": 113
+ "__id__": 114
},
{
- "__id__": 126
+ "__id__": 131
}
],
"_active": true,
"_components": [
{
- "__id__": 139
+ "__id__": 144
},
{
- "__id__": 140
+ "__id__": 145
}
],
"_prefab": {
- "__id__": 141
+ "__id__": 146
},
"_opacity": 255,
"_color": {
@@ -2050,21 +2080,21 @@
"_name": "Name",
"_objFlags": 0,
"_parent": {
- "__id__": 52
+ "__id__": 53
},
"_children": [
{
- "__id__": 54
+ "__id__": 55
}
],
"_active": true,
"_components": [
{
- "__id__": 71
+ "__id__": 72
}
],
"_prefab": {
- "__id__": 72
+ "__id__": 73
},
"_opacity": 255,
"_color": {
@@ -2118,30 +2148,30 @@
"_name": "editBox",
"_objFlags": 0,
"_parent": {
- "__id__": 53
+ "__id__": 54
},
"_children": [
{
- "__id__": 55
+ "__id__": 56
},
{
- "__id__": 59
+ "__id__": 60
},
{
- "__id__": 63
+ "__id__": 64
}
],
"_active": true,
"_components": [
{
- "__id__": 67
+ "__id__": 68
},
{
- "__id__": 68
+ "__id__": 69
}
],
"_prefab": {
- "__id__": 70
+ "__id__": 71
},
"_opacity": 255,
"_color": {
@@ -2195,20 +2225,20 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 0,
"_parent": {
- "__id__": 54
+ "__id__": 55
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 56
+ "__id__": 57
},
{
- "__id__": 57
+ "__id__": 58
}
],
"_prefab": {
- "__id__": 58
+ "__id__": 59
},
"_opacity": 255,
"_color": {
@@ -2262,7 +2292,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 55
+ "__id__": 56
},
"_enabled": true,
"_materials": [
@@ -2294,7 +2324,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 55
+ "__id__": 56
},
"_enabled": true,
"alignMode": 0,
@@ -2332,20 +2362,20 @@
"_name": "TEXT_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 54
+ "__id__": 55
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 60
+ "__id__": 61
},
{
- "__id__": 61
+ "__id__": 62
}
],
"_prefab": {
- "__id__": 62
+ "__id__": 63
},
"_opacity": 255,
"_color": {
@@ -2399,7 +2429,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 59
+ "__id__": 60
},
"_enabled": true,
"_materials": [
@@ -2429,7 +2459,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 59
+ "__id__": 60
},
"_enabled": true,
"alignMode": 0,
@@ -2467,20 +2497,20 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 54
+ "__id__": 55
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 64
+ "__id__": 65
},
{
- "__id__": 65
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 66
+ "__id__": 67
},
"_opacity": 255,
"_color": {
@@ -2534,7 +2564,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 63
+ "__id__": 64
},
"_enabled": true,
"_materials": [
@@ -2564,7 +2594,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 63
+ "__id__": 64
},
"_enabled": true,
"alignMode": 0,
@@ -2602,12 +2632,12 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 54
+ "__id__": 55
},
"_enabled": true,
"alignMode": 1,
"_target": {
- "__id__": 52
+ "__id__": 53
},
"_alignFlags": 40,
"_left": 130,
@@ -2631,7 +2661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 54
+ "__id__": 55
},
"_enabled": true,
"_useOriginalSize": false,
@@ -2642,19 +2672,19 @@
"editingDidBegan": [],
"textChanged": [
{
- "__id__": 69
+ "__id__": 70
}
],
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
- "__id__": 60
+ "__id__": 61
},
"_N$placeholderLabel": {
- "__id__": 64
+ "__id__": 65
},
"_N$background": {
- "__id__": 56
+ "__id__": 57
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
@@ -2664,7 +2694,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -2687,7 +2717,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 53
+ "__id__": 54
},
"_enabled": true,
"_materials": [
@@ -2728,21 +2758,21 @@
"_name": "motion",
"_objFlags": 0,
"_parent": {
- "__id__": 52
+ "__id__": 53
},
"_children": [
{
- "__id__": 74
+ "__id__": 75
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 92
}
],
"_prefab": {
- "__id__": 92
+ "__id__": 93
},
"_opacity": 255,
"_color": {
@@ -2796,30 +2826,30 @@
"_name": "editBox",
"_objFlags": 0,
"_parent": {
- "__id__": 73
+ "__id__": 74
},
"_children": [
{
- "__id__": 75
+ "__id__": 76
},
{
- "__id__": 79
+ "__id__": 80
},
{
- "__id__": 83
+ "__id__": 84
}
],
"_active": true,
"_components": [
{
- "__id__": 87
+ "__id__": 88
},
{
- "__id__": 88
+ "__id__": 89
}
],
"_prefab": {
- "__id__": 90
+ "__id__": 91
},
"_opacity": 255,
"_color": {
@@ -2873,20 +2903,20 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 0,
"_parent": {
- "__id__": 74
+ "__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 76
+ "__id__": 77
},
{
- "__id__": 77
+ "__id__": 78
}
],
"_prefab": {
- "__id__": 78
+ "__id__": 79
},
"_opacity": 255,
"_color": {
@@ -2940,7 +2970,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 75
+ "__id__": 76
},
"_enabled": true,
"_materials": [
@@ -2972,7 +3002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 75
+ "__id__": 76
},
"_enabled": true,
"alignMode": 0,
@@ -3010,20 +3040,20 @@
"_name": "TEXT_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 74
+ "__id__": 75
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 80
+ "__id__": 81
},
{
- "__id__": 81
+ "__id__": 82
}
],
"_prefab": {
- "__id__": 82
+ "__id__": 83
},
"_opacity": 255,
"_color": {
@@ -3077,7 +3107,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 79
+ "__id__": 80
},
"_enabled": true,
"_materials": [
@@ -3107,7 +3137,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 79
+ "__id__": 80
},
"_enabled": true,
"alignMode": 0,
@@ -3145,20 +3175,20 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 74
+ "__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 84
+ "__id__": 85
},
{
- "__id__": 85
+ "__id__": 86
}
],
"_prefab": {
- "__id__": 86
+ "__id__": 87
},
"_opacity": 255,
"_color": {
@@ -3212,7 +3242,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 83
+ "__id__": 84
},
"_enabled": true,
"_materials": [
@@ -3242,7 +3272,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 83
+ "__id__": 84
},
"_enabled": true,
"alignMode": 0,
@@ -3280,12 +3310,12 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 74
+ "__id__": 75
},
"_enabled": true,
"alignMode": 1,
"_target": {
- "__id__": 52
+ "__id__": 53
},
"_alignFlags": 40,
"_left": 130,
@@ -3309,7 +3339,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 74
+ "__id__": 75
},
"_enabled": true,
"_useOriginalSize": false,
@@ -3320,19 +3350,19 @@
"editingDidBegan": [],
"textChanged": [
{
- "__id__": 89
+ "__id__": 90
}
],
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
- "__id__": 80
+ "__id__": 81
},
"_N$placeholderLabel": {
- "__id__": 84
+ "__id__": 85
},
"_N$background": {
- "__id__": 76
+ "__id__": 77
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
@@ -3342,7 +3372,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -3365,7 +3395,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 73
+ "__id__": 74
},
"_enabled": true,
"_materials": [
@@ -3406,21 +3436,21 @@
"_name": "speed",
"_objFlags": 0,
"_parent": {
- "__id__": 52
+ "__id__": 53
},
"_children": [
{
- "__id__": 94
+ "__id__": 95
}
],
"_active": true,
"_components": [
{
- "__id__": 111
+ "__id__": 112
}
],
"_prefab": {
- "__id__": 112
+ "__id__": 113
},
"_opacity": 255,
"_color": {
@@ -3474,30 +3504,30 @@
"_name": "editBox",
"_objFlags": 0,
"_parent": {
- "__id__": 93
+ "__id__": 94
},
"_children": [
{
- "__id__": 95
+ "__id__": 96
},
{
- "__id__": 99
+ "__id__": 100
},
{
- "__id__": 103
+ "__id__": 104
}
],
"_active": true,
"_components": [
{
- "__id__": 107
+ "__id__": 108
},
{
- "__id__": 108
+ "__id__": 109
}
],
"_prefab": {
- "__id__": 110
+ "__id__": 111
},
"_opacity": 255,
"_color": {
@@ -3551,20 +3581,20 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 0,
"_parent": {
- "__id__": 94
+ "__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 96
+ "__id__": 97
},
{
- "__id__": 97
+ "__id__": 98
}
],
"_prefab": {
- "__id__": 98
+ "__id__": 99
},
"_opacity": 255,
"_color": {
@@ -3618,7 +3648,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 95
+ "__id__": 96
},
"_enabled": true,
"_materials": [
@@ -3650,7 +3680,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 95
+ "__id__": 96
},
"_enabled": true,
"alignMode": 0,
@@ -3688,20 +3718,20 @@
"_name": "TEXT_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 94
+ "__id__": 95
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 100
+ "__id__": 101
},
{
- "__id__": 101
+ "__id__": 102
}
],
"_prefab": {
- "__id__": 102
+ "__id__": 103
},
"_opacity": 255,
"_color": {
@@ -3755,7 +3785,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 99
+ "__id__": 100
},
"_enabled": true,
"_materials": [
@@ -3785,7 +3815,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 99
+ "__id__": 100
},
"_enabled": true,
"alignMode": 0,
@@ -3823,20 +3853,20 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 94
+ "__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 104
+ "__id__": 105
},
{
- "__id__": 105
+ "__id__": 106
}
],
"_prefab": {
- "__id__": 106
+ "__id__": 107
},
"_opacity": 255,
"_color": {
@@ -3890,7 +3920,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 103
+ "__id__": 104
},
"_enabled": true,
"_materials": [
@@ -3920,7 +3950,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 103
+ "__id__": 104
},
"_enabled": true,
"alignMode": 0,
@@ -3958,12 +3988,12 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 94
+ "__id__": 95
},
"_enabled": true,
"alignMode": 1,
"_target": {
- "__id__": 52
+ "__id__": 53
},
"_alignFlags": 40,
"_left": 130,
@@ -3987,7 +4017,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 94
+ "__id__": 95
},
"_enabled": true,
"_useOriginalSize": false,
@@ -3998,19 +4028,19 @@
"editingDidBegan": [],
"textChanged": [
{
- "__id__": 109
+ "__id__": 110
}
],
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
- "__id__": 100
+ "__id__": 101
},
"_N$placeholderLabel": {
- "__id__": 104
+ "__id__": 105
},
"_N$background": {
- "__id__": 96
+ "__id__": 97
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
@@ -4020,7 +4050,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -4043,7 +4073,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 93
+ "__id__": 94
},
"_enabled": true,
"_materials": [
@@ -4084,24 +4114,24 @@
"_name": "multiplier",
"_objFlags": 0,
"_parent": {
- "__id__": 52
+ "__id__": 53
},
"_children": [
{
- "__id__": 114
+ "__id__": 115
},
{
- "__id__": 120
+ "__id__": 125
}
],
"_active": true,
"_components": [
{
- "__id__": 124
+ "__id__": 129
}
],
"_prefab": {
- "__id__": 125
+ "__id__": 130
},
"_opacity": 255,
"_color": {
@@ -4155,23 +4185,27 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
- "__id__": 113
+ "__id__": 114
},
- "_children": [],
+ "_children": [
+ {
+ "__id__": 116
+ }
+ ],
"_active": true,
"_components": [
{
- "__id__": 115
+ "__id__": 120
},
{
- "__id__": 116
+ "__id__": 121
},
{
- "__id__": 117
+ "__id__": 122
}
],
"_prefab": {
- "__id__": 119
+ "__id__": 124
},
"_opacity": 255,
"_color": {
@@ -4220,17 +4254,154 @@
"groupIndex": 0,
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "tri",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 115
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 117
+ },
+ {
+ "__id__": 118
+ }
+ ],
+ "_prefab": {
+ "__id__": 119
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 220,
+ "g": 220,
+ "b": 220,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 200,
+ "height": 173
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 215,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 6.123233995736766e-17,
+ 0.08,
+ 0.08,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 180
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 114
+ "__id__": 116
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 32,
+ "_left": 0,
+ "_right": 7,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 116
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": {
+ "__uuid__": "d5067326-2ed3-4e1a-91a4-706a7e1ba65e"
+ },
+ "_type": 0,
+ "_sizeMode": 1,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
+ },
+ "fileId": "c2GxS/4/9JOrUAyltSVfl7",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 115
},
"_enabled": true,
"alignMode": 1,
"_target": {
- "__id__": 52
+ "__id__": 53
},
"_alignFlags": 40,
"_left": 130,
@@ -4254,7 +4425,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 114
+ "__id__": 115
},
"_enabled": true,
"_materials": [
@@ -4286,41 +4457,43 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 114
+ "__id__": 115
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 118
+ "__id__": 123
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -4339,9 +4512,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -4350,13 +4523,15 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 116
+ },
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -4379,20 +4554,20 @@
"_name": "paramName",
"_objFlags": 0,
"_parent": {
- "__id__": 113
+ "__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 121
+ "__id__": 126
},
{
- "__id__": 122
+ "__id__": 127
}
],
"_prefab": {
- "__id__": 123
+ "__id__": 128
},
"_opacity": 255,
"_color": {
@@ -4404,7 +4579,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 228,
+ "width": 200,
"height": 30
},
"_anchorPoint": {
@@ -4446,16 +4621,16 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 120
+ "__id__": 125
},
"_enabled": true,
"alignMode": 1,
"_target": {
- "__id__": 52
+ "__id__": 53
},
"_alignFlags": 40,
"_left": 132,
- "_right": 10,
+ "_right": 38,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -4475,7 +4650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 120
+ "__id__": 125
},
"_enabled": true,
"_materials": [
@@ -4516,7 +4691,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 113
+ "__id__": 114
},
"_enabled": true,
"_materials": [
@@ -4557,21 +4732,21 @@
"_name": "loop",
"_objFlags": 0,
"_parent": {
- "__id__": 52
+ "__id__": 53
},
"_children": [
{
- "__id__": 127
+ "__id__": 132
}
],
"_active": true,
"_components": [
{
- "__id__": 137
+ "__id__": 142
}
],
"_prefab": {
- "__id__": 138
+ "__id__": 143
},
"_opacity": 255,
"_color": {
@@ -4625,24 +4800,24 @@
"_name": "toggle",
"_objFlags": 0,
"_parent": {
- "__id__": 126
+ "__id__": 131
},
"_children": [
{
- "__id__": 128
+ "__id__": 133
},
{
- "__id__": 131
+ "__id__": 136
}
],
"_active": true,
"_components": [
{
- "__id__": 134
+ "__id__": 139
}
],
"_prefab": {
- "__id__": 136
+ "__id__": 141
},
"_opacity": 255,
"_color": {
@@ -4696,17 +4871,17 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 127
+ "__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 129
+ "__id__": 134
}
],
"_prefab": {
- "__id__": 130
+ "__id__": 135
},
"_opacity": 255,
"_color": {
@@ -4760,7 +4935,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 128
+ "__id__": 133
},
"_enabled": true,
"_materials": [
@@ -4803,17 +4978,17 @@
"_name": "checkmark",
"_objFlags": 0,
"_parent": {
- "__id__": 127
+ "__id__": 132
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 132
+ "__id__": 137
}
],
"_prefab": {
- "__id__": 133
+ "__id__": 138
},
"_opacity": 255,
"_color": {
@@ -4867,7 +5042,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 131
+ "__id__": 136
},
"_enabled": true,
"_materials": [
@@ -4910,7 +5085,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 127
+ "__id__": 132
},
"_enabled": true,
"_normalMaterial": {
@@ -4973,16 +5148,16 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
- "__id__": 128
+ "__id__": 133
},
"_N$isChecked": true,
"toggleGroup": null,
"checkMark": {
- "__id__": 132
+ "__id__": 137
},
"checkEvents": [
{
- "__id__": 135
+ "__id__": 140
}
],
"_id": ""
@@ -4990,7 +5165,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -5013,7 +5188,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 126
+ "__id__": 131
},
"_enabled": true,
"_materials": [
@@ -5054,7 +5229,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 52
+ "__id__": 53
},
"_enabled": true,
"alignMode": 1,
@@ -5081,7 +5256,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 52
+ "__id__": 53
},
"_enabled": true,
"_layoutSize": {
@@ -5125,30 +5300,30 @@
"_name": "Transitions",
"_objFlags": 0,
"_parent": {
- "__id__": 51
+ "__id__": 52
},
"_children": [
{
- "__id__": 143
+ "__id__": 148
},
{
- "__id__": 150
+ "__id__": 155
},
{
- "__id__": 156
+ "__id__": 161
}
],
"_active": true,
"_components": [
{
- "__id__": 171
+ "__id__": 176
},
{
- "__id__": 172
+ "__id__": 177
}
],
"_prefab": {
- "__id__": 173
+ "__id__": 178
},
"_opacity": 255,
"_color": {
@@ -5202,24 +5377,24 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
- "__id__": 142
+ "__id__": 147
},
"_children": [
{
- "__id__": 144
+ "__id__": 149
}
],
"_active": true,
"_components": [
{
- "__id__": 147
+ "__id__": 152
},
{
- "__id__": 148
+ "__id__": 153
}
],
"_prefab": {
- "__id__": 149
+ "__id__": 154
},
"_opacity": 255,
"_color": {
@@ -5273,17 +5448,17 @@
"_name": "lab",
"_objFlags": 0,
"_parent": {
- "__id__": 143
+ "__id__": 148
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 145
+ "__id__": 150
}
],
"_prefab": {
- "__id__": 146
+ "__id__": 151
},
"_opacity": 255,
"_color": {
@@ -5337,7 +5512,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 144
+ "__id__": 149
},
"_enabled": true,
"_materials": [
@@ -5378,7 +5553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 143
+ "__id__": 148
},
"_enabled": true,
"alignMode": 1,
@@ -5405,7 +5580,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 143
+ "__id__": 148
},
"_enabled": true,
"_materials": [
@@ -5448,26 +5623,26 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 142
+ "__id__": 147
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 151
+ "__id__": 156
},
{
- "__id__": 152
+ "__id__": 157
},
{
- "__id__": 153
+ "__id__": 158
},
{
- "__id__": 154
+ "__id__": 159
}
],
"_prefab": {
- "__id__": 155
+ "__id__": 160
},
"_opacity": 255,
"_color": {
@@ -5521,7 +5696,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 150
+ "__id__": 155
},
"_enabled": true,
"alignMode": 1,
@@ -5548,7 +5723,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 150
+ "__id__": 155
},
"_enabled": true,
"_materials": [
@@ -5580,7 +5755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 150
+ "__id__": 155
},
"_enabled": true,
"_layoutSize": {
@@ -5613,7 +5788,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 150
+ "__id__": 155
},
"_enabled": true,
"_id": ""
@@ -5634,24 +5809,24 @@
"_name": "bottom",
"_objFlags": 0,
"_parent": {
- "__id__": 142
+ "__id__": 147
},
"_children": [
{
- "__id__": 157
+ "__id__": 162
},
{
- "__id__": 161
+ "__id__": 166
}
],
"_active": true,
"_components": [
{
- "__id__": 169
+ "__id__": 174
}
],
"_prefab": {
- "__id__": 170
+ "__id__": 175
},
"_opacity": 255,
"_color": {
@@ -5705,20 +5880,20 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
- "__id__": 156
+ "__id__": 161
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 158
+ "__id__": 163
},
{
- "__id__": 159
+ "__id__": 164
}
],
"_prefab": {
- "__id__": 160
+ "__id__": 165
},
"_opacity": 255,
"_color": {
@@ -5772,7 +5947,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 157
+ "__id__": 162
},
"_enabled": true,
"alignMode": 1,
@@ -5799,7 +5974,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 157
+ "__id__": 162
},
"_enabled": true,
"_materials": [
@@ -5842,24 +6017,24 @@
"_name": "deleteBtn",
"_objFlags": 0,
"_parent": {
- "__id__": 156
+ "__id__": 161
},
"_children": [
{
- "__id__": 162
+ "__id__": 167
}
],
"_active": true,
"_components": [
{
- "__id__": 165
+ "__id__": 170
},
{
- "__id__": 166
+ "__id__": 171
}
],
"_prefab": {
- "__id__": 168
+ "__id__": 173
},
"_opacity": 255,
"_color": {
@@ -5913,17 +6088,17 @@
"_name": "pic",
"_objFlags": 0,
"_parent": {
- "__id__": 161
+ "__id__": 166
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 163
+ "__id__": 168
}
],
"_prefab": {
- "__id__": 164
+ "__id__": 169
},
"_opacity": 255,
"_color": {
@@ -5977,7 +6152,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 162
+ "__id__": 167
},
"_enabled": true,
"_materials": [
@@ -6020,7 +6195,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 161
+ "__id__": 166
},
"_enabled": true,
"alignMode": 1,
@@ -6047,41 +6222,43 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 161
+ "__id__": 166
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 167
+ "__id__": 172
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -6100,9 +6277,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -6111,13 +6288,15 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 167
+ },
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -6140,7 +6319,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 156
+ "__id__": 161
},
"_enabled": true,
"alignMode": 1,
@@ -6178,7 +6357,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 142
+ "__id__": 147
},
"_enabled": true,
"alignMode": 1,
@@ -6205,7 +6384,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 142
+ "__id__": 147
},
"_enabled": true,
"_layoutSize": {
@@ -6249,33 +6428,33 @@
"_name": "Conditions",
"_objFlags": 0,
"_parent": {
- "__id__": 51
+ "__id__": 52
},
"_children": [
{
- "__id__": 175
+ "__id__": 180
},
{
- "__id__": 199
+ "__id__": 204
},
{
- "__id__": 206
+ "__id__": 211
},
{
- "__id__": 212
+ "__id__": 217
}
],
"_active": true,
"_components": [
{
- "__id__": 238
+ "__id__": 240
},
{
- "__id__": 239
+ "__id__": 241
}
],
"_prefab": {
- "__id__": 240
+ "__id__": 242
},
"_opacity": 255,
"_color": {
@@ -6329,27 +6508,27 @@
"_name": "curTransition",
"_objFlags": 0,
"_parent": {
- "__id__": 174
+ "__id__": 179
},
"_children": [
{
- "__id__": 176
+ "__id__": 181
},
{
- "__id__": 180
+ "__id__": 185
},
{
- "__id__": 184
+ "__id__": 189
}
],
"_active": true,
"_components": [
{
- "__id__": 197
+ "__id__": 202
}
],
"_prefab": {
- "__id__": 198
+ "__id__": 203
},
"_opacity": 255,
"_color": {
@@ -6403,20 +6582,20 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
- "__id__": 175
+ "__id__": 180
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 177
+ "__id__": 182
},
{
- "__id__": 178
+ "__id__": 183
}
],
"_prefab": {
- "__id__": 179
+ "__id__": 184
},
"_opacity": 255,
"_color": {
@@ -6470,7 +6649,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 176
+ "__id__": 181
},
"_enabled": true,
"alignMode": 1,
@@ -6497,7 +6676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 176
+ "__id__": 181
},
"_enabled": true,
"_materials": [
@@ -6540,20 +6719,20 @@
"_name": "lab",
"_objFlags": 0,
"_parent": {
- "__id__": 175
+ "__id__": 180
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 181
+ "__id__": 186
},
{
- "__id__": 182
+ "__id__": 187
}
],
"_prefab": {
- "__id__": 183
+ "__id__": 188
},
"_opacity": 255,
"_color": {
@@ -6607,7 +6786,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 180
+ "__id__": 185
},
"_enabled": true,
"alignMode": 1,
@@ -6634,7 +6813,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 180
+ "__id__": 185
},
"_enabled": true,
"_materials": [
@@ -6675,21 +6854,21 @@
"_name": "exit",
"_objFlags": 0,
"_parent": {
- "__id__": 175
+ "__id__": 180
},
"_children": [
{
- "__id__": 185
+ "__id__": 190
}
],
"_active": true,
"_components": [
{
- "__id__": 195
+ "__id__": 200
}
],
"_prefab": {
- "__id__": 196
+ "__id__": 201
},
"_opacity": 255,
"_color": {
@@ -6743,24 +6922,24 @@
"_name": "New Toggle",
"_objFlags": 0,
"_parent": {
- "__id__": 184
+ "__id__": 189
},
"_children": [
{
- "__id__": 186
+ "__id__": 191
},
{
- "__id__": 189
+ "__id__": 194
}
],
"_active": true,
"_components": [
{
- "__id__": 192
+ "__id__": 197
}
],
"_prefab": {
- "__id__": 194
+ "__id__": 199
},
"_opacity": 255,
"_color": {
@@ -6814,17 +6993,17 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 185
+ "__id__": 190
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 187
+ "__id__": 192
}
],
"_prefab": {
- "__id__": 188
+ "__id__": 193
},
"_opacity": 255,
"_color": {
@@ -6878,7 +7057,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 186
+ "__id__": 191
},
"_enabled": true,
"_materials": [
@@ -6921,17 +7100,17 @@
"_name": "checkmark",
"_objFlags": 0,
"_parent": {
- "__id__": 185
+ "__id__": 190
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 190
+ "__id__": 195
}
],
"_prefab": {
- "__id__": 191
+ "__id__": 196
},
"_opacity": 255,
"_color": {
@@ -6985,7 +7164,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 189
+ "__id__": 194
},
"_enabled": true,
"_materials": [
@@ -7028,7 +7207,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 185
+ "__id__": 190
},
"_enabled": true,
"_normalMaterial": {
@@ -7091,16 +7270,16 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
- "__id__": 186
+ "__id__": 191
},
"_N$isChecked": true,
"toggleGroup": null,
"checkMark": {
- "__id__": 190
+ "__id__": 195
},
"checkEvents": [
{
- "__id__": 193
+ "__id__": 198
}
],
"_id": ""
@@ -7108,7 +7287,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -7131,7 +7310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 184
+ "__id__": 189
},
"_enabled": true,
"_materials": [
@@ -7172,7 +7351,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 175
+ "__id__": 180
},
"_enabled": true,
"alignMode": 1,
@@ -7210,24 +7389,24 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
- "__id__": 174
+ "__id__": 179
},
"_children": [
{
- "__id__": 200
+ "__id__": 205
}
],
"_active": true,
"_components": [
{
- "__id__": 203
+ "__id__": 208
},
{
- "__id__": 204
+ "__id__": 209
}
],
"_prefab": {
- "__id__": 205
+ "__id__": 210
},
"_opacity": 255,
"_color": {
@@ -7281,17 +7460,17 @@
"_name": "lab",
"_objFlags": 0,
"_parent": {
- "__id__": 199
+ "__id__": 204
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 201
+ "__id__": 206
}
],
"_prefab": {
- "__id__": 202
+ "__id__": 207
},
"_opacity": 255,
"_color": {
@@ -7345,7 +7524,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 200
+ "__id__": 205
},
"_enabled": true,
"_materials": [
@@ -7386,7 +7565,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 199
+ "__id__": 204
},
"_enabled": true,
"alignMode": 1,
@@ -7413,7 +7592,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 199
+ "__id__": 204
},
"_enabled": true,
"_materials": [
@@ -7456,26 +7635,26 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 174
+ "__id__": 179
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 207
+ "__id__": 212
},
{
- "__id__": 208
+ "__id__": 213
},
{
- "__id__": 209
+ "__id__": 214
},
{
- "__id__": 210
+ "__id__": 215
}
],
"_prefab": {
- "__id__": 211
+ "__id__": 216
},
"_opacity": 255,
"_color": {
@@ -7529,7 +7708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 206
+ "__id__": 211
},
"_enabled": true,
"alignMode": 1,
@@ -7556,7 +7735,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 206
+ "__id__": 211
},
"_enabled": true,
"_materials": [
@@ -7588,7 +7767,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 206
+ "__id__": 211
},
"_enabled": true,
"_layoutSize": {
@@ -7621,7 +7800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 206
+ "__id__": 211
},
"_enabled": true,
"_id": ""
@@ -7642,27 +7821,27 @@
"_name": "bottom",
"_objFlags": 0,
"_parent": {
- "__id__": 174
+ "__id__": 179
},
"_children": [
{
- "__id__": 213
+ "__id__": 218
},
{
- "__id__": 217
+ "__id__": 222
},
{
- "__id__": 228
+ "__id__": 230
}
],
"_active": true,
"_components": [
{
- "__id__": 236
+ "__id__": 238
}
],
"_prefab": {
- "__id__": 237
+ "__id__": 239
},
"_opacity": 255,
"_color": {
@@ -7716,20 +7895,20 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
- "__id__": 212
+ "__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 214
+ "__id__": 219
},
{
- "__id__": 215
+ "__id__": 220
}
],
"_prefab": {
- "__id__": 216
+ "__id__": 221
},
"_opacity": 255,
"_color": {
@@ -7783,7 +7962,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 213
+ "__id__": 218
},
"_enabled": true,
"alignMode": 1,
@@ -7810,7 +7989,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 213
+ "__id__": 218
},
"_enabled": true,
"_materials": [
@@ -7853,27 +8032,24 @@
"_name": "addBtn",
"_objFlags": 0,
"_parent": {
- "__id__": 212
+ "__id__": 217
},
"_children": [
{
- "__id__": 218
- },
- {
- "__id__": 221
+ "__id__": 223
}
],
"_active": true,
"_components": [
{
- "__id__": 224
+ "__id__": 226
},
{
- "__id__": 225
+ "__id__": 227
}
],
"_prefab": {
- "__id__": 227
+ "__id__": 229
},
"_opacity": 255,
"_color": {
@@ -7927,17 +8103,17 @@
"_name": "pic",
"_objFlags": 0,
"_parent": {
- "__id__": 217
+ "__id__": 222
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 219
+ "__id__": 224
}
],
"_prefab": {
- "__id__": 220
+ "__id__": 225
},
"_opacity": 255,
"_color": {
@@ -7949,8 +8125,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 20,
- "height": 5
+ "width": 21,
+ "height": 21
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -7991,7 +8167,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 218
+ "__id__": 223
},
"_enabled": true,
"_materials": [
@@ -8002,10 +8178,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ "__uuid__": "6ac85e90-e7bb-4c26-83d1-63b3e2c67b5b"
},
"_type": 0,
- "_sizeMode": 0,
+ "_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
@@ -8029,119 +8205,12 @@
"fileId": "d2UxBcTuNMbJnv9KGslOO3",
"sync": false
},
- {
- "__type__": "cc.Node",
- "_name": "pic",
- "_objFlags": 0,
- "_parent": {
- "__id__": 217
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 222
- }
- ],
- "_prefab": {
- "__id__": 223
- },
- "_opacity": 255,
- "_color": {
- "__type__": "cc.Color",
- "r": 220,
- "g": 220,
- "b": 220,
- "a": 255
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 5,
- "height": 20
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_trs": {
- "__type__": "TypedArray",
- "ctor": "Float64Array",
- "array": [
- 0,
- 0,
- 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": ""
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "node": {
- "__id__": 221
- },
- "_enabled": true,
- "_materials": [
- {
- "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
- }
- ],
- "_srcBlendFactor": 770,
- "_dstBlendFactor": 771,
- "_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
- },
- "_type": 0,
- "_sizeMode": 0,
- "_fillType": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
- },
- "fileId": "8f/rZUtERLlLqXIy+8DerG",
- "sync": false
- },
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 217
+ "__id__": 222
},
"_enabled": true,
"alignMode": 1,
@@ -8168,41 +8237,43 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 217
+ "__id__": 222
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 226
+ "__id__": 228
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -8221,9 +8292,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -8232,13 +8303,15 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 223
+ },
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -8261,24 +8334,24 @@
"_name": "deleteBtn",
"_objFlags": 0,
"_parent": {
- "__id__": 212
+ "__id__": 217
},
"_children": [
{
- "__id__": 229
+ "__id__": 231
}
],
"_active": true,
"_components": [
{
- "__id__": 232
+ "__id__": 234
},
{
- "__id__": 233
+ "__id__": 235
}
],
"_prefab": {
- "__id__": 235
+ "__id__": 237
},
"_opacity": 255,
"_color": {
@@ -8332,17 +8405,17 @@
"_name": "pic",
"_objFlags": 0,
"_parent": {
- "__id__": 228
+ "__id__": 230
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 230
+ "__id__": 232
}
],
"_prefab": {
- "__id__": 231
+ "__id__": 233
},
"_opacity": 255,
"_color": {
@@ -8396,7 +8469,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 229
+ "__id__": 231
},
"_enabled": true,
"_materials": [
@@ -8439,7 +8512,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 228
+ "__id__": 230
},
"_enabled": true,
"alignMode": 1,
@@ -8466,41 +8539,43 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 228
+ "__id__": 230
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 234
+ "__id__": 236
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -8519,9 +8594,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -8530,13 +8605,15 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 231
+ },
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 41
+ "__id__": 38
},
"component": "",
"_componentId": "af9292xWXVHdYpjOH8rYuVC",
@@ -8559,7 +8636,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 212
+ "__id__": 217
},
"_enabled": true,
"alignMode": 1,
@@ -8597,7 +8674,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 174
+ "__id__": 179
},
"_enabled": true,
"alignMode": 1,
@@ -8624,7 +8701,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 174
+ "__id__": 179
},
"_enabled": true,
"_layoutSize": {
@@ -8668,7 +8745,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 51
+ "__id__": 52
},
"_enabled": true,
"alignMode": 1,
@@ -8695,7 +8772,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 51
+ "__id__": 52
},
"_enabled": true,
"_layoutSize": {
@@ -8739,7 +8816,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 50
+ "__id__": 51
},
"_enabled": true,
"_materials": [
@@ -8759,7 +8836,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 50
+ "__id__": 51
},
"_enabled": true,
"alignMode": 1,
@@ -8797,51 +8874,51 @@
"_name": "scrollBar",
"_objFlags": 0,
"_parent": {
- "__id__": 41
+ "__id__": 38
},
"_children": [
{
- "__id__": 248
+ "__id__": 250
}
],
"_active": true,
"_components": [
- {
- "__id__": 251
- },
{
"__id__": 253
},
{
- "__id__": 254
+ "__id__": 255
+ },
+ {
+ "__id__": 256
}
],
"_prefab": {
- "__id__": 255
+ "__id__": 257
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 0,
+ "g": 0,
+ "b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 12,
+ "width": 4,
"height": 1030
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 200,
+ 194,
-25,
0,
0,
@@ -8871,41 +8948,41 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
- "__id__": 247
+ "__id__": 249
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 249
+ "__id__": 251
}
],
"_prefab": {
- "__id__": 250
+ "__id__": 252
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 200,
+ "g": 130,
+ "b": 100,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 10,
+ "width": 6,
"height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -1,
+ 0,
0,
0,
0,
@@ -8935,7 +9012,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 248
+ "__id__": 250
},
"_enabled": true,
"_materials": [
@@ -8946,7 +9023,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5c3bb932-6c3c-468f-88a9-c8c61d458641"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -8970,7 +9047,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "8fNISsBVlOZJAT8f0HWq2F",
+ "fileId": "ceLoUZla9LKYXH4fmi9w7D",
"sync": false
},
{
@@ -8978,18 +9055,18 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 247
+ "__id__": 249
},
"_enabled": true,
"_scrollView": {
- "__id__": 252
+ "__id__": 254
},
"_touching": false,
"_opacity": 255,
"enableAutoHide": true,
"autoHideTime": 1,
"_N$handle": {
- "__id__": 249
+ "__id__": 251
},
"_N$direction": 1,
"_id": ""
@@ -8999,7 +9076,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 41
+ "__id__": 38
},
"_enabled": true,
"horizontal": false,
@@ -9011,14 +9088,14 @@
"scrollEvents": [],
"cancelInnerEvents": false,
"_N$content": {
- "__id__": 51
+ "__id__": 52
},
"content": {
- "__id__": 51
+ "__id__": 52
},
"_N$horizontalScrollBar": null,
"_N$verticalScrollBar": {
- "__id__": 251
+ "__id__": 253
},
"_id": ""
},
@@ -9027,14 +9104,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 247
+ "__id__": 249
},
"_enabled": true,
"alignMode": 0,
"_target": null,
"_alignFlags": 37,
"_left": 350.07654921020657,
- "_right": 0,
+ "_right": 4,
"_top": 50,
"_bottom": 0,
"_verticalCenter": 0,
@@ -9054,7 +9131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 247
+ "__id__": 249
},
"_enabled": true,
"_materials": [
@@ -9065,7 +9142,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5fe5dcaa-b513-4dc5-a166-573627b3a159"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -9089,7 +9166,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "37T3G7YbJGxZWWvEj1fY9h",
+ "fileId": "4akhH4G1xKdqQoUHLGus4B",
"sync": false
},
{
@@ -9097,20 +9174,20 @@
"_name": "resizeArea",
"_objFlags": 0,
"_parent": {
- "__id__": 41
+ "__id__": 38
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 257
+ "__id__": 259
},
{
- "__id__": 258
+ "__id__": 260
}
],
"_prefab": {
- "__id__": 260
+ "__id__": 262
},
"_opacity": 255,
"_color": {
@@ -9164,7 +9241,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 256
+ "__id__": 258
},
"_enabled": true,
"alignMode": 1,
@@ -9191,16 +9268,16 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 256
+ "__id__": 258
},
"_enabled": true,
"Target": {
- "__id__": 259
+ "__id__": 261
},
"Limit": {
"__type__": "cc.Vec2",
"x": 300,
- "y": 500
+ "y": 600
},
"isLeft": false,
"_id": ""
@@ -9210,7 +9287,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 41
+ "__id__": 38
},
"_enabled": true,
"alignMode": 1,
@@ -9248,7 +9325,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 41
+ "__id__": 38
},
"_enabled": true,
"_id": ""
@@ -9258,7 +9335,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 41
+ "__id__": 38
},
"_enabled": true,
"_materials": [
@@ -9290,44 +9367,44 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 41
+ "__id__": 38
},
"_enabled": true,
"UnitInfo": {
- "__id__": 52
- },
- "NameNode": {
"__id__": 53
},
+ "NameNode": {
+ "__id__": 54
+ },
"MotionNode": {
- "__id__": 73
+ "__id__": 74
},
"SpeedNode": {
- "__id__": 93
+ "__id__": 94
},
"MultiplierNode": {
- "__id__": 113
+ "__id__": 114
},
"LoopNode": {
- "__id__": 126
+ "__id__": 131
},
"TransitionInfo": {
- "__id__": 142
+ "__id__": 147
},
"TransitionList": {
- "__id__": 154
+ "__id__": 159
},
"ConditionInfo": {
- "__id__": 174
+ "__id__": 179
},
"ConditionList": {
- "__id__": 210
+ "__id__": 215
},
"CurTransLab": {
- "__id__": 182
+ "__id__": 187
},
"HasExitTime": {
- "__id__": 192
+ "__id__": 197
},
"_id": ""
},
@@ -9351,38 +9428,41 @@
},
"_children": [
{
- "__id__": 266
+ "__id__": 268
},
{
- "__id__": 287
+ "__id__": 286
},
{
- "__id__": 296
+ "__id__": 290
},
{
- "__id__": 305
+ "__id__": 299
+ },
+ {
+ "__id__": 308
}
],
"_active": true,
"_components": [
- {
- "__id__": 308
- },
- {
- "__id__": 310
- },
{
"__id__": 311
},
{
- "__id__": 301
+ "__id__": 313
},
{
- "__id__": 312
+ "__id__": 314
+ },
+ {
+ "__id__": 304
+ },
+ {
+ "__id__": 315
}
],
"_prefab": {
- "__id__": 313
+ "__id__": 316
},
"_opacity": 255,
"_color": {
@@ -9436,27 +9516,27 @@
"_name": "title",
"_objFlags": 0,
"_parent": {
- "__id__": 265
+ "__id__": 267
},
"_children": [
{
- "__id__": 267
+ "__id__": 269
},
{
- "__id__": 271
+ "__id__": 273
}
],
"_active": true,
"_components": [
{
- "__id__": 284
+ "__id__": 283
},
{
- "__id__": 285
+ "__id__": 284
}
],
"_prefab": {
- "__id__": 286
+ "__id__": 285
},
"_opacity": 255,
"_color": {
@@ -9510,20 +9590,20 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 266
+ "__id__": 268
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 268
+ "__id__": 270
},
{
- "__id__": 269
+ "__id__": 271
}
],
"_prefab": {
- "__id__": 270
+ "__id__": 272
},
"_opacity": 255,
"_color": {
@@ -9577,7 +9657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 267
+ "__id__": 269
},
"_enabled": true,
"_materials": [
@@ -9607,7 +9687,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 267
+ "__id__": 269
},
"_enabled": true,
"_color": {
@@ -9636,30 +9716,27 @@
"_name": "addBtn",
"_objFlags": 0,
"_parent": {
- "__id__": 266
+ "__id__": 268
},
"_children": [
{
- "__id__": 272
+ "__id__": 274
},
{
- "__id__": 275
- },
- {
- "__id__": 278
+ "__id__": 277
}
],
"_active": true,
"_components": [
{
- "__id__": 280
+ "__id__": 279
},
{
- "__id__": 281
+ "__id__": 280
}
],
"_prefab": {
- "__id__": 283
+ "__id__": 282
},
"_opacity": 255,
"_color": {
@@ -9713,17 +9790,17 @@
"_name": "pic",
"_objFlags": 0,
"_parent": {
- "__id__": 271
+ "__id__": 273
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 273
+ "__id__": 275
}
],
"_prefab": {
- "__id__": 274
+ "__id__": 276
},
"_opacity": 255,
"_color": {
@@ -9735,8 +9812,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 20,
- "height": 5
+ "width": 21,
+ "height": 21
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -9777,7 +9854,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 272
+ "__id__": 274
},
"_enabled": true,
"_materials": [
@@ -9788,10 +9865,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ "__uuid__": "6ac85e90-e7bb-4c26-83d1-63b3e2c67b5b"
},
"_type": 0,
- "_sizeMode": 0,
+ "_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
@@ -9815,125 +9892,18 @@
"fileId": "47EW5dZTxBKZ2fVuFu6aTC",
"sync": false
},
- {
- "__type__": "cc.Node",
- "_name": "pic",
- "_objFlags": 0,
- "_parent": {
- "__id__": 271
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 276
- }
- ],
- "_prefab": {
- "__id__": 277
- },
- "_opacity": 255,
- "_color": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 5,
- "height": 20
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_trs": {
- "__type__": "TypedArray",
- "ctor": "Float64Array",
- "array": [
- 0,
- 0,
- 0,
- 0,
- 0,
- 0,
- 1,
- 1.5,
- 1.5,
- 1
- ]
- },
- "_eulerAngles": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_skewX": 0,
- "_skewY": 0,
- "_is3DNode": false,
- "_groupIndex": 0,
- "groupIndex": 0,
- "_id": ""
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "node": {
- "__id__": 275
- },
- "_enabled": true,
- "_materials": [
- {
- "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
- }
- ],
- "_srcBlendFactor": 770,
- "_dstBlendFactor": 771,
- "_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
- },
- "_type": 0,
- "_sizeMode": 0,
- "_fillType": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
- },
- "fileId": "f1ulZFFAVHuY4Fuvle2uyj",
- "sync": false
- },
{
"__type__": "cc.Node",
"_name": "selectPos",
"_objFlags": 0,
"_parent": {
- "__id__": 271
+ "__id__": 273
},
"_children": [],
"_active": true,
"_components": [],
"_prefab": {
- "__id__": 279
+ "__id__": 278
},
"_opacity": 255,
"_color": {
@@ -9998,7 +9968,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 271
+ "__id__": 273
},
"_enabled": true,
"alignMode": 1,
@@ -10025,7 +9995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 271
+ "__id__": 273
},
"_enabled": true,
"_normalMaterial": null,
@@ -10034,7 +10004,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 282
+ "__id__": 281
}
],
"_N$interactable": true,
@@ -10095,7 +10065,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 265
+ "__id__": 267
},
"component": "",
"_componentId": "86c893/zz5AbqnVPafNXobP",
@@ -10118,7 +10088,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 266
+ "__id__": 268
},
"_enabled": true,
"alignMode": 1,
@@ -10145,7 +10115,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 266
+ "__id__": 268
},
"_enabled": true,
"_materials": [
@@ -10156,7 +10126,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "dcfeb2dd-7662-49c9-8df7-3d4f208a752c"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 0,
"_sizeMode": 0,
@@ -10183,29 +10153,166 @@
"fileId": "6dPxchMwBAoJ2LfL0pla6a",
"sync": false
},
+ {
+ "__type__": "cc.Node",
+ "_name": "edge",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 267
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 287
+ },
+ {
+ "__id__": 288
+ }
+ ],
+ "_prefab": {
+ "__id__": 289
+ },
+ "_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 40,
+ "g": 40,
+ "b": 40,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 2,
+ "height": 1080
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 148,
+ 0,
+ 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": ""
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 286
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 37,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 36,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 286
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": {
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ },
+ "_type": 0,
+ "_sizeMode": 0,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
+ },
+ "fileId": "cej6w8bmRE7aKPd8nOPtFa",
+ "sync": false
+ },
{
"__type__": "cc.Node",
"_name": "view",
"_objFlags": 0,
"_parent": {
- "__id__": 265
+ "__id__": 267
},
"_children": [
{
- "__id__": 288
+ "__id__": 291
}
],
"_active": true,
"_components": [
{
- "__id__": 293
+ "__id__": 296
},
{
- "__id__": 294
+ "__id__": 297
}
],
"_prefab": {
- "__id__": 295
+ "__id__": 298
},
"_opacity": 255,
"_color": {
@@ -10259,23 +10366,23 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 287
+ "__id__": 290
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 289
+ "__id__": 292
},
{
- "__id__": 290
+ "__id__": 293
},
{
- "__id__": 291
+ "__id__": 294
}
],
"_prefab": {
- "__id__": 292
+ "__id__": 295
},
"_opacity": 255,
"_color": {
@@ -10329,7 +10436,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 288
+ "__id__": 291
},
"_enabled": true,
"alignMode": 1,
@@ -10356,7 +10463,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 288
+ "__id__": 291
},
"_enabled": true,
"_layoutSize": {
@@ -10389,7 +10496,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 288
+ "__id__": 291
},
"_enabled": true,
"_id": ""
@@ -10410,7 +10517,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 287
+ "__id__": 290
},
"_enabled": true,
"_materials": [
@@ -10430,7 +10537,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 287
+ "__id__": 290
},
"_enabled": true,
"alignMode": 1,
@@ -10468,51 +10575,51 @@
"_name": "scrollBar",
"_objFlags": 0,
"_parent": {
- "__id__": 265
+ "__id__": 267
},
"_children": [
{
- "__id__": 297
+ "__id__": 300
}
],
"_active": true,
"_components": [
- {
- "__id__": 300
- },
- {
- "__id__": 302
- },
{
"__id__": 303
+ },
+ {
+ "__id__": 305
+ },
+ {
+ "__id__": 306
}
],
"_prefab": {
- "__id__": 304
+ "__id__": 307
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 0,
+ "g": 0,
+ "b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 12,
+ "width": 4,
"height": 1030
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 150,
+ 142,
-25,
0,
0,
@@ -10542,41 +10649,41 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
- "__id__": 296
+ "__id__": 299
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 298
+ "__id__": 301
}
],
"_prefab": {
- "__id__": 299
+ "__id__": 302
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 200,
+ "g": 130,
+ "b": 100,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 10,
+ "width": 6,
"height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -1,
+ 0,
0,
0,
0,
@@ -10606,7 +10713,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 297
+ "__id__": 300
},
"_enabled": true,
"_materials": [
@@ -10617,7 +10724,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5c3bb932-6c3c-468f-88a9-c8c61d458641"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -10649,18 +10756,18 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 296
+ "__id__": 299
},
"_enabled": true,
"_scrollView": {
- "__id__": 301
+ "__id__": 304
},
"_touching": false,
"_opacity": 255,
"enableAutoHide": true,
"autoHideTime": 1,
"_N$handle": {
- "__id__": 298
+ "__id__": 301
},
"_N$direction": 1,
"_id": ""
@@ -10670,7 +10777,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 265
+ "__id__": 267
},
"_enabled": true,
"horizontal": false,
@@ -10682,14 +10789,14 @@
"scrollEvents": [],
"cancelInnerEvents": false,
"_N$content": {
- "__id__": 288
+ "__id__": 291
},
"content": {
- "__id__": 288
+ "__id__": 291
},
"_N$horizontalScrollBar": null,
"_N$verticalScrollBar": {
- "__id__": 300
+ "__id__": 303
},
"_id": ""
},
@@ -10698,14 +10805,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 296
+ "__id__": 299
},
"_enabled": true,
"alignMode": 0,
"_target": null,
"_alignFlags": 37,
"_left": 350.07654921020657,
- "_right": 0,
+ "_right": 6,
"_top": 50,
"_bottom": 0,
"_verticalCenter": 0,
@@ -10725,7 +10832,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 296
+ "__id__": 299
},
"_enabled": true,
"_materials": [
@@ -10736,7 +10843,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5fe5dcaa-b513-4dc5-a166-573627b3a159"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -10768,20 +10875,20 @@
"_name": "resizeArea",
"_objFlags": 0,
"_parent": {
- "__id__": 265
+ "__id__": 267
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 306
+ "__id__": 309
},
{
- "__id__": 307
+ "__id__": 310
}
],
"_prefab": {
- "__id__": 309
+ "__id__": 312
},
"_opacity": 255,
"_color": {
@@ -10835,7 +10942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 305
+ "__id__": 308
},
"_enabled": true,
"alignMode": 1,
@@ -10862,16 +10969,16 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 305
+ "__id__": 308
},
"_enabled": true,
"Target": {
- "__id__": 308
+ "__id__": 311
},
"Limit": {
"__type__": "cc.Vec2",
"x": 250,
- "y": 500
+ "y": 600
},
"isLeft": true,
"_id": ""
@@ -10881,7 +10988,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 265
+ "__id__": 267
},
"_enabled": true,
"alignMode": 1,
@@ -10919,7 +11026,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 265
+ "__id__": 267
},
"_enabled": true,
"_id": ""
@@ -10929,7 +11036,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 265
+ "__id__": 267
},
"_enabled": true,
"_materials": [
@@ -10961,14 +11068,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 265
+ "__id__": 267
},
"_enabled": true,
"ParamContent": {
- "__id__": 288
+ "__id__": 291
},
"SelectPosNode": {
- "__id__": 278
+ "__id__": 277
},
"_id": ""
},
@@ -10992,38 +11099,38 @@
},
"_children": [
{
- "__id__": 315
+ "__id__": 318
},
{
- "__id__": 383
+ "__id__": 386
},
{
- "__id__": 402
+ "__id__": 405
},
{
- "__id__": 421
+ "__id__": 426
},
{
- "__id__": 471
+ "__id__": 476
},
{
- "__id__": 490
+ "__id__": 497
}
],
"_active": true,
"_components": [
{
- "__id__": 542
+ "__id__": 549
},
{
- "__id__": 543
+ "__id__": 550
},
{
- "__id__": 544
+ "__id__": 551
}
],
"_prefab": {
- "__id__": 545
+ "__id__": 552
},
"_opacity": 255,
"_color": {
@@ -11077,24 +11184,24 @@
"_name": "RightMenu",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 316
+ "__id__": 319
},
{
- "__id__": 343
+ "__id__": 346
}
],
"_active": true,
"_components": [
{
- "__id__": 381
+ "__id__": 384
}
],
"_prefab": {
- "__id__": 382
+ "__id__": 385
},
"_opacity": 255,
"_color": {
@@ -11148,30 +11255,30 @@
"_name": "create",
"_objFlags": 0,
"_parent": {
- "__id__": 315
+ "__id__": 318
},
"_children": [
{
- "__id__": 317
+ "__id__": 320
},
{
- "__id__": 328
+ "__id__": 331
}
],
"_active": true,
"_components": [
{
- "__id__": 339
+ "__id__": 342
},
{
- "__id__": 340
+ "__id__": 343
},
{
- "__id__": 341
+ "__id__": 344
}
],
"_prefab": {
- "__id__": 342
+ "__id__": 345
},
"_opacity": 255,
"_color": {
@@ -11225,21 +11332,21 @@
"_name": "createState",
"_objFlags": 0,
"_parent": {
- "__id__": 316
+ "__id__": 319
},
"_children": [
{
- "__id__": 318
+ "__id__": 321
}
],
"_active": true,
"_components": [
{
- "__id__": 325
+ "__id__": 328
}
],
"_prefab": {
- "__id__": 327
+ "__id__": 330
},
"_opacity": 255,
"_color": {
@@ -11293,24 +11400,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 317
+ "__id__": 320
},
"_children": [
{
- "__id__": 319
+ "__id__": 322
}
],
"_active": true,
"_components": [
{
- "__id__": 322
+ "__id__": 325
},
{
- "__id__": 323
+ "__id__": 326
}
],
"_prefab": {
- "__id__": 324
+ "__id__": 327
},
"_opacity": 255,
"_color": {
@@ -11364,17 +11471,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 318
+ "__id__": 321
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 320
+ "__id__": 323
}
],
"_prefab": {
- "__id__": 321
+ "__id__": 324
},
"_opacity": 255,
"_color": {
@@ -11428,7 +11535,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 319
+ "__id__": 322
},
"_enabled": true,
"_materials": [
@@ -11469,7 +11576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 318
+ "__id__": 321
},
"_enabled": true,
"_materials": [
@@ -11501,7 +11608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 318
+ "__id__": 321
},
"_enabled": true,
"alignMode": 0,
@@ -11539,7 +11646,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 317
+ "__id__": 320
},
"_enabled": true,
"_normalMaterial": {
@@ -11550,7 +11657,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 326
+ "__id__": 329
}
],
"_N$interactable": true,
@@ -11618,7 +11725,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 318
+ "__id__": 321
},
"_id": ""
},
@@ -11648,21 +11755,21 @@
"_name": "createSubMachine",
"_objFlags": 0,
"_parent": {
- "__id__": 316
+ "__id__": 319
},
"_children": [
{
- "__id__": 329
+ "__id__": 332
}
],
"_active": true,
"_components": [
{
- "__id__": 336
+ "__id__": 339
}
],
"_prefab": {
- "__id__": 338
+ "__id__": 341
},
"_opacity": 255,
"_color": {
@@ -11716,24 +11823,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 328
+ "__id__": 331
},
"_children": [
{
- "__id__": 330
+ "__id__": 333
}
],
"_active": true,
"_components": [
{
- "__id__": 333
+ "__id__": 336
},
{
- "__id__": 334
+ "__id__": 337
}
],
"_prefab": {
- "__id__": 335
+ "__id__": 338
},
"_opacity": 255,
"_color": {
@@ -11787,17 +11894,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 329
+ "__id__": 332
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 331
+ "__id__": 334
}
],
"_prefab": {
- "__id__": 332
+ "__id__": 335
},
"_opacity": 255,
"_color": {
@@ -11851,7 +11958,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 330
+ "__id__": 333
},
"_enabled": true,
"_materials": [
@@ -11892,7 +11999,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 329
+ "__id__": 332
},
"_enabled": true,
"_materials": [
@@ -11924,7 +12031,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 329
+ "__id__": 332
},
"_enabled": true,
"alignMode": 0,
@@ -11962,7 +12069,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 328
+ "__id__": 331
},
"_enabled": true,
"_normalMaterial": {
@@ -11973,7 +12080,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 337
+ "__id__": 340
}
],
"_N$interactable": true,
@@ -12041,7 +12148,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 329
+ "__id__": 332
},
"_id": ""
},
@@ -12071,7 +12178,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 316
+ "__id__": 319
},
"_enabled": true,
"alignMode": 0,
@@ -12098,7 +12205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 316
+ "__id__": 319
},
"_enabled": true,
"_materials": [
@@ -12130,7 +12237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 316
+ "__id__": 319
},
"_enabled": true,
"_layoutSize": {
@@ -12174,33 +12281,33 @@
"_name": "state",
"_objFlags": 0,
"_parent": {
- "__id__": 315
+ "__id__": 318
},
"_children": [
{
- "__id__": 344
+ "__id__": 347
},
{
- "__id__": 355
+ "__id__": 358
},
{
- "__id__": 366
+ "__id__": 369
}
],
"_active": true,
"_components": [
{
- "__id__": 377
+ "__id__": 380
},
{
- "__id__": 378
+ "__id__": 381
},
{
- "__id__": 379
+ "__id__": 382
}
],
"_prefab": {
- "__id__": 380
+ "__id__": 383
},
"_opacity": 255,
"_color": {
@@ -12254,21 +12361,21 @@
"_name": "makeTransition",
"_objFlags": 0,
"_parent": {
- "__id__": 343
+ "__id__": 346
},
"_children": [
{
- "__id__": 345
+ "__id__": 348
}
],
"_active": true,
"_components": [
{
- "__id__": 352
+ "__id__": 355
}
],
"_prefab": {
- "__id__": 354
+ "__id__": 357
},
"_opacity": 255,
"_color": {
@@ -12322,24 +12429,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 344
+ "__id__": 347
},
"_children": [
{
- "__id__": 346
+ "__id__": 349
}
],
"_active": true,
"_components": [
{
- "__id__": 349
+ "__id__": 352
},
{
- "__id__": 350
+ "__id__": 353
}
],
"_prefab": {
- "__id__": 351
+ "__id__": 354
},
"_opacity": 255,
"_color": {
@@ -12393,17 +12500,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 345
+ "__id__": 348
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 347
+ "__id__": 350
}
],
"_prefab": {
- "__id__": 348
+ "__id__": 351
},
"_opacity": 255,
"_color": {
@@ -12457,7 +12564,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 346
+ "__id__": 349
},
"_enabled": true,
"_materials": [
@@ -12498,7 +12605,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 345
+ "__id__": 348
},
"_enabled": true,
"_materials": [
@@ -12530,7 +12637,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 345
+ "__id__": 348
},
"_enabled": true,
"alignMode": 0,
@@ -12568,7 +12675,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 344
+ "__id__": 347
},
"_enabled": true,
"_normalMaterial": {
@@ -12579,7 +12686,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 353
+ "__id__": 356
}
],
"_N$interactable": true,
@@ -12647,7 +12754,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 345
+ "__id__": 348
},
"_id": ""
},
@@ -12677,21 +12784,21 @@
"_name": "setDefaultState",
"_objFlags": 0,
"_parent": {
- "__id__": 343
+ "__id__": 346
},
"_children": [
{
- "__id__": 356
+ "__id__": 359
}
],
"_active": true,
"_components": [
{
- "__id__": 363
+ "__id__": 366
}
],
"_prefab": {
- "__id__": 365
+ "__id__": 368
},
"_opacity": 255,
"_color": {
@@ -12745,24 +12852,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 355
+ "__id__": 358
},
"_children": [
{
- "__id__": 357
+ "__id__": 360
}
],
"_active": true,
"_components": [
{
- "__id__": 360
+ "__id__": 363
},
{
- "__id__": 361
+ "__id__": 364
}
],
"_prefab": {
- "__id__": 362
+ "__id__": 365
},
"_opacity": 255,
"_color": {
@@ -12816,17 +12923,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 356
+ "__id__": 359
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 358
+ "__id__": 361
}
],
"_prefab": {
- "__id__": 359
+ "__id__": 362
},
"_opacity": 255,
"_color": {
@@ -12880,7 +12987,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 357
+ "__id__": 360
},
"_enabled": true,
"_materials": [
@@ -12921,7 +13028,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 356
+ "__id__": 359
},
"_enabled": true,
"_materials": [
@@ -12953,7 +13060,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 356
+ "__id__": 359
},
"_enabled": true,
"alignMode": 0,
@@ -12991,7 +13098,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 355
+ "__id__": 358
},
"_enabled": true,
"_normalMaterial": {
@@ -13002,7 +13109,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 364
+ "__id__": 367
}
],
"_N$interactable": true,
@@ -13070,7 +13177,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 356
+ "__id__": 359
},
"_id": ""
},
@@ -13100,21 +13207,21 @@
"_name": "delete",
"_objFlags": 0,
"_parent": {
- "__id__": 343
+ "__id__": 346
},
"_children": [
{
- "__id__": 367
+ "__id__": 370
}
],
"_active": true,
"_components": [
{
- "__id__": 374
+ "__id__": 377
}
],
"_prefab": {
- "__id__": 376
+ "__id__": 379
},
"_opacity": 255,
"_color": {
@@ -13168,24 +13275,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 366
+ "__id__": 369
},
"_children": [
{
- "__id__": 368
+ "__id__": 371
}
],
"_active": true,
"_components": [
{
- "__id__": 371
+ "__id__": 374
},
{
- "__id__": 372
+ "__id__": 375
}
],
"_prefab": {
- "__id__": 373
+ "__id__": 376
},
"_opacity": 255,
"_color": {
@@ -13239,17 +13346,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 367
+ "__id__": 370
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 369
+ "__id__": 372
}
],
"_prefab": {
- "__id__": 370
+ "__id__": 373
},
"_opacity": 255,
"_color": {
@@ -13303,7 +13410,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 368
+ "__id__": 371
},
"_enabled": true,
"_materials": [
@@ -13344,7 +13451,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 367
+ "__id__": 370
},
"_enabled": true,
"_materials": [
@@ -13376,7 +13483,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 367
+ "__id__": 370
},
"_enabled": true,
"alignMode": 0,
@@ -13414,7 +13521,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 366
+ "__id__": 369
},
"_enabled": true,
"_normalMaterial": {
@@ -13425,7 +13532,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 375
+ "__id__": 378
}
],
"_N$interactable": true,
@@ -13493,7 +13600,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 367
+ "__id__": 370
},
"_id": ""
},
@@ -13523,7 +13630,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 343
+ "__id__": 346
},
"_enabled": true,
"alignMode": 0,
@@ -13550,7 +13657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 343
+ "__id__": 346
},
"_enabled": true,
"_materials": [
@@ -13582,7 +13689,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 343
+ "__id__": 346
},
"_enabled": true,
"_layoutSize": {
@@ -13626,7 +13733,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 315
+ "__id__": 318
},
"_enabled": true,
"_id": ""
@@ -13647,30 +13754,30 @@
"_name": "LineToSubList",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 384
+ "__id__": 387
},
{
- "__id__": 390
+ "__id__": 393
}
],
"_active": true,
"_components": [
{
- "__id__": 399
+ "__id__": 402
},
{
- "__id__": 400
+ "__id__": 403
},
{
- "__id__": 395
+ "__id__": 398
}
],
"_prefab": {
- "__id__": 401
+ "__id__": 404
},
"_opacity": 255,
"_color": {
@@ -13694,8 +13801,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -334.391,
- -25.001,
+ -360,
+ 0,
0,
0,
0,
@@ -13724,21 +13831,21 @@
"_name": "view",
"_objFlags": 0,
"_parent": {
- "__id__": 383
+ "__id__": 386
},
"_children": [
{
- "__id__": 385
+ "__id__": 388
}
],
"_active": true,
"_components": [
{
- "__id__": 388
+ "__id__": 391
}
],
"_prefab": {
- "__id__": 389
+ "__id__": 392
},
"_opacity": 255,
"_color": {
@@ -13792,17 +13899,17 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 384
+ "__id__": 387
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 386
+ "__id__": 389
}
],
"_prefab": {
- "__id__": 387
+ "__id__": 390
},
"_opacity": 255,
"_color": {
@@ -13856,7 +13963,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 385
+ "__id__": 388
},
"_enabled": true,
"_layoutSize": {
@@ -13900,7 +14007,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 384
+ "__id__": 387
},
"_enabled": true,
"_materials": [
@@ -13931,51 +14038,51 @@
"_name": "scrollBar",
"_objFlags": 0,
"_parent": {
- "__id__": 383
+ "__id__": 386
},
"_children": [
{
- "__id__": 391
+ "__id__": 394
}
],
"_active": true,
"_components": [
- {
- "__id__": 394
- },
- {
- "__id__": 396
- },
{
"__id__": 397
+ },
+ {
+ "__id__": 399
+ },
+ {
+ "__id__": 400
}
],
"_prefab": {
- "__id__": 398
+ "__id__": 401
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 0,
+ "g": 0,
+ "b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 12,
+ "width": 4,
"height": 220
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 300,
+ 294,
-110,
0,
0,
@@ -14005,41 +14112,41 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
- "__id__": 390
+ "__id__": 393
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 392
+ "__id__": 395
}
],
"_prefab": {
- "__id__": 393
+ "__id__": 396
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 200,
+ "g": 130,
+ "b": 100,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 10,
+ "width": 6,
"height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -1,
+ 0,
0,
0,
0,
@@ -14069,7 +14176,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 391
+ "__id__": 394
},
"_enabled": true,
"_materials": [
@@ -14080,7 +14187,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5c3bb932-6c3c-468f-88a9-c8c61d458641"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -14104,7 +14211,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "85pZ7O93BOoLV2toP+Kr0P",
+ "fileId": "209qPAdB1HCK2fc0BQdreF",
"sync": false
},
{
@@ -14112,18 +14219,18 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 390
+ "__id__": 393
},
"_enabled": true,
"_scrollView": {
- "__id__": 395
+ "__id__": 398
},
"_touching": false,
"_opacity": 255,
"enableAutoHide": true,
"autoHideTime": 1,
"_N$handle": {
- "__id__": 392
+ "__id__": 395
},
"_N$direction": 1,
"_id": ""
@@ -14133,7 +14240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 383
+ "__id__": 386
},
"_enabled": true,
"horizontal": false,
@@ -14145,14 +14252,14 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
- "__id__": 385
+ "__id__": 388
},
"content": {
- "__id__": 385
+ "__id__": 388
},
"_N$horizontalScrollBar": null,
"_N$verticalScrollBar": {
- "__id__": 394
+ "__id__": 397
},
"_id": ""
},
@@ -14161,14 +14268,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 390
+ "__id__": 393
},
"_enabled": true,
"alignMode": 0,
"_target": null,
"_alignFlags": 37,
"_left": 350.07654921020657,
- "_right": 0,
+ "_right": 4,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -14188,7 +14295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 390
+ "__id__": 393
},
"_enabled": true,
"_materials": [
@@ -14199,7 +14306,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5fe5dcaa-b513-4dc5-a166-573627b3a159"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -14223,7 +14330,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "d1qgmoEhlJg5GlXHu2YWj/",
+ "fileId": "8eyocaBuZNKbkfZQdhrazT",
"sync": false
},
{
@@ -14231,7 +14338,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 383
+ "__id__": 386
},
"_enabled": true,
"_id": ""
@@ -14241,7 +14348,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 383
+ "__id__": 386
},
"_enabled": true,
"_materials": [
@@ -14284,30 +14391,30 @@
"_name": "MultiplierList",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 403
- },
- {
- "__id__": 409
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 418
- },
- {
- "__id__": 419
+ "__id__": 406
},
{
"__id__": 414
}
],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 423
+ },
+ {
+ "__id__": 424
+ },
+ {
+ "__id__": 419
+ }
+ ],
"_prefab": {
- "__id__": 420
+ "__id__": 425
},
"_opacity": 255,
"_color": {
@@ -14331,8 +14438,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 208.763,
- 338.433,
+ 200,
+ 330,
0,
0,
0,
@@ -14361,21 +14468,24 @@
"_name": "view",
"_objFlags": 0,
"_parent": {
- "__id__": 402
+ "__id__": 405
},
"_children": [
{
- "__id__": 404
+ "__id__": 407
}
],
"_active": true,
"_components": [
{
- "__id__": 407
+ "__id__": 411
+ },
+ {
+ "__id__": 412
}
],
"_prefab": {
- "__id__": 408
+ "__id__": 413
},
"_opacity": 255,
"_color": {
@@ -14429,17 +14539,20 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 403
+ "__id__": 406
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 405
+ "__id__": 408
+ },
+ {
+ "__id__": 409
}
],
"_prefab": {
- "__id__": 406
+ "__id__": 410
},
"_opacity": 255,
"_color": {
@@ -14493,7 +14606,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 404
+ "__id__": 407
},
"_enabled": true,
"_layoutSize": {
@@ -14521,6 +14634,33 @@
"_N$affectedByScale": false,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 407
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 230,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -14537,7 +14677,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 403
+ "__id__": 406
},
"_enabled": true,
"_materials": [
@@ -14552,6 +14692,33 @@
"_N$inverted": false,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 406
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 230,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -14568,51 +14735,51 @@
"_name": "scrollBar",
"_objFlags": 0,
"_parent": {
- "__id__": 402
+ "__id__": 405
},
"_children": [
{
- "__id__": 410
+ "__id__": 415
}
],
"_active": true,
"_components": [
{
- "__id__": 413
+ "__id__": 418
},
{
- "__id__": 415
+ "__id__": 420
},
{
- "__id__": 416
+ "__id__": 421
}
],
"_prefab": {
- "__id__": 417
+ "__id__": 422
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 0,
+ "g": 0,
+ "b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 12,
+ "width": 4,
"height": 220
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 230,
+ 224,
-110,
0,
0,
@@ -14642,41 +14809,41 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
- "__id__": 409
+ "__id__": 414
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 411
+ "__id__": 416
}
],
"_prefab": {
- "__id__": 412
+ "__id__": 417
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 200,
+ "g": 130,
+ "b": 100,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 10,
+ "width": 6,
"height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -1,
+ 0,
0,
0,
0,
@@ -14706,7 +14873,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 410
+ "__id__": 415
},
"_enabled": true,
"_materials": [
@@ -14717,7 +14884,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5c3bb932-6c3c-468f-88a9-c8c61d458641"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -14741,7 +14908,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "a6DLyir0tHKZ2774oQqvyI",
+ "fileId": "da45cA4pJE14qibF0gDYqZ",
"sync": false
},
{
@@ -14749,18 +14916,18 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 409
+ "__id__": 414
},
"_enabled": true,
"_scrollView": {
- "__id__": 414
+ "__id__": 419
},
"_touching": false,
"_opacity": 255,
"enableAutoHide": true,
"autoHideTime": 1,
"_N$handle": {
- "__id__": 411
+ "__id__": 416
},
"_N$direction": 1,
"_id": ""
@@ -14770,7 +14937,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 402
+ "__id__": 405
},
"_enabled": true,
"horizontal": false,
@@ -14782,14 +14949,14 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
- "__id__": 404
+ "__id__": 407
},
"content": {
- "__id__": 404
+ "__id__": 407
},
"_N$horizontalScrollBar": null,
"_N$verticalScrollBar": {
- "__id__": 413
+ "__id__": 418
},
"_id": ""
},
@@ -14798,14 +14965,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 409
+ "__id__": 414
},
"_enabled": true,
"alignMode": 0,
"_target": null,
"_alignFlags": 37,
"_left": 350.07654921020657,
- "_right": 0,
+ "_right": 4,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -14825,7 +14992,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 409
+ "__id__": 414
},
"_enabled": true,
"_materials": [
@@ -14836,7 +15003,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5fe5dcaa-b513-4dc5-a166-573627b3a159"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -14860,7 +15027,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "ffHu+iC/pENJnPbztO6MsB",
+ "fileId": "23nxcpSPZH+pK6IN7hQUOq",
"sync": false
},
{
@@ -14868,7 +15035,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 402
+ "__id__": 405
},
"_enabled": true,
"_id": ""
@@ -14878,7 +15045,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 402
+ "__id__": 405
},
"_enabled": true,
"_materials": [
@@ -14921,33 +15088,33 @@
"_name": "ParamAdd",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 422
+ "__id__": 427
},
{
- "__id__": 425
+ "__id__": 430
},
{
- "__id__": 436
+ "__id__": 441
},
{
- "__id__": 447
+ "__id__": 452
},
{
- "__id__": 458
+ "__id__": 463
}
],
"_active": true,
"_components": [
{
- "__id__": 469
+ "__id__": 474
}
],
"_prefab": {
- "__id__": 470
+ "__id__": 475
},
"_opacity": 255,
"_color": {
@@ -14971,8 +15138,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -842.142,
- 361.437,
+ -840,
+ 360,
0,
0,
0,
@@ -15001,17 +15168,17 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
- "__id__": 421
+ "__id__": 426
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 423
+ "__id__": 428
}
],
"_prefab": {
- "__id__": 424
+ "__id__": 429
},
"_opacity": 255,
"_color": {
@@ -15065,7 +15232,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 422
+ "__id__": 427
},
"_enabled": true,
"_materials": [
@@ -15108,21 +15275,21 @@
"_name": "number",
"_objFlags": 0,
"_parent": {
- "__id__": 421
+ "__id__": 426
},
"_children": [
{
- "__id__": 426
+ "__id__": 431
}
],
"_active": true,
"_components": [
{
- "__id__": 433
+ "__id__": 438
}
],
"_prefab": {
- "__id__": 435
+ "__id__": 440
},
"_opacity": 255,
"_color": {
@@ -15176,24 +15343,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 425
+ "__id__": 430
},
"_children": [
{
- "__id__": 427
+ "__id__": 432
}
],
"_active": true,
"_components": [
{
- "__id__": 430
+ "__id__": 435
},
{
- "__id__": 431
+ "__id__": 436
}
],
"_prefab": {
- "__id__": 432
+ "__id__": 437
},
"_opacity": 255,
"_color": {
@@ -15247,17 +15414,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 426
+ "__id__": 431
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 428
+ "__id__": 433
}
],
"_prefab": {
- "__id__": 429
+ "__id__": 434
},
"_opacity": 255,
"_color": {
@@ -15311,7 +15478,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 427
+ "__id__": 432
},
"_enabled": true,
"_materials": [
@@ -15352,7 +15519,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 426
+ "__id__": 431
},
"_enabled": true,
"_materials": [
@@ -15384,7 +15551,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 426
+ "__id__": 431
},
"_enabled": true,
"alignMode": 0,
@@ -15422,7 +15589,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 425
+ "__id__": 430
},
"_enabled": true,
"_normalMaterial": {
@@ -15433,7 +15600,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 434
+ "__id__": 439
}
],
"_N$interactable": true,
@@ -15501,14 +15668,14 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 426
+ "__id__": 431
},
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 265
+ "__id__": 267
},
"component": "",
"_componentId": "86c893/zz5AbqnVPafNXobP",
@@ -15531,21 +15698,21 @@
"_name": "boolean",
"_objFlags": 0,
"_parent": {
- "__id__": 421
+ "__id__": 426
},
"_children": [
{
- "__id__": 437
+ "__id__": 442
}
],
"_active": true,
"_components": [
{
- "__id__": 444
+ "__id__": 449
}
],
"_prefab": {
- "__id__": 446
+ "__id__": 451
},
"_opacity": 255,
"_color": {
@@ -15599,24 +15766,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 436
+ "__id__": 441
},
"_children": [
{
- "__id__": 438
+ "__id__": 443
}
],
"_active": true,
"_components": [
{
- "__id__": 441
+ "__id__": 446
},
{
- "__id__": 442
+ "__id__": 447
}
],
"_prefab": {
- "__id__": 443
+ "__id__": 448
},
"_opacity": 255,
"_color": {
@@ -15670,17 +15837,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 437
+ "__id__": 442
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 439
+ "__id__": 444
}
],
"_prefab": {
- "__id__": 440
+ "__id__": 445
},
"_opacity": 255,
"_color": {
@@ -15734,7 +15901,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 438
+ "__id__": 443
},
"_enabled": true,
"_materials": [
@@ -15775,7 +15942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 437
+ "__id__": 442
},
"_enabled": true,
"_materials": [
@@ -15807,7 +15974,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 437
+ "__id__": 442
},
"_enabled": true,
"alignMode": 0,
@@ -15845,7 +16012,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 436
+ "__id__": 441
},
"_enabled": true,
"_normalMaterial": {
@@ -15856,7 +16023,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 445
+ "__id__": 450
}
],
"_N$interactable": true,
@@ -15924,14 +16091,14 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 437
+ "__id__": 442
},
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 265
+ "__id__": 267
},
"component": "",
"_componentId": "86c893/zz5AbqnVPafNXobP",
@@ -15954,21 +16121,21 @@
"_name": "trigger",
"_objFlags": 0,
"_parent": {
- "__id__": 421
+ "__id__": 426
},
"_children": [
{
- "__id__": 448
+ "__id__": 453
}
],
"_active": true,
"_components": [
{
- "__id__": 455
+ "__id__": 460
}
],
"_prefab": {
- "__id__": 457
+ "__id__": 462
},
"_opacity": 255,
"_color": {
@@ -16022,24 +16189,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 447
+ "__id__": 452
},
"_children": [
{
- "__id__": 449
+ "__id__": 454
}
],
"_active": true,
"_components": [
{
- "__id__": 452
+ "__id__": 457
},
{
- "__id__": 453
+ "__id__": 458
}
],
"_prefab": {
- "__id__": 454
+ "__id__": 459
},
"_opacity": 255,
"_color": {
@@ -16093,17 +16260,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 448
+ "__id__": 453
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 450
+ "__id__": 455
}
],
"_prefab": {
- "__id__": 451
+ "__id__": 456
},
"_opacity": 255,
"_color": {
@@ -16157,7 +16324,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 449
+ "__id__": 454
},
"_enabled": true,
"_materials": [
@@ -16198,7 +16365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 448
+ "__id__": 453
},
"_enabled": true,
"_materials": [
@@ -16230,7 +16397,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 448
+ "__id__": 453
},
"_enabled": true,
"alignMode": 0,
@@ -16268,7 +16435,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 447
+ "__id__": 452
},
"_enabled": true,
"_normalMaterial": {
@@ -16279,7 +16446,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 456
+ "__id__": 461
}
],
"_N$interactable": true,
@@ -16347,14 +16514,14 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 448
+ "__id__": 453
},
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 265
+ "__id__": 267
},
"component": "",
"_componentId": "86c893/zz5AbqnVPafNXobP",
@@ -16377,21 +16544,21 @@
"_name": "autoTrigger",
"_objFlags": 0,
"_parent": {
- "__id__": 421
+ "__id__": 426
},
"_children": [
{
- "__id__": 459
+ "__id__": 464
}
],
"_active": true,
"_components": [
{
- "__id__": 466
+ "__id__": 471
}
],
"_prefab": {
- "__id__": 468
+ "__id__": 473
},
"_opacity": 255,
"_color": {
@@ -16445,24 +16612,24 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 458
+ "__id__": 463
},
"_children": [
{
- "__id__": 460
+ "__id__": 465
}
],
"_active": true,
"_components": [
{
- "__id__": 463
+ "__id__": 468
},
{
- "__id__": 464
+ "__id__": 469
}
],
"_prefab": {
- "__id__": 465
+ "__id__": 470
},
"_opacity": 255,
"_color": {
@@ -16516,17 +16683,17 @@
"_name": "Label",
"_objFlags": 0,
"_parent": {
- "__id__": 459
+ "__id__": 464
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 461
+ "__id__": 466
}
],
"_prefab": {
- "__id__": 462
+ "__id__": 467
},
"_opacity": 255,
"_color": {
@@ -16580,7 +16747,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 460
+ "__id__": 465
},
"_enabled": true,
"_materials": [
@@ -16621,7 +16788,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 459
+ "__id__": 464
},
"_enabled": true,
"_materials": [
@@ -16653,7 +16820,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 459
+ "__id__": 464
},
"_enabled": true,
"alignMode": 0,
@@ -16691,7 +16858,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 458
+ "__id__": 463
},
"_enabled": true,
"_normalMaterial": {
@@ -16702,7 +16869,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 467
+ "__id__": 472
}
],
"_N$interactable": true,
@@ -16770,14 +16937,14 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
- "__id__": 459
+ "__id__": 464
},
"_id": ""
},
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 265
+ "__id__": 267
},
"component": "",
"_componentId": "86c893/zz5AbqnVPafNXobP",
@@ -16800,7 +16967,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 421
+ "__id__": 426
},
"_enabled": true,
"_id": ""
@@ -16821,30 +16988,30 @@
"_name": "ParamSelect",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 472
+ "__id__": 477
},
{
- "__id__": 478
+ "__id__": 485
}
],
"_active": true,
"_components": [
{
- "__id__": 487
+ "__id__": 494
},
{
- "__id__": 488
+ "__id__": 495
},
{
- "__id__": 483
+ "__id__": 490
}
],
"_prefab": {
- "__id__": 489
+ "__id__": 496
},
"_opacity": 255,
"_color": {
@@ -16898,21 +17065,24 @@
"_name": "view",
"_objFlags": 0,
"_parent": {
- "__id__": 471
+ "__id__": 476
},
"_children": [
{
- "__id__": 473
+ "__id__": 478
}
],
"_active": true,
"_components": [
{
- "__id__": 476
+ "__id__": 482
+ },
+ {
+ "__id__": 483
}
],
"_prefab": {
- "__id__": 477
+ "__id__": 484
},
"_opacity": 255,
"_color": {
@@ -16966,17 +17136,20 @@
"_name": "content",
"_objFlags": 0,
"_parent": {
- "__id__": 472
+ "__id__": 477
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 474
+ "__id__": 479
+ },
+ {
+ "__id__": 480
}
],
"_prefab": {
- "__id__": 475
+ "__id__": 481
},
"_opacity": 255,
"_color": {
@@ -17025,12 +17198,39 @@
"groupIndex": 0,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 478
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 160,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 473
+ "__id__": 478
},
"_enabled": true,
"_layoutSize": {
@@ -17074,7 +17274,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 472
+ "__id__": 477
},
"_enabled": true,
"_materials": [
@@ -17089,6 +17289,33 @@
"_N$inverted": false,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 477
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 160,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -17105,51 +17332,51 @@
"_name": "scrollBar",
"_objFlags": 0,
"_parent": {
- "__id__": 471
+ "__id__": 476
},
"_children": [
{
- "__id__": 479
+ "__id__": 486
}
],
"_active": true,
"_components": [
{
- "__id__": 482
+ "__id__": 489
},
{
- "__id__": 484
+ "__id__": 491
},
{
- "__id__": 485
+ "__id__": 492
}
],
"_prefab": {
- "__id__": 486
+ "__id__": 493
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 0,
+ "g": 0,
+ "b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 12,
+ "width": 4,
"height": 120
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- 160,
+ 154,
-60,
0,
0,
@@ -17179,41 +17406,41 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
- "__id__": 478
+ "__id__": 485
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 480
+ "__id__": 487
}
],
"_prefab": {
- "__id__": 481
+ "__id__": 488
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 200,
+ "g": 130,
+ "b": 100,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 10,
+ "width": 6,
"height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 1,
+ "x": 0.5,
"y": 0
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
- -1,
+ 0,
0,
0,
0,
@@ -17243,7 +17470,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 479
+ "__id__": 486
},
"_enabled": true,
"_materials": [
@@ -17254,7 +17481,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5c3bb932-6c3c-468f-88a9-c8c61d458641"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -17278,7 +17505,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "0fM0g3iY9MeIx3kjNYXPMm",
+ "fileId": "50p61OiS1FQ5QsnOMoI2Lw",
"sync": false
},
{
@@ -17286,18 +17513,18 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 478
+ "__id__": 485
},
"_enabled": true,
"_scrollView": {
- "__id__": 483
+ "__id__": 490
},
"_touching": false,
"_opacity": 255,
"enableAutoHide": true,
"autoHideTime": 1,
"_N$handle": {
- "__id__": 480
+ "__id__": 487
},
"_N$direction": 1,
"_id": ""
@@ -17307,7 +17534,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 471
+ "__id__": 476
},
"_enabled": true,
"horizontal": false,
@@ -17319,13 +17546,13 @@
"scrollEvents": [],
"cancelInnerEvents": true,
"_N$content": {
- "__id__": 473
+ "__id__": 478
},
"content": {
- "__id__": 473
+ "__id__": 478
},
"_N$verticalScrollBar": {
- "__id__": 482
+ "__id__": 489
},
"_id": ""
},
@@ -17334,14 +17561,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 478
+ "__id__": 485
},
"_enabled": true,
"alignMode": 0,
"_target": null,
"_alignFlags": 37,
"_left": 350.07654921020657,
- "_right": 0,
+ "_right": 4,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -17361,7 +17588,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 478
+ "__id__": 485
},
"_enabled": true,
"_materials": [
@@ -17372,7 +17599,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
- "__uuid__": "5fe5dcaa-b513-4dc5-a166-573627b3a159"
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
},
"_type": 1,
"_sizeMode": 0,
@@ -17396,7 +17623,7 @@
"asset": {
"__uuid__": "dfcd6482-cd44-4b76-95a5-db4d9e1aa0bb"
},
- "fileId": "ed5KkXBF9Ndbt0plqGXKPA",
+ "fileId": "ecLz0eOTFD/ZDDbcyGZa0D",
"sync": false
},
{
@@ -17404,7 +17631,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 471
+ "__id__": 476
},
"_enabled": true,
"_id": ""
@@ -17414,7 +17641,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 471
+ "__id__": 476
},
"_enabled": true,
"_materials": [
@@ -17457,39 +17684,39 @@
"_name": "ConditionLogic",
"_objFlags": 0,
"_parent": {
- "__id__": 314
+ "__id__": 317
},
"_children": [
{
- "__id__": 491
+ "__id__": 498
},
{
- "__id__": 499
+ "__id__": 506
},
{
- "__id__": 507
+ "__id__": 514
},
{
- "__id__": 515
+ "__id__": 522
},
{
- "__id__": 523
+ "__id__": 530
},
{
- "__id__": 531
+ "__id__": 538
}
],
"_active": true,
"_components": [
{
- "__id__": 539
+ "__id__": 546
},
{
- "__id__": 540
+ "__id__": 547
}
],
"_prefab": {
- "__id__": 541
+ "__id__": 548
},
"_opacity": 255,
"_color": {
@@ -17543,24 +17770,24 @@
"_name": "equal",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 492
+ "__id__": 499
}
],
"_active": true,
"_components": [
{
- "__id__": 495
+ "__id__": 502
},
{
- "__id__": 496
+ "__id__": 503
}
],
"_prefab": {
- "__id__": 498
+ "__id__": 505
},
"_opacity": 255,
"_color": {
@@ -17614,17 +17841,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 491
+ "__id__": 498
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 493
+ "__id__": 500
}
],
"_prefab": {
- "__id__": 494
+ "__id__": 501
},
"_opacity": 255,
"_color": {
@@ -17678,7 +17905,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 492
+ "__id__": 499
},
"_enabled": true,
"_materials": [
@@ -17719,7 +17946,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 491
+ "__id__": 498
},
"_enabled": true,
"_materials": [
@@ -17751,7 +17978,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 491
+ "__id__": 498
},
"_enabled": true,
"_normalMaterial": {
@@ -17762,7 +17989,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 497
+ "__id__": 504
}
],
"_N$interactable": true,
@@ -17823,7 +18050,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -17846,24 +18073,24 @@
"_name": "notEqual",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 500
+ "__id__": 507
}
],
"_active": true,
"_components": [
{
- "__id__": 503
+ "__id__": 510
},
{
- "__id__": 504
+ "__id__": 511
}
],
"_prefab": {
- "__id__": 506
+ "__id__": 513
},
"_opacity": 255,
"_color": {
@@ -17917,17 +18144,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 499
+ "__id__": 506
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 501
+ "__id__": 508
}
],
"_prefab": {
- "__id__": 502
+ "__id__": 509
},
"_opacity": 255,
"_color": {
@@ -17981,7 +18208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 500
+ "__id__": 507
},
"_enabled": true,
"_materials": [
@@ -18022,7 +18249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 499
+ "__id__": 506
},
"_enabled": true,
"_materials": [
@@ -18054,7 +18281,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 499
+ "__id__": 506
},
"_enabled": true,
"_normalMaterial": {
@@ -18065,7 +18292,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 505
+ "__id__": 512
}
],
"_N$interactable": true,
@@ -18126,7 +18353,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -18149,24 +18376,24 @@
"_name": "greater",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 508
+ "__id__": 515
}
],
"_active": true,
"_components": [
{
- "__id__": 511
+ "__id__": 518
},
{
- "__id__": 512
+ "__id__": 519
}
],
"_prefab": {
- "__id__": 514
+ "__id__": 521
},
"_opacity": 255,
"_color": {
@@ -18220,17 +18447,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 507
+ "__id__": 514
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 509
+ "__id__": 516
}
],
"_prefab": {
- "__id__": 510
+ "__id__": 517
},
"_opacity": 255,
"_color": {
@@ -18284,7 +18511,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 508
+ "__id__": 515
},
"_enabled": true,
"_materials": [
@@ -18325,7 +18552,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 507
+ "__id__": 514
},
"_enabled": true,
"_materials": [
@@ -18357,7 +18584,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 507
+ "__id__": 514
},
"_enabled": true,
"_normalMaterial": {
@@ -18368,7 +18595,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 513
+ "__id__": 520
}
],
"_N$interactable": true,
@@ -18429,7 +18656,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -18452,24 +18679,24 @@
"_name": "less",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 516
+ "__id__": 523
}
],
"_active": true,
"_components": [
{
- "__id__": 519
+ "__id__": 526
},
{
- "__id__": 520
+ "__id__": 527
}
],
"_prefab": {
- "__id__": 522
+ "__id__": 529
},
"_opacity": 255,
"_color": {
@@ -18523,17 +18750,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 515
+ "__id__": 522
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 517
+ "__id__": 524
}
],
"_prefab": {
- "__id__": 518
+ "__id__": 525
},
"_opacity": 255,
"_color": {
@@ -18587,7 +18814,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 516
+ "__id__": 523
},
"_enabled": true,
"_materials": [
@@ -18628,7 +18855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 515
+ "__id__": 522
},
"_enabled": true,
"_materials": [
@@ -18660,7 +18887,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 515
+ "__id__": 522
},
"_enabled": true,
"_normalMaterial": {
@@ -18671,7 +18898,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 521
+ "__id__": 528
}
],
"_N$interactable": true,
@@ -18732,7 +18959,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -18755,24 +18982,24 @@
"_name": "greaterEqual",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 524
+ "__id__": 531
}
],
"_active": true,
"_components": [
{
- "__id__": 527
+ "__id__": 534
},
{
- "__id__": 528
+ "__id__": 535
}
],
"_prefab": {
- "__id__": 530
+ "__id__": 537
},
"_opacity": 255,
"_color": {
@@ -18826,17 +19053,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 523
+ "__id__": 530
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 525
+ "__id__": 532
}
],
"_prefab": {
- "__id__": 526
+ "__id__": 533
},
"_opacity": 255,
"_color": {
@@ -18890,7 +19117,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 524
+ "__id__": 531
},
"_enabled": true,
"_materials": [
@@ -18931,7 +19158,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 523
+ "__id__": 530
},
"_enabled": true,
"_materials": [
@@ -18963,7 +19190,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 523
+ "__id__": 530
},
"_enabled": true,
"_normalMaterial": {
@@ -18974,7 +19201,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 529
+ "__id__": 536
}
],
"_N$interactable": true,
@@ -19035,7 +19262,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -19058,24 +19285,24 @@
"_name": "lessEqual",
"_objFlags": 0,
"_parent": {
- "__id__": 490
+ "__id__": 497
},
"_children": [
{
- "__id__": 532
+ "__id__": 539
}
],
"_active": true,
"_components": [
{
- "__id__": 535
+ "__id__": 542
},
{
- "__id__": 536
+ "__id__": 543
}
],
"_prefab": {
- "__id__": 538
+ "__id__": 545
},
"_opacity": 255,
"_color": {
@@ -19129,17 +19356,17 @@
"_name": "New Label",
"_objFlags": 0,
"_parent": {
- "__id__": 531
+ "__id__": 538
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 533
+ "__id__": 540
}
],
"_prefab": {
- "__id__": 534
+ "__id__": 541
},
"_opacity": 255,
"_color": {
@@ -19193,7 +19420,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 532
+ "__id__": 539
},
"_enabled": true,
"_materials": [
@@ -19234,7 +19461,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 531
+ "__id__": 538
},
"_enabled": true,
"_materials": [
@@ -19266,7 +19493,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 531
+ "__id__": 538
},
"_enabled": true,
"_normalMaterial": {
@@ -19277,7 +19504,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 537
+ "__id__": 544
}
],
"_N$interactable": true,
@@ -19338,7 +19565,7 @@
{
"__type__": "cc.ClickEvent",
"target": {
- "__id__": 314
+ "__id__": 317
},
"component": "",
"_componentId": "c2fcbr7yPJERI8iM3RbEqTq",
@@ -19361,7 +19588,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 490
+ "__id__": 497
},
"_enabled": true,
"_id": ""
@@ -19371,7 +19598,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 490
+ "__id__": 497
},
"_enabled": true,
"_materials": [
@@ -19414,7 +19641,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 314
+ "__id__": 317
},
"_enabled": true,
"alignMode": 1,
@@ -19441,7 +19668,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 314
+ "__id__": 317
},
"_enabled": true,
"_id": ""
@@ -19451,26 +19678,26 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 314
+ "__id__": 317
},
"_enabled": true,
"RightMenu": {
- "__id__": 315
+ "__id__": 318
},
"LineToSubList": {
- "__id__": 395
+ "__id__": 398
},
"MultiplierList": {
- "__id__": 414
+ "__id__": 419
},
"ParamAdd": {
- "__id__": 421
+ "__id__": 426
},
"ParamSelect": {
- "__id__": 483
+ "__id__": 490
},
"ConditionLogic": {
- "__id__": 490
+ "__id__": 497
},
"_id": ""
},
@@ -19524,13 +19751,13 @@
"__id__": 23
},
"Inspector": {
- "__id__": 263
+ "__id__": 265
},
- "ParamCtr": {
- "__id__": 312
+ "Parameters": {
+ "__id__": 315
},
"Menu": {
- "__id__": 544
+ "__id__": 551
},
"_id": ""
},
diff --git a/animator-editor/assets/resources/prefab/item/ConditionItem.prefab b/animator-editor/assets/resources/prefab/item/ConditionItem.prefab
index f1f7737..cc57e10 100644
--- a/animator-editor/assets/resources/prefab/item/ConditionItem.prefab
+++ b/animator-editor/assets/resources/prefab/item/ConditionItem.prefab
@@ -27,20 +27,20 @@
"__id__": 10
},
{
- "__id__": 20
+ "__id__": 24
},
{
- "__id__": 32
+ "__id__": 36
}
],
"_active": true,
"_components": [
{
- "__id__": 62
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 63
+ "__id__": 67
},
"_opacity": 255,
"_color": {
@@ -373,22 +373,25 @@
"_children": [
{
"__id__": 11
+ },
+ {
+ "__id__": 15
}
],
"_active": true,
"_components": [
{
- "__id__": 15
+ "__id__": 19
},
{
- "__id__": 16
+ "__id__": 20
},
{
- "__id__": 17
+ "__id__": 21
}
],
"_prefab": {
- "__id__": 19
+ "__id__": 23
},
"_opacity": 255,
"_color": {
@@ -439,7 +442,7 @@
},
{
"__type__": "cc.Node",
- "_name": "New Label",
+ "_name": "tri",
"_objFlags": 0,
"_parent": {
"__id__": 10
@@ -458,6 +461,143 @@
"__id__": 14
},
"_opacity": 255,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 220,
+ "g": 220,
+ "b": 220,
+ "a": 255
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 200,
+ "height": 173
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_trs": {
+ "__type__": "TypedArray",
+ "ctor": "Float64Array",
+ "array": [
+ 145,
+ 0,
+ 0,
+ 0,
+ 0,
+ 1,
+ 6.123233995736766e-17,
+ 0.08,
+ 0.08,
+ 1
+ ]
+ },
+ "_eulerAngles": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 180
+ },
+ "_skewX": 0,
+ "_skewY": 0,
+ "_is3DNode": false,
+ "_groupIndex": 0,
+ "groupIndex": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 11
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 32,
+ "_left": 0,
+ "_right": 7,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 11
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": {
+ "__uuid__": "d5067326-2ed3-4e1a-91a4-706a7e1ba65e"
+ },
+ "_type": 0,
+ "_sizeMode": 1,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__uuid__": "d2a69c7f-2a5f-40da-9dcc-ef17c9a856be"
+ },
+ "fileId": "27/82N9gVHJJF2/FU7Rh6Z",
+ "sync": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "New Label",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 10
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 17
+ }
+ ],
+ "_prefab": {
+ "__id__": 18
+ },
+ "_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
@@ -467,7 +607,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 153,
+ "width": 130,
"height": 40.32
},
"_anchorPoint": {
@@ -509,14 +649,14 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 11
+ "__id__": 15
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 2,
- "_right": 5,
+ "_right": 28,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -536,7 +676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 11
+ "__id__": 15
},
"_enabled": true,
"_materials": [
@@ -639,38 +779,40 @@
"__id__": 10
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 18
+ "__id__": 22
}
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -689,9 +831,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -700,7 +842,9 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 11
+ },
"_id": ""
},
{
@@ -732,24 +876,24 @@
"__id__": 1
},
"_children": [
- {
- "__id__": 21
- },
{
"__id__": 25
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 28
},
{
"__id__": 29
}
],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 32
+ },
+ {
+ "__id__": 33
+ }
+ ],
"_prefab": {
- "__id__": 31
+ "__id__": 35
},
"_opacity": 255,
"_color": {
@@ -803,20 +947,20 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
- "__id__": 20
+ "__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 22
+ "__id__": 26
},
{
- "__id__": 23
+ "__id__": 27
}
],
"_prefab": {
- "__id__": 24
+ "__id__": 28
},
"_opacity": 255,
"_color": {
@@ -870,7 +1014,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 21
+ "__id__": 25
},
"_enabled": true,
"_materials": [
@@ -902,7 +1046,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 21
+ "__id__": 25
},
"_enabled": true,
"alignMode": 1,
@@ -940,17 +1084,17 @@
"_name": "lab",
"_objFlags": 0,
"_parent": {
- "__id__": 20
+ "__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 26
+ "__id__": 30
}
],
"_prefab": {
- "__id__": 27
+ "__id__": 31
},
"_opacity": 255,
"_color": {
@@ -1004,7 +1148,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 25
+ "__id__": 29
},
"_enabled": true,
"_materials": [
@@ -1045,7 +1189,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 20
+ "__id__": 24
},
"_enabled": true,
"alignMode": 1,
@@ -1072,7 +1216,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 20
+ "__id__": 24
},
"_enabled": true,
"_normalMaterial": null,
@@ -1081,7 +1225,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 30
+ "__id__": 34
}
],
"_N$interactable": true,
@@ -1169,20 +1313,20 @@
},
"_children": [
{
- "__id__": 33
+ "__id__": 37
},
{
- "__id__": 50
+ "__id__": 54
}
],
"_active": true,
"_components": [
{
- "__id__": 60
+ "__id__": 64
}
],
"_prefab": {
- "__id__": 61
+ "__id__": 65
},
"_opacity": 255,
"_color": {
@@ -1236,27 +1380,27 @@
"_name": "number",
"_objFlags": 0,
"_parent": {
- "__id__": 32
+ "__id__": 36
},
"_children": [
- {
- "__id__": 34
- },
{
"__id__": 38
},
{
"__id__": 42
+ },
+ {
+ "__id__": 46
}
],
"_active": true,
"_components": [
{
- "__id__": 46
+ "__id__": 50
}
],
"_prefab": {
- "__id__": 49
+ "__id__": 53
},
"_opacity": 255,
"_color": {
@@ -1310,20 +1454,20 @@
"_name": "BACKGROUND_SPRITE",
"_objFlags": 0,
"_parent": {
- "__id__": 33
+ "__id__": 37
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 35
+ "__id__": 39
},
{
- "__id__": 36
+ "__id__": 40
}
],
"_prefab": {
- "__id__": 37
+ "__id__": 41
},
"_opacity": 255,
"_color": {
@@ -1377,7 +1521,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 34
+ "__id__": 38
},
"_enabled": true,
"_materials": [
@@ -1409,7 +1553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 34
+ "__id__": 38
},
"_enabled": true,
"alignMode": 0,
@@ -1447,20 +1591,20 @@
"_name": "TEXT_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 33
+ "__id__": 37
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 39
+ "__id__": 43
},
{
- "__id__": 40
+ "__id__": 44
}
],
"_prefab": {
- "__id__": 41
+ "__id__": 45
},
"_opacity": 255,
"_color": {
@@ -1514,7 +1658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 38
+ "__id__": 42
},
"_enabled": true,
"_materials": [],
@@ -1540,7 +1684,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 38
+ "__id__": 42
},
"_enabled": true,
"alignMode": 0,
@@ -1578,20 +1722,20 @@
"_name": "PLACEHOLDER_LABEL",
"_objFlags": 0,
"_parent": {
- "__id__": 33
+ "__id__": 37
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 43
+ "__id__": 47
},
{
- "__id__": 44
+ "__id__": 48
}
],
"_prefab": {
- "__id__": 45
+ "__id__": 49
},
"_opacity": 255,
"_color": {
@@ -1645,7 +1789,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 42
+ "__id__": 46
},
"_enabled": true,
"_materials": [
@@ -1675,7 +1819,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 42
+ "__id__": 46
},
"_enabled": true,
"alignMode": 0,
@@ -1713,7 +1857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 33
+ "__id__": 37
},
"_enabled": true,
"_useOriginalSize": false,
@@ -1723,24 +1867,24 @@
"_tabIndex": 0,
"editingDidBegan": [
{
- "__id__": 47
+ "__id__": 51
}
],
"textChanged": [
{
- "__id__": 48
+ "__id__": 52
}
],
"editingDidEnded": [],
"editingReturn": [],
"_N$textLabel": {
- "__id__": 39
- },
- "_N$placeholderLabel": {
"__id__": 43
},
+ "_N$placeholderLabel": {
+ "__id__": 47
+ },
"_N$background": {
- "__id__": 35
+ "__id__": 39
},
"_N$inputFlag": 5,
"_N$inputMode": 6,
@@ -1783,24 +1927,24 @@
"_name": "boolean",
"_objFlags": 0,
"_parent": {
- "__id__": 32
+ "__id__": 36
},
"_children": [
{
- "__id__": 51
+ "__id__": 55
},
{
- "__id__": 54
+ "__id__": 58
}
],
"_active": false,
"_components": [
{
- "__id__": 57
+ "__id__": 61
}
],
"_prefab": {
- "__id__": 59
+ "__id__": 63
},
"_opacity": 255,
"_color": {
@@ -1854,17 +1998,17 @@
"_name": "Background",
"_objFlags": 0,
"_parent": {
- "__id__": 50
+ "__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 52
+ "__id__": 56
}
],
"_prefab": {
- "__id__": 53
+ "__id__": 57
},
"_opacity": 255,
"_color": {
@@ -1918,7 +2062,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 51
+ "__id__": 55
},
"_enabled": true,
"_materials": [
@@ -1961,17 +2105,17 @@
"_name": "checkmark",
"_objFlags": 0,
"_parent": {
- "__id__": 50
+ "__id__": 54
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 55
+ "__id__": 59
}
],
"_prefab": {
- "__id__": 56
+ "__id__": 60
},
"_opacity": 255,
"_color": {
@@ -2025,7 +2169,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 54
+ "__id__": 58
},
"_enabled": true,
"_materials": [
@@ -2068,7 +2212,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 50
+ "__id__": 54
},
"_enabled": true,
"_normalMaterial": {
@@ -2131,16 +2275,16 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
- "__id__": 51
+ "__id__": 55
},
"_N$isChecked": true,
"toggleGroup": null,
"checkMark": {
- "__id__": 55
+ "__id__": 59
},
"checkEvents": [
{
- "__id__": 58
+ "__id__": 62
}
],
"_id": ""
@@ -2171,7 +2315,7 @@
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 32
+ "__id__": 36
},
"_enabled": true,
"alignMode": 1,
@@ -2216,13 +2360,13 @@
"__id__": 2
},
"ParamName": {
- "__id__": 13
+ "__id__": 17
},
"LogicNode": {
- "__id__": 20
+ "__id__": 24
},
"ValueNode": {
- "__id__": 32
+ "__id__": 36
},
"_id": ""
},
diff --git a/animator-editor/assets/resources/prefab/item/MultiplierItem.prefab b/animator-editor/assets/resources/prefab/item/MultiplierItem.prefab
index 169db7e..9977646 100644
--- a/animator-editor/assets/resources/prefab/item/MultiplierItem.prefab
+++ b/animator-editor/assets/resources/prefab/item/MultiplierItem.prefab
@@ -24,17 +24,17 @@
"_active": true,
"_components": [
{
- "__id__": 5
- },
- {
- "__id__": 7
+ "__id__": 6
},
{
"__id__": 8
+ },
+ {
+ "__id__": 9
}
],
"_prefab": {
- "__id__": 9
+ "__id__": 10
},
"_opacity": 255,
"_color": {
@@ -95,10 +95,13 @@
"_components": [
{
"__id__": 3
+ },
+ {
+ "__id__": 4
}
],
"_prefab": {
- "__id__": 4
+ "__id__": 5
},
"_opacity": 255,
"_color": {
@@ -147,6 +150,33 @@
"groupIndex": 0,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 5,
+ "_right": 5,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 200,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.Label",
"_name": "",
@@ -204,7 +234,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 6
+ "__id__": 7
}
],
"_N$interactable": true,
@@ -325,7 +355,7 @@
},
"_enabled": true,
"NameLabel": {
- "__id__": 3
+ "__id__": 4
},
"_id": ""
},
diff --git a/animator-editor/assets/resources/prefab/item/ParamItem.prefab b/animator-editor/assets/resources/prefab/item/ParamItem.prefab
index 89ba27e..4066b9d 100644
--- a/animator-editor/assets/resources/prefab/item/ParamItem.prefab
+++ b/animator-editor/assets/resources/prefab/item/ParamItem.prefab
@@ -397,8 +397,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 35,
- "height": 35
+ "width": 30,
+ "height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -553,7 +553,7 @@
"_target": null,
"_alignFlags": 32,
"_left": 0,
- "_right": 12.5,
+ "_right": 15,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
@@ -576,7 +576,9 @@
"__id__": 10
},
"_enabled": true,
- "_normalMaterial": null,
+ "_normalMaterial": {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ },
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
@@ -587,27 +589,27 @@
],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
- "_N$transition": 0,
- "transition": 0,
+ "_N$transition": 1,
+ "transition": 1,
"_N$normalColor": {
"__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
+ "r": 220,
+ "g": 220,
+ "b": 220,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
- "r": 211,
- "g": 211,
- "b": 211,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$hoverColor": {
@@ -626,9 +628,9 @@
},
"_N$disabledColor": {
"__type__": "cc.Color",
- "r": 124,
- "g": 124,
- "b": 124,
+ "r": 120,
+ "g": 120,
+ "b": 120,
"a": 255
},
"_N$normalSprite": null,
@@ -637,7 +639,9 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": null,
+ "_N$target": {
+ "__id__": 11
+ },
"_id": ""
},
{
diff --git a/animator-editor/assets/resources/prefab/item/ParamSelectItem.prefab b/animator-editor/assets/resources/prefab/item/ParamSelectItem.prefab
index 48a6782..b655935 100644
--- a/animator-editor/assets/resources/prefab/item/ParamSelectItem.prefab
+++ b/animator-editor/assets/resources/prefab/item/ParamSelectItem.prefab
@@ -19,22 +19,22 @@
"_children": [
{
"__id__": 2
- },
- {
- "__id__": 5
}
],
"_active": true,
"_components": [
{
- "__id__": 8
+ "__id__": 6
},
{
- "__id__": 10
+ "__id__": 7
+ },
+ {
+ "__id__": 9
}
],
"_prefab": {
- "__id__": 11
+ "__id__": 10
},
"_opacity": 255,
"_color": {
@@ -83,113 +83,6 @@
"groupIndex": 0,
"_id": ""
},
- {
- "__type__": "cc.Node",
- "_name": "bg",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 3
- }
- ],
- "_prefab": {
- "__id__": 4
- },
- "_opacity": 255,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 145,
- "height": 40
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_trs": {
- "__type__": "TypedArray",
- "ctor": "Float64Array",
- "array": [
- 0,
- 0,
- 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": ""
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "node": {
- "__id__": 2
- },
- "_enabled": true,
- "_materials": [
- {
- "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
- }
- ],
- "_srcBlendFactor": 770,
- "_dstBlendFactor": 771,
- "_spriteFrame": {
- "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
- },
- "_type": 0,
- "_sizeMode": 0,
- "_fillType": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__uuid__": "bd11cbb4-2878-4444-a558-63960f0ca931"
- },
- "fileId": "9eZGS5RWpKlachTtOIsQ4f",
- "sync": false
- },
{
"__type__": "cc.Node",
"_name": "New Label",
@@ -201,11 +94,14 @@
"_active": true,
"_components": [
{
- "__id__": 6
+ "__id__": 3
+ },
+ {
+ "__id__": 4
}
],
"_prefab": {
- "__id__": 7
+ "__id__": 5
},
"_opacity": 255,
"_color": {
@@ -217,7 +113,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 145,
+ "width": 135,
"height": 50.4
},
"_anchorPoint": {
@@ -254,12 +150,39 @@
"groupIndex": 0,
"_id": ""
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "alignMode": 1,
+ "_target": null,
+ "_alignFlags": 40,
+ "_left": 5,
+ "_right": 5,
+ "_top": 0,
+ "_bottom": 0,
+ "_verticalCenter": 0,
+ "_horizontalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 135,
+ "_originalHeight": 0,
+ "_id": ""
+ },
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
- "__id__": 5
+ "__id__": 2
},
"_enabled": true,
"_materials": [
@@ -295,6 +218,38 @@
"fileId": "4d6ZMnzSdJHauzrxuxF0uV",
"sync": false
},
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "_materials": [
+ {
+ "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+ }
+ ],
+ "_srcBlendFactor": 770,
+ "_dstBlendFactor": 771,
+ "_spriteFrame": {
+ "__uuid__": "9cc36e23-5b41-44ad-8512-a0a6bbf8e7b1"
+ },
+ "_type": 0,
+ "_sizeMode": 0,
+ "_fillType": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_atlas": null,
+ "_id": ""
+ },
{
"__type__": "cc.Button",
"_name": "",
@@ -311,7 +266,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
- "__id__": 9
+ "__id__": 8
}
],
"_N$interactable": true,
@@ -366,9 +321,7 @@
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
- "_N$target": {
- "__id__": 2
- },
+ "_N$target": null,
"_id": ""
},
{
@@ -390,7 +343,7 @@
},
"_enabled": true,
"ParamName": {
- "__id__": 6
+ "__id__": 4
},
"_id": ""
},
diff --git a/animator-editor/assets/script/common/cmpt/ResizeArea.ts b/animator-editor/assets/script/common/cmpt/ResizeArea.ts
index 715ca9a..bbae530 100644
--- a/animator-editor/assets/script/common/cmpt/ResizeArea.ts
+++ b/animator-editor/assets/script/common/cmpt/ResizeArea.ts
@@ -1,4 +1,6 @@
+import Setting from "../../editor/Setting";
import Events, { EventName } from "../util/Events";
+import Tool from "../util/Tool";
const { ccclass, property } = cc._decorator;
@@ -36,7 +38,7 @@ export default class ResizeArea extends cc.Component {
this.Target.updateAlignment();
Events.emit(EventName.RESIZE, this.Target.node);
- this.updateWidget(this.Target.node);
+ Setting.save();
}
private onTouchStart(event: cc.Event.EventTouch) {
@@ -61,12 +63,4 @@ export default class ResizeArea extends cc.Component {
private onMouseLeave(event: cc.Event.EventMouse) {
this._canvas.style.cursor = 'default ';
}
-
- private updateWidget(node: cc.Node) {
- node.children.forEach((c) => {
- let widget = c.getComponent(cc.Widget);
- widget && widget.updateAlignment();
- this.updateWidget(c);
- });
- }
}
diff --git a/animator-editor/assets/script/common/util/Tool.ts b/animator-editor/assets/script/common/util/Tool.ts
index 4a509ff..747ef64 100644
--- a/animator-editor/assets/script/common/util/Tool.ts
+++ b/animator-editor/assets/script/common/util/Tool.ts
@@ -105,4 +105,20 @@ export default class Tool {
arr.splice(idx, 1);
return true
}
+
+ /**
+ * 递归遍历所有子节点并更新widget组件
+ * @param node 目标节点，需遍历其子节点
+ * @param ignoreList 忽略节点，这些节点的子节点跳过遍历
+ */
+ public static updateWidget(node: cc.Node, ...ignoreList: cc.Node[]) {
+ node.children.forEach((c) => {
+ let widget = c.getComponent(cc.Widget);
+ widget && widget.updateAlignment();
+ if (this.arrayHas(ignoreList, c)) {
+ return;
+ }
+ this.updateWidget(c, ...ignoreList);
+ });
+ }
}
diff --git a/animator-editor/assets/script/editor/Editor.ts b/animator-editor/assets/script/editor/Editor.ts
index 5238e44..ec9e4fa 100644
--- a/animator-editor/assets/script/editor/Editor.ts
+++ b/animator-editor/assets/script/editor/Editor.ts
@@ -1,7 +1,9 @@
+import Tool from "../common/util/Tool";
import FsmCtr from "./fsm/FsmCtr";
import InspectorCtr from "./inspector/InspectorCtr";
import Menu from "./menu/Menu";
import ParamCtr from "./parameters/ParamCtr";
+import Setting from "./Setting";
const { ccclass, property } = cc._decorator;
@@ -9,7 +11,7 @@ const { ccclass, property } = cc._decorator;
export default class Editor extends cc.Component {
@property(FsmCtr) Fsm: FsmCtr = null;
@property(InspectorCtr) Inspector: InspectorCtr = null;
- @property(ParamCtr) ParamCtr: ParamCtr = null;
+ @property(ParamCtr) Parameters: ParamCtr = null;
@property(Menu) Menu: Menu = null;
public static Inst: Editor = null;
@@ -18,6 +20,15 @@ export default class Editor extends cc.Component {
private _keySet: Set = new Set();
protected onLoad() {
+ // 初始化界面宽度
+ Setting.read();
+ this.Inspector.node.width = Setting.inspectorWidth;
+ this.Inspector.getComponent(cc.Widget).updateAlignment();
+ Tool.updateWidget(this.Inspector.node);
+ this.Parameters.node.width = Setting.parametersWidth;
+ this.Parameters.getComponent(cc.Widget).updateAlignment();
+ Tool.updateWidget(this.Parameters.node);
+
cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, this.onKeyDown, this);
cc.systemEvent.on(cc.SystemEvent.EventType.KEY_UP, this.onKeyUp, this);
}
@@ -33,8 +44,8 @@ export default class Editor extends cc.Component {
switch (event.keyCode) {
case cc.macro.KEY.s:
if (this._keySet.has(cc.macro.KEY.ctrl)) {
- // 保存工程文件
- this.saveProject();
+ // 导出工程文件
+ this.exportProject();
}
break;
case cc.macro.KEY.e:
@@ -56,15 +67,15 @@ export default class Editor extends cc.Component {
this._keySet.delete(event.keyCode);
}
- private saveProject() {
+ private exportProject() {
let data: any = this.Fsm.exportProject();
- data.parameters = this.ParamCtr.export();
+ data.parameters = this.Parameters.export();
this.save('animator.json', data);
}
private exportRuntimeData() {
let data: any = this.Fsm.exportRuntimeData();
- data.parameters = this.ParamCtr.export();
+ data.parameters = this.Parameters.export();
this.save('runtimeData.json', data);
}
@@ -83,16 +94,4 @@ export default class Editor extends cc.Component {
// 移除
document.body.removeChild(eleLink);
}
-
- /**
- * 导入工程文件
- */
- public importProject(data: any) {
- if (!data.hasOwnProperty('animator')) {
- return;
- }
-
- this.ParamCtr.import(data.parameters);
- this.Fsm.importProject(data);
- }
}
diff --git a/animator-editor/assets/script/editor/Setting.ts b/animator-editor/assets/script/editor/Setting.ts
new file mode 100644
index 0000000..603c85c
--- /dev/null
+++ b/animator-editor/assets/script/editor/Setting.ts
@@ -0,0 +1,45 @@
+import Editor from "./Editor";
+
+/**
+ * 本地设置
+ */
+export default class Setting {
+ private static _inspectorWidth: number = 400;
+ public static get inspectorWidth() { return this._inspectorWidth; }
+
+ private static _parametersWidth: number = 300;
+ public static get parametersWidth() { return this._parametersWidth; }
+
+ /**
+ * 初始化读取数据
+ */
+ public static read() {
+ let str = cc.sys.localStorage.getItem('setting');
+ if (!str) {
+ return;
+ }
+ let data = JSON.parse(str);
+ if (!data) {
+ return;
+ }
+ if (data.inspectorWidth) {
+ this._inspectorWidth = data.inspectorWidth;
+ }
+ if (data.parametersWidth) {
+ this._parametersWidth = data.parametersWidth;
+ }
+ }
+
+ /**
+ * 保存数据
+ */
+ public static save() {
+ this._inspectorWidth = Editor.Inst.Inspector.node.width;
+ this._parametersWidth = Editor.Inst.Parameters.node.width;
+ let data = {
+ inspectorWidth: this._inspectorWidth,
+ parametersWidth: this._parametersWidth
+ };
+ cc.sys.localStorage.setItem('setting', JSON.stringify(data));
+ }
+}
\ No newline at end of file
diff --git a/animator-editor/assets/script/editor/Setting.ts.meta b/animator-editor/assets/script/editor/Setting.ts.meta
new file mode 100644
index 0000000..5f670aa
--- /dev/null
+++ b/animator-editor/assets/script/editor/Setting.ts.meta
@@ -0,0 +1,9 @@
+{
+ "ver": "1.0.5",
+ "uuid": "e82bc412-96df-4bfc-a190-2cb173908cbd",
+ "isPlugin": false,
+ "loadPluginInWeb": true,
+ "loadPluginInNative": true,
+ "loadPluginInEditor": false,
+ "subMetas": {}
+}
\ No newline at end of file
diff --git a/animator-editor/assets/script/editor/fsm/FsmCtr.ts b/animator-editor/assets/script/editor/fsm/FsmCtr.ts
index 759a3ea..453d398 100644
--- a/animator-editor/assets/script/editor/fsm/FsmCtr.ts
+++ b/animator-editor/assets/script/editor/fsm/FsmCtr.ts
@@ -1,4 +1,5 @@
import Events, { EventName, preloadEvent } from "../../common/util/Events";
+import Tool from "../../common/util/Tool";
import { ANIMATOR_VERSION } from "../../constant/BaseConst";
import Condition from "../data/Condition";
import State from "../data/State";
@@ -58,210 +59,6 @@ export default class FsmCtr extends cc.Component {
}
}
- //#region import and export
- private importTransitions(transitionsData: any[], state: State, stateMap: Map, paramMap: Map) {
- transitionsData.forEach((e) => {
- let toState: State = stateMap.get(e.toState);
- let transition: Transition = state.addTransition(toState);
- transition.hasExitTime = e.hasExitTime;
- e.conditions.forEach((cData) => {
- let paramItem = paramMap.get(cData.param);
- let condition: Condition = transition.addCondition(paramItem);
- condition.value = cData.value;
- condition.logic = cData.logic;
- });
- });
- }
-
- private importSubState(upData: any, upMachine: StateMachine, stateDataMap: Map, stateMap: Map, paramMap: Map) {
- upData.subStates.forEach((name: string) => {
- let state = new State(upMachine, false);
- stateMap.set(name, state);
- let data = stateDataMap.get(name);
- state.setPosition(data.position[0], data.position[1]);
- state.name = data.state;
- state.motion = data.motion;
- state.speed = data.speed;
- state.multiplierParam = paramMap.get(data.multiplier) || null;
- state.loop = data.loop;
-
- upMachine.add(state);
- });
- }
-
- private importSubMachine(upData: any, upMachine: StateMachine, subMachineDataMap: Map, subMachineMap: Map, stateDataMap: Map, stateMap: Map, paramMap: Map) {
- upData.subStateMachines.forEach((name: string) => {
- let stateMachine = new StateMachine(upMachine);
- subMachineMap.set(name, stateMachine);
- let data = subMachineDataMap.get(name);
- stateMachine.setLayerPos(data.layerPos[0], data.layerPos[1]);
- stateMachine.setLayerScale(data.layerScale);
- stateMachine.setAnyStatePos(data.anyStatePos[0], data.anyStatePos[1]);
- stateMachine.name = data.name;
- stateMachine.setPosition(data.position[0], data.position[1]);
- stateMachine.setUpStateMachinePos(data.upStateMachinePos[0], data.upStateMachinePos[1]);
-
- upMachine.add(stateMachine);
-
- this.importSubState(data, stateMachine, stateDataMap, stateMap, paramMap);
- this.importSubMachine(data, stateMachine, subMachineDataMap, subMachineMap, stateDataMap, stateMap, paramMap);
- });
- }
-
- private exportAllSubMachine(arr: any[], stateMachine: StateMachine) {
- stateMachine.subStateMachines.forEach((sub) => {
- let data = {
- layerPos: [sub.layerPos.x, sub.layerPos.y],
- layerScale: sub.layerScale,
- anyStatePos: [sub.anyStatePos.x, sub.anyStatePos.y],
- name: sub.name,
- position: [sub.position.x, sub.position.y],
- upStateMachine: sub.upStateMachine.name,
- upStateMachinePos: [sub.upStateMachinePos.x, sub.upStateMachinePos.y],
- subStates: [],
- subStateMachines: [],
- }
- sub.subStates.forEach((e) => {
- data.subStates.push(e.name);
- });
- sub.subStateMachines.forEach((e) => {
- data.subStateMachines.push(e.name);
- });
- arr.push(data);
- this.exportAllSubMachine(arr, sub);
- });
- }
-
- private exportAllState(arr: any[], stateMachine: StateMachine, isRuntimeData: boolean = false) {
- stateMachine.subStates.forEach((e) => {
- let data = null;
- if (isRuntimeData) {
- data = {
- state: e.name,
- motion: e.motion,
- speed: e.speed,
- multiplier: e.getMultiplierName(),
- loop: e.loop,
- transitions: e.getAllTransitionData()
- }
- } else {
- data = {
- position: [e.position.x, e.position.y],
- upStateMachine: e.upStateMachine.name,
- state: e.name,
- motion: e.motion,
- speed: e.speed,
- multiplier: e.getMultiplierName(),
- loop: e.loop,
- transitions: e.getAllTransitionData()
- }
- }
- arr.push(data);
- });
- stateMachine.subStateMachines.forEach((sub) => {
- this.exportAllState(arr, sub);
- });
- }
-
- /**
- * 导入工程数据
- */
- public importProject(data: any) {
- let paramMap: Map = Editor.Inst.ParamCtr.getParamMap();
-
- let mainStateMachineData = data.mainStateMachine;
- let subStateMachinesData = data.subStateMachines;
- let defaultStateData: string = data.defaultState;
- let anyStateData = data.anyState;
- let statesData = data.states;
-
- let stateDataMap: Map = new Map();
- statesData.forEach((e: any) => { stateDataMap.set(e.state, e); });
- let stateMap: Map = new Map();
-
- let subMachineDataMap: Map = new Map();
- subStateMachinesData.forEach((e: any) => { subMachineDataMap.set(e.name, e) });
- let subMachineMap: Map = new Map();
-
- let main = this.MachineLayer.mainStateMachine;
- main.setLayerPos(mainStateMachineData.layerPos[0], mainStateMachineData.layerPos[1]);
- main.setLayerScale(mainStateMachineData.layerScale);
- main.setAnyStatePos(mainStateMachineData.anyStatePos[0], mainStateMachineData.anyStatePos[1]);
- this.importSubState(mainStateMachineData, main, stateDataMap, stateMap, paramMap);
- this.importSubMachine(mainStateMachineData, main, subMachineDataMap, subMachineMap, stateDataMap, stateMap, paramMap);
-
- if (stateMap.has(defaultStateData))
- this.MachineLayer.defaultState = stateMap.get(defaultStateData);
-
- this.importTransitions(anyStateData.transitions, this.MachineLayer.anyState.state, stateMap, paramMap);
- statesData.forEach((e: any) => {
- let state: State = stateMap.get(e.state);
- if (!state) {
- cc.error('error');
- }
- this.importTransitions(e.transitions, state, stateMap, paramMap);
- });
-
- this.MachineLayer.setCurStateMachine();
- }
-
- /**
- * 导出工程数据
- */
- public exportProject() {
- let main = this.MachineLayer.mainStateMachine;
- let animator = ANIMATOR_VERSION;
- let mainStateMachine = {
- layerPos: [main.layerPos.x, main.layerPos.y],
- layerScale: main.layerScale,
- anyStatePos: [main.anyStatePos.x, main.anyStatePos.y],
- subStates: [],
- subStateMachines: [],
- };
- main.subStates.forEach((e) => {
- mainStateMachine.subStates.push(e.name);
- });
- main.subStateMachines.forEach((e) => {
- mainStateMachine.subStateMachines.push(e.name);
- });
- let subStateMachines = [];
- this.exportAllSubMachine(subStateMachines, main);
-
- let defaultState: string = this.MachineLayer.defaultState ? this.MachineLayer.defaultState.name : '';
- let anyState = {
- transitions: this.MachineLayer.anyState.state.getAllTransitionData()
- };
- let states = [];
- this.exportAllState(states, main);
- return {
- animator: animator,
- mainStateMachine: mainStateMachine,
- subStateMachines: subStateMachines,
- defaultState: defaultState,
- anyState: anyState,
- states: states
- };
- }
-
- /**
- * 导出runtime数据
- */
- public exportRuntimeData() {
- let main = this.MachineLayer.mainStateMachine;
- let defaultState: string = this.MachineLayer.defaultState ? this.MachineLayer.defaultState.name : '';
- let anyState = {
- transitions: this.MachineLayer.anyState.state.getAllTransitionData()
- };
- let states = [];
- this.exportAllState(states, main, true);
- return {
- defaultState: defaultState,
- anyState: anyState,
- states: states
- };
- }
- //#endregion
-
/**
* 按下鼠标左键的处理
*/
@@ -604,4 +401,253 @@ export default class FsmCtr extends cc.Component {
this.setCurStateMachine(stateMachine);
}
//#endregion
+
+ //#region import and export
+ private importTransitions(transitionsData: any[], state: State, stateMap: Map, paramMap: Map) {
+ transitionsData.forEach((e) => {
+ let toState: State = stateMap.get(e.toState);
+ let transition: Transition = state.addTransition(toState);
+ transition.hasExitTime = e.hasExitTime;
+ e.conditions.forEach((cData) => {
+ let paramItem = paramMap.get(cData.param);
+ let condition: Condition = transition.addCondition(paramItem);
+ condition.value = cData.value;
+ condition.logic = cData.logic;
+ });
+ });
+ }
+
+ private importSubState(upData: any, upMachine: StateMachine, stateDataMap: Map, stateMap: Map, paramMap: Map) {
+ upData.subStates.forEach((name: string) => {
+ let state = new State(upMachine, false);
+ stateMap.set(name, state);
+ let data = stateDataMap.get(name);
+ state.setPosition(data.position[0], data.position[1]);
+ state.name = data.state;
+ state.motion = data.motion;
+ state.speed = data.speed;
+ state.multiplierParam = paramMap.get(data.multiplier) || null;
+ state.loop = data.loop;
+
+ upMachine.add(state);
+ });
+ }
+
+ private importSubMachine(upData: any, upMachine: StateMachine, subMachineDataMap: Map, subMachineMap: Map, stateDataMap: Map, stateMap: Map, paramMap: Map) {
+ upData.subStateMachines.forEach((name: string) => {
+ let stateMachine = new StateMachine(upMachine);
+ subMachineMap.set(name, stateMachine);
+ let data = subMachineDataMap.get(name);
+ stateMachine.setLayerPos(data.layerPos[0], data.layerPos[1]);
+ stateMachine.setLayerScale(data.layerScale);
+ stateMachine.setAnyStatePos(data.anyStatePos[0], data.anyStatePos[1]);
+ stateMachine.name = data.name;
+ stateMachine.setPosition(data.position[0], data.position[1]);
+ stateMachine.setUpStateMachinePos(data.upStateMachinePos[0], data.upStateMachinePos[1]);
+
+ upMachine.add(stateMachine);
+
+ this.importSubState(data, stateMachine, stateDataMap, stateMap, paramMap);
+ this.importSubMachine(data, stateMachine, subMachineDataMap, subMachineMap, stateDataMap, stateMap, paramMap);
+ });
+ }
+
+ private exportAllSubMachine(arr: any[], stateMachine: StateMachine) {
+ stateMachine.subStateMachines.forEach((sub) => {
+ let data = {
+ layerPos: [sub.layerPos.x, sub.layerPos.y],
+ layerScale: sub.layerScale,
+ anyStatePos: [sub.anyStatePos.x, sub.anyStatePos.y],
+ name: sub.name,
+ position: [sub.position.x, sub.position.y],
+ upStateMachine: sub.upStateMachine.name,
+ upStateMachinePos: [sub.upStateMachinePos.x, sub.upStateMachinePos.y],
+ subStates: [],
+ subStateMachines: [],
+ }
+ sub.subStates.forEach((e) => {
+ data.subStates.push(e.name);
+ });
+ sub.subStateMachines.forEach((e) => {
+ data.subStateMachines.push(e.name);
+ });
+ arr.push(data);
+ this.exportAllSubMachine(arr, sub);
+ });
+ }
+
+ private exportAllState(arr: any[], stateMachine: StateMachine, isRuntimeData: boolean = false) {
+ stateMachine.subStates.forEach((e) => {
+ let data = null;
+ if (isRuntimeData) {
+ data = {
+ state: e.name,
+ motion: e.motion,
+ speed: e.speed,
+ multiplier: e.getMultiplierName(),
+ loop: e.loop,
+ transitions: e.getAllTransitionData()
+ }
+ } else {
+ data = {
+ position: [e.position.x, e.position.y],
+ upStateMachine: e.upStateMachine.name,
+ state: e.name,
+ motion: e.motion,
+ speed: e.speed,
+ multiplier: e.getMultiplierName(),
+ loop: e.loop,
+ transitions: e.getAllTransitionData()
+ }
+ }
+ arr.push(data);
+ });
+ stateMachine.subStateMachines.forEach((sub) => {
+ this.exportAllState(arr, sub);
+ });
+ }
+
+ /**
+ * 导入工程数据
+ */
+ public importProject(data: any) {
+ let paramMap: Map = Editor.Inst.Parameters.getParamMap();
+
+ let mainStateMachineData = data.mainStateMachine;
+ let subStateMachinesData = data.subStateMachines;
+ let defaultStateData: string = data.defaultState;
+ let anyStateData = data.anyState;
+ let statesData = data.states;
+
+ let stateDataMap: Map = new Map();
+ statesData.forEach((e: any) => { stateDataMap.set(e.state, e); });
+ let stateMap: Map = new Map();
+
+ let subMachineDataMap: Map = new Map();
+ subStateMachinesData.forEach((e: any) => { subMachineDataMap.set(e.name, e) });
+ let subMachineMap: Map = new Map();
+
+ let main = this.MachineLayer.mainStateMachine;
+ main.setLayerPos(mainStateMachineData.layerPos[0], mainStateMachineData.layerPos[1]);
+ main.setLayerScale(mainStateMachineData.layerScale);
+ main.setAnyStatePos(mainStateMachineData.anyStatePos[0], mainStateMachineData.anyStatePos[1]);
+ this.importSubState(mainStateMachineData, main, stateDataMap, stateMap, paramMap);
+ this.importSubMachine(mainStateMachineData, main, subMachineDataMap, subMachineMap, stateDataMap, stateMap, paramMap);
+
+ if (stateMap.has(defaultStateData))
+ this.MachineLayer.defaultState = stateMap.get(defaultStateData);
+
+ this.importTransitions(anyStateData.transitions, this.MachineLayer.anyState.state, stateMap, paramMap);
+ statesData.forEach((e: any) => {
+ let state: State = stateMap.get(e.state);
+ if (!state) {
+ cc.error('error');
+ }
+ this.importTransitions(e.transitions, state, stateMap, paramMap);
+ });
+
+ this.MachineLayer.setCurStateMachine();
+ }
+
+ /**
+ * 导入cocos animation文件
+ */
+ public importAnim(animData: any) {
+ let x = Tool.randFloat(-this.MachineLayer.node.x - 100, -this.MachineLayer.node.x + 100);
+ let y = Tool.randFloat(-this.MachineLayer.node.y - 100, -this.MachineLayer.node.y + 100);
+ let unitState = this.MachineLayer.createState(cc.v2(x, y));
+ let state: State = unitState.state;
+ state.name = animData._name;
+ state.motion = animData._name;
+ state.speed = animData.speed;
+ state.loop = animData.wrapMode === cc.WrapMode.Loop;
+ }
+
+ /**
+ * 导入spine json文件
+ */
+ public improtSpine(spineData: any) {
+ for (let name in spineData.animations) {
+ let x = Tool.randFloat(-this.MachineLayer.node.x - 100, -this.MachineLayer.node.x + 100);
+ let y = Tool.randFloat(-this.MachineLayer.node.y - 100, -this.MachineLayer.node.y + 100);
+ let unitState = this.MachineLayer.createState(cc.v2(x, y));
+ let state: State = unitState.state;
+ state.name = name;
+ state.motion = name;
+ }
+ }
+
+ /**
+ * 导入dragonbones json文件
+ */
+ public importDragonBones(data: any) {
+ data.armature.forEach((e) => {
+ e.animation.forEach((anim) => {
+ let x = Tool.randFloat(-this.MachineLayer.node.x - 100, -this.MachineLayer.node.x + 100);
+ let y = Tool.randFloat(-this.MachineLayer.node.y - 100, -this.MachineLayer.node.y + 100);
+ let unitState = this.MachineLayer.createState(cc.v2(x, y));
+ let state: State = unitState.state;
+ state.name = anim.name;
+ state.motion = anim.name;
+ state.loop = anim.playTimes === 0;
+ });
+ });
+ }
+
+ /**
+ * 导出工程数据
+ */
+ public exportProject() {
+ let main = this.MachineLayer.mainStateMachine;
+ let animator = ANIMATOR_VERSION;
+ let mainStateMachine = {
+ layerPos: [main.layerPos.x, main.layerPos.y],
+ layerScale: main.layerScale,
+ anyStatePos: [main.anyStatePos.x, main.anyStatePos.y],
+ subStates: [],
+ subStateMachines: [],
+ };
+ main.subStates.forEach((e) => {
+ mainStateMachine.subStates.push(e.name);
+ });
+ main.subStateMachines.forEach((e) => {
+ mainStateMachine.subStateMachines.push(e.name);
+ });
+ let subStateMachines = [];
+ this.exportAllSubMachine(subStateMachines, main);
+
+ let defaultState: string = this.MachineLayer.defaultState ? this.MachineLayer.defaultState.name : '';
+ let anyState = {
+ transitions: this.MachineLayer.anyState.state.getAllTransitionData()
+ };
+ let states = [];
+ this.exportAllState(states, main);
+ return {
+ animator: animator,
+ mainStateMachine: mainStateMachine,
+ subStateMachines: subStateMachines,
+ defaultState: defaultState,
+ anyState: anyState,
+ states: states
+ };
+ }
+
+ /**
+ * 导出runtime数据
+ */
+ public exportRuntimeData() {
+ let main = this.MachineLayer.mainStateMachine;
+ let defaultState: string = this.MachineLayer.defaultState ? this.MachineLayer.defaultState.name : '';
+ let anyState = {
+ transitions: this.MachineLayer.anyState.state.getAllTransitionData()
+ };
+ let states = [];
+ this.exportAllState(states, main, true);
+ return {
+ defaultState: defaultState,
+ anyState: anyState,
+ states: states
+ };
+ }
+ //#endregion
}
diff --git a/animator-editor/assets/script/editor/fsm/MachineLayer.ts b/animator-editor/assets/script/editor/fsm/MachineLayer.ts
index f37d792..bc284c9 100644
--- a/animator-editor/assets/script/editor/fsm/MachineLayer.ts
+++ b/animator-editor/assets/script/editor/fsm/MachineLayer.ts
@@ -12,6 +12,9 @@ import UnitStateMachine from "./UnitStateMachine";
const { ccclass, property } = cc._decorator;
+/** 状态机视图界面边长 */
+const LEN = 9000;
+
@ccclass
export default class MachineLayer extends cc.Component {
@property(cc.Node) Grid: cc.Node = null;
@@ -36,11 +39,11 @@ export default class MachineLayer extends cc.Component {
private _upUnit: UnitStateMachine = null;
protected onLoad() {
- this.node.setContentSize(6750, 6750);
- this.Grid.setContentSize(6750, 6750);
+ this.node.setContentSize(LEN, LEN);
+ this.Grid.setContentSize(LEN, LEN);
this._mainStateMachine = new StateMachine(null);
this._curStateMachine = this._mainStateMachine;
- this._anyState = this.createState(cc.v2(-360, 300), true);
+ this._anyState = this.createState(cc.v2(-300, 300), true);
this._curStateMachine.setAnyStatePos(this._anyState.node.position);
this.NavBar.refreshBar([this._mainStateMachine]);
@@ -121,7 +124,7 @@ export default class MachineLayer extends cc.Component {
node.destroy();
}
- // 生成状态机、状态、连线节点
+ // 生成状态、状态机节点
let stateMap: Map = new Map();
let machineMap: Map = new Map();
this._upUnit && machineMap.set(stateMachine.upStateMachine, this._upUnit);
@@ -154,7 +157,7 @@ export default class MachineLayer extends cc.Component {
}
machineMap.set(e, unitStateMachine);
});
-
+ // 生成连线节点
let stateKeys = stateMap.keys();
for (let i = 0; i < stateMap.size; i++) {
let state: State = stateKeys.next().value;
diff --git a/animator-editor/assets/script/editor/fsm/NavBar.ts b/animator-editor/assets/script/editor/fsm/NavBar.ts
index 5bfd4a9..f63b9d9 100644
--- a/animator-editor/assets/script/editor/fsm/NavBar.ts
+++ b/animator-editor/assets/script/editor/fsm/NavBar.ts
@@ -18,6 +18,7 @@ export default class NavBar extends cc.Component {
protected onLoad() {
this._widget = this.getComponent(cc.Widget);
this._contentWidget = this.Content.getComponent(cc.Widget);
+ this.onEventResize();
Events.targetOn(this);
}
@@ -43,8 +44,8 @@ export default class NavBar extends cc.Component {
}
@preloadEvent(EventName.RESIZE)
- private onEventResize(node: cc.Node) {
- this._widget.left = Editor.Inst.ParamCtr.node.width;
+ private onEventResize(node?: cc.Node) {
+ this._widget.left = Editor.Inst.Parameters.node.width;
this._widget.right = Editor.Inst.Inspector.node.width;
this._widget.updateAlignment();
this._contentWidget.updateAlignment();
diff --git a/animator-editor/assets/script/editor/inspector/ConditionItem.ts b/animator-editor/assets/script/editor/inspector/ConditionItem.ts
index ea73884..712a865 100644
--- a/animator-editor/assets/script/editor/inspector/ConditionItem.ts
+++ b/animator-editor/assets/script/editor/inspector/ConditionItem.ts
@@ -128,15 +128,14 @@ export default class ConditionItem extends cc.Component implements RecycleNode {
private onClickParamSelect(event: cc.Event) {
let target: cc.Node = event.target;
- let worldPos: cc.Vec2 = target.parent.convertToWorldSpaceAR(target.position.sub(cc.v2(0, 0)));
- Events.emit(EventName.SHOW_PARAM_SELECT, worldPos, 30, this);
+ Events.emit(EventName.SHOW_PARAM_SELECT, target, this);
this._hasInit && Events.emit(EventName.CONDITION_SELECT, this);
}
private onClickLogicSelect(event: cc.Event) {
let target: cc.Node = event.target;
let worldPos: cc.Vec2 = target.parent.convertToWorldSpaceAR(target.position.sub(cc.v2(0, 0)));
- Events.emit(EventName.SHOW_LOGIC, worldPos, 30, this);
+ Events.emit(EventName.SHOW_LOGIC, worldPos, target.height, this);
this._hasInit && Events.emit(EventName.CONDITION_SELECT, this);
}
diff --git a/animator-editor/assets/script/editor/inspector/InspectorCtr.ts b/animator-editor/assets/script/editor/inspector/InspectorCtr.ts
index 013b545..2b43814 100644
--- a/animator-editor/assets/script/editor/inspector/InspectorCtr.ts
+++ b/animator-editor/assets/script/editor/inspector/InspectorCtr.ts
@@ -2,6 +2,7 @@ import DragList from "../../common/cmpt/DragList";
import Events, { EventName, preloadEvent } from "../../common/util/Events";
import RecyclePool from "../../common/util/RecyclePool";
import Res from "../../common/util/Res";
+import Tool from "../../common/util/Tool";
import { ResUrl } from "../../constant/ResUrl";
import Transition from "../data/Transition";
import Editor from "../Editor";
@@ -129,6 +130,7 @@ export default class InspectorCtr extends cc.Component {
let prefab = Res.getLoaded(ResUrl.PREFAB.TRANSITION_ITEM);
let node: cc.Node = RecyclePool.get(TransitionItem) || cc.instantiate(prefab);
node.width = this.TransitionList.node.width;
+ Tool.updateWidget(node);
return node;
}
@@ -141,6 +143,7 @@ export default class InspectorCtr extends cc.Component {
let prefab = Res.getLoaded(ResUrl.PREFAB.CONDITION_ITEM);
let node: cc.Node = RecyclePool.get(ConditionItem) || cc.instantiate(prefab);
node.width = this.ConditionList.node.width;
+ Tool.updateWidget(node);
return node;
}
@@ -300,10 +303,7 @@ export default class InspectorCtr extends cc.Component {
if (!(this._unit instanceof UnitState)) {
return;
}
- let target = event.target;
- let worldPos = target.parent.convertToWorldSpaceAR(target.position);
- worldPos.y -= target.height / 2;
- Events.emit(EventName.SHOW_MULTIPLIER, worldPos);
+ Events.emit(EventName.SHOW_MULTIPLIER, event.target);
}
private onClickDeleteTransition() {
@@ -338,11 +338,11 @@ export default class InspectorCtr extends cc.Component {
if (!this._transitionItem) {
return;
}
- if (Editor.Inst.ParamCtr.ParamContent.childrenCount <= 0) {
+ if (Editor.Inst.Parameters.ParamContent.childrenCount <= 0) {
return;
}
- let paramItem: ParamItem = Editor.Inst.ParamCtr.ParamContent.children[0].getComponent(ParamItem);
+ let paramItem: ParamItem = Editor.Inst.Parameters.ParamContent.children[0].getComponent(ParamItem);
let data = this._transitionItem.transition.addCondition(paramItem);
let node = this.getConditionItem();
this.ConditionList.node.addChild(node);
@@ -463,17 +463,21 @@ export default class InspectorCtr extends cc.Component {
if (node !== this.node) {
return;
}
+
+ Tool.updateWidget(this.node, this.TransitionList.node, this.ConditionList.node);
if (!this.TransitionInfo.active) {
return;
}
this.TransitionList.node.children.forEach((e) => {
e.width = this.TransitionList.node.width;
+ Tool.updateWidget(e);
});
if (!this.ConditionInfo.active) {
return;
}
this.ConditionList.node.children.forEach((e) => {
e.width = this.ConditionList.node.width;
+ Tool.updateWidget(e);
});
}
//#endregion
diff --git a/animator-editor/assets/script/editor/menu/Menu.ts b/animator-editor/assets/script/editor/menu/Menu.ts
index 3ae33cc..e9176bd 100644
--- a/animator-editor/assets/script/editor/menu/Menu.ts
+++ b/animator-editor/assets/script/editor/menu/Menu.ts
@@ -1,6 +1,7 @@
import Events, { EventName, preloadEvent } from "../../common/util/Events";
import RecyclePool from "../../common/util/RecyclePool";
import Res from "../../common/util/Res";
+import Tool from "../../common/util/Tool";
import { ParamType } from "../../constant/BaseConst";
import { ResUrl } from "../../constant/ResUrl";
import State from "../data/State";
@@ -134,7 +135,13 @@ export default class Menu extends cc.Component {
let num = cc.misc.clampf(this.LineToSubList.content.childrenCount, 1, 10);
this.LineToSubList.node.height = 40 * num + 20;
this.LineToSubList.content.parent.height = 40 * num + 20;
- this.LineToSubList.node.getChildByName('scrollBar').getComponent(cc.Widget).updateAlignment();
+ if (this.LineToSubList.content.childrenCount > 10) {
+ this.LineToSubList.node.getChildByName('scrollBar').active = true;
+ this.LineToSubList.node.getChildByName('scrollBar').getComponent(cc.Widget).updateAlignment();
+ } else {
+ this.LineToSubList.node.getChildByName('scrollBar').active = false;
+ }
+
// 设置坐标
let pos = this.node.convertToNodeSpaceAR(worldPos);
let x = pos.x;
@@ -143,9 +150,11 @@ export default class Menu extends cc.Component {
}
@preloadEvent(EventName.SHOW_MULTIPLIER)
- private onEventShowMultiplierSelect(worldPos: cc.Vec2) {
+ private onEventShowMultiplierSelect(target: cc.Node) {
this.show(this.MultiplierList.node);
+ let worldPos = target.parent.convertToWorldSpaceAR(target.position);
+ worldPos.y -= target.height / 2;
this.MultiplierList.node.position = this.node.convertToNodeSpaceAR(worldPos);
for (let i = this.MultiplierList.content.childrenCount - 1; i >= 0; i--) {
RecyclePool.put(MultiplierItem, this.MultiplierList.content.children[i]);
@@ -153,19 +162,24 @@ export default class Menu extends cc.Component {
let node: cc.Node = RecyclePool.get(MultiplierItem) || cc.instantiate(Res.getLoaded(ResUrl.PREFAB.MULTIPLIER_ITEM));
this.MultiplierList.content.addChild(node);
node.getComponent(MultiplierItem).onInit();
- Editor.Inst.ParamCtr.ParamContent.children.forEach((e) => {
+ node.width = target.width;
+ Editor.Inst.Parameters.ParamContent.children.forEach((e) => {
let paramItem = e.getComponent(ParamItem);
if (paramItem.type !== ParamType.NUMBER) {
return;
}
- let node: cc.Node = RecyclePool.get(MultiplierItem) || cc.instantiate(Res.getLoaded(ResUrl.PREFAB.MULTIPLIER_ITEM));
+ node = RecyclePool.get(MultiplierItem) || cc.instantiate(Res.getLoaded(ResUrl.PREFAB.MULTIPLIER_ITEM));
this.MultiplierList.content.addChild(node);
node.getComponent(MultiplierItem).onInit(paramItem);
+ node.width = target.width;
});
+
let num = cc.misc.clampf(this.MultiplierList.content.childrenCount, 1, 10);
this.MultiplierList.node.height = 40 * num + 20;
this.MultiplierList.content.parent.height = 40 * num + 20;
- this.MultiplierList.node.getChildByName('scrollBar').getComponent(cc.Widget).updateAlignment();
+ this.MultiplierList.node.width = target.width;
+ Tool.updateWidget(this.MultiplierList.node);
+ this.MultiplierList.node.getChildByName('scrollBar').active = this.MultiplierList.content.childrenCount > 10;
}
@preloadEvent(EventName.SHOW_PARAM_ADD)
@@ -176,27 +190,31 @@ export default class Menu extends cc.Component {
}
@preloadEvent(EventName.SHOW_PARAM_SELECT)
- private onEventShowParamSelect(worldPos: cc.Vec2, targetHeight: number, conditionItem: ConditionItem) {
+ private onEventShowParamSelect(target: cc.Node, conditionItem: ConditionItem) {
this.show(this.ParamSelect.node);
+ let worldPos: cc.Vec2 = target.parent.convertToWorldSpaceAR(target.position.sub(cc.v2(0, 0)));
for (let i = this.ParamSelect.content.childrenCount - 1; i >= 0; i--) {
RecyclePool.put(ParamSelectItem, this.ParamSelect.content.children[i]);
}
// 生成item
- Editor.Inst.ParamCtr.ParamContent.children.forEach((e) => {
+ Editor.Inst.Parameters.ParamContent.children.forEach((e) => {
let node: cc.Node = RecyclePool.get(ParamSelectItem) || cc.instantiate(Res.getLoaded(ResUrl.PREFAB.PARAM_SELECT_ITEM));
this.ParamSelect.content.addChild(node);
node.getComponent(ParamSelectItem).onInit(e.getComponent(ParamItem), conditionItem);
+ node.width = target.width;
});
let num = cc.misc.clampf(this.ParamSelect.content.childrenCount, 1, 10);
this.ParamSelect.node.height = 40 * num + 10;
this.ParamSelect.content.parent.height = 40 * num + 10;
- this.ParamSelect.node.getChildByName('scrollBar').getComponent(cc.Widget).updateAlignment();
- if (worldPos.y - targetHeight / 2 - this.ParamSelect.node.height > 0) {
- this.ParamSelect.node.position = this.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y - targetHeight / 2));
+ this.ParamSelect.node.width = target.width;
+ Tool.updateWidget(this.ParamSelect.node);
+ this.ParamSelect.node.getChildByName('scrollBar').active = this.ParamSelect.content.childrenCount > 10;
+ if (worldPos.y - target.height / 2 - this.ParamSelect.node.height > 0) {
+ this.ParamSelect.node.position = this.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y - target.height / 2));
} else {
- this.ParamSelect.node.position = this.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y + targetHeight / 2 + this.ParamSelect.node.height));
+ this.ParamSelect.node.position = this.node.convertToNodeSpaceAR(cc.v2(worldPos.x, worldPos.y + target.height / 2 + this.ParamSelect.node.height));
}
}
diff --git a/animator-editor/assets/script/editor/parameters/ParamCtr.ts b/animator-editor/assets/script/editor/parameters/ParamCtr.ts
index 5449f8b..e19ff6b 100644
--- a/animator-editor/assets/script/editor/parameters/ParamCtr.ts
+++ b/animator-editor/assets/script/editor/parameters/ParamCtr.ts
@@ -1,6 +1,7 @@
import Events, { EventName, preloadEvent } from "../../common/util/Events";
import RecyclePool from "../../common/util/RecyclePool";
import Res from "../../common/util/Res";
+import Tool from "../../common/util/Tool";
import { ParameterData } from "../../constant/BaseConst";
import { ResUrl } from "../../constant/ResUrl";
import ParamItem from "./ParamItem";
@@ -73,6 +74,7 @@ export default class ParamCtr extends cc.Component {
let prefab = Res.getLoaded(ResUrl.PREFAB.PARAM_ITEM);
let node: cc.Node = RecyclePool.get(ParamItem) || cc.instantiate(prefab);
node.width = this.ParamContent.width;
+ Tool.updateWidget(node);
return node;
}
@@ -146,8 +148,11 @@ export default class ParamCtr extends cc.Component {
if (node !== this.node) {
return;
}
+
+ Tool.updateWidget(this.node, this.ParamContent);
this.ParamContent.children.forEach((e) => {
e.width = this.ParamContent.width;
+ Tool.updateWidget(e);
});
}
}
diff --git a/animator-editor/assets/script/editor/parameters/ParamItem.ts b/animator-editor/assets/script/editor/parameters/ParamItem.ts
index b4d23de..13439c3 100644
--- a/animator-editor/assets/script/editor/parameters/ParamItem.ts
+++ b/animator-editor/assets/script/editor/parameters/ParamItem.ts
@@ -89,7 +89,7 @@ export default class ParamItem extends cc.Component implements RecycleNode {
return;
}
- this.NameEdit.string = Editor.Inst.ParamCtr.getParamName(this, this.NameEdit.string);
+ this.NameEdit.string = Editor.Inst.Parameters.getParamName(this, this.NameEdit.string);
this.paramName = this.NameEdit.string;
}
diff --git a/animator-editor/assets/script/scene/Main.ts b/animator-editor/assets/script/scene/Main.ts
index eb49e1f..d2d6317 100644
--- a/animator-editor/assets/script/scene/Main.ts
+++ b/animator-editor/assets/script/scene/Main.ts
@@ -6,7 +6,7 @@ const { ccclass, property } = cc._decorator;
@ccclass
export default class Main extends cc.Component {
- private _editorNode: cc.Node = null;
+ private _editor: Editor = null;
protected onLoad() {
cc.debug.setDisplayStats(false);
@@ -22,17 +22,16 @@ export default class Main extends cc.Component {
this.dragOn();
}
- private resetEditor(): Editor {
- if (this._editorNode) {
- this._editorNode.getComponent(Editor).Fsm.MachineLayer.clear();
- this._editorNode.removeFromParent();
- this._editorNode.destroy();
+ private resetEditor() {
+ if (this._editor) {
+ this._editor.Fsm.MachineLayer.clear();
+ this._editor.node.removeFromParent();
+ this._editor.node.destroy();
}
- this._editorNode = cc.instantiate(Res.getLoaded(ResUrl.PREFAB.EDITOR));
- this.node.addChild(this._editorNode);
- let editor = this._editorNode.getComponent(Editor);
- Editor.Inst = editor;
- return editor;
+ let node = cc.instantiate(Res.getLoaded(ResUrl.PREFAB.EDITOR));
+ this._editor = node.getComponent(Editor);
+ Editor.Inst = this._editor;
+ this.node.addChild(node);
}
/**
@@ -63,25 +62,58 @@ export default class Main extends cc.Component {
e.stopPropagation();
// 处理拖拽文件的逻辑
let files = e.dataTransfer.files;
- let reg = /\.json$/;
- if (!reg.test(files[0].name)) {
- return;
- }
- this.readProject(files[0]);
+ this.readFiles(files);
}, false);
}
/**
- * 读取工程文件
+ * 文件读取
*/
- private readProject(file: File) {
+ private readFiles(files: FileList) {
+ for (let i = 0; i < files.length; i++) {
+ let file: File = files[i];
+ if (/\.json$/.test(file.name)) {
+ this.readJson(file);
+ } else if (/\.anim$/.test(file.name)) {
+ this.readAnim(file);
+ }
+ }
+ }
+
+ /**
+ * 读取.json文件
+ */
+ private readJson(file: File) {
let fileReader = new FileReader();
fileReader.readAsText(file);
fileReader.onload = () => {
cc.log(fileReader.result);
+ let data: any = JSON.parse(fileReader.result as string);
+ if (data.animator) {
+ // 读取状态机工程文件
+ this.resetEditor();
+ this._editor.Parameters.import(data.parameters);
+ this._editor.Fsm.importProject(data);
+ } else if (data.skeleton && data.animations) {
+ // 读取spine文件
+ this._editor.Fsm.improtSpine(data);
+ } else if (data.armature) {
+ // 读取龙骨文件
+ this._editor.Fsm.importDragonBones(data);
+ }
+ };
+ }
- let editor = this.resetEditor();
- editor.importProject(JSON.parse(fileReader.result as string));
+ /**
+ * 读取cocos .anim文件
+ */
+ private readAnim(file: File) {
+ let fileReader = new FileReader();
+ fileReader.readAsText(file);
+ fileReader.onload = () => {
+ cc.log(fileReader.result);
+ let data: any = JSON.parse(fileReader.result as string);
+ this._editor.Fsm.importAnim(data);
};
}
}