diff --git a/assets/resources/gui/element/barbtn.prefab b/assets/resources/gui/element/barbtn.prefab
index 7b0c4172..1bcc092f 100644
--- a/assets/resources/gui/element/barbtn.prefab
+++ b/assets/resources/gui/element/barbtn.prefab
@@ -28,14 +28,14 @@
"_active": true,
"_components": [
{
- "__id__": 42
+ "__id__": 30
},
{
- "__id__": 44
+ "__id__": 32
}
],
"_prefab": {
- "__id__": 47
+ "__id__": 35
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -436,8 +436,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 240,
- "height": 110
+ "width": 100,
+ "height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -473,7 +473,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -488,7 +488,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -509,10 +512,10 @@
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 70,
+ "_right": 70,
+ "_top": 5,
+ "_bottom": 5,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -552,219 +555,26 @@
"_parent": {
"__id__": 1
},
- "_children": [
+ "_children": [],
+ "_active": true,
+ "_components": [
{
"__id__": 23
},
{
- "__id__": 29
- }
- ],
- "_active": false,
- "_components": [
- {
- "__id__": 35
+ "__id__": 25
},
{
- "__id__": 37
- },
- {
- "__id__": 39
+ "__id__": 27
}
],
"_prefab": {
- "__id__": 41
+ "__id__": 29
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1073741824,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.Node",
- "_name": "icon",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 22
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 24
- },
- {
- "__id__": 26
- }
- ],
- "_prefab": {
- "__id__": 28
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 15,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 0.6,
- "y": 0.6,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1073741824,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 23
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 25
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 106,
- "height": 96
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "6eBP1g6s5Goai//DXwnDla"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 23
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 27
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 1,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "caZzAfi9ZLqZS4Wd5Rqm3r"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "ce9MKPS+FJx4Y+XyFAZSyN",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "Label",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 22
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 30
- },
- {
- "__id__": 32
- }
- ],
- "_prefab": {
- "__id__": 34
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -30,
+ "y": 55,
"z": 0
},
"_lrot": {
@@ -790,115 +600,6 @@
},
"_id": ""
},
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 31
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 64,
- "height": 54.4
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "fb/sGndAVJK7moJI1+G/0t"
- },
- {
- "__type__": "cc.Label",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 29
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 33
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_string": "挑战",
- "_horizontalAlign": 1,
- "_verticalAlign": 1,
- "_actualFontSize": 30,
- "_fontSize": 30,
- "_fontFamily": "Arial",
- "_lineHeight": 40,
- "_overflow": 0,
- "_enableWrapText": true,
- "_font": null,
- "_isSystemFontUsed": true,
- "_spacingX": 0,
- "_isItalic": false,
- "_isBold": true,
- "_isUnderline": false,
- "_underlineHeight": 2,
- "_cacheMode": 0,
- "_enableOutline": true,
- "_outlineColor": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_outlineWidth": 2,
- "_enableShadow": false,
- "_shadowColor": {
- "__type__": "cc.Color",
- "r": 0,
- "g": 0,
- "b": 0,
- "a": 255
- },
- "_shadowOffset": {
- "__type__": "cc.Vec2",
- "x": 2,
- "y": 2
- },
- "_shadowBlur": 2,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "a9bThvxy9LiriOUrI/zZUU"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "b8MZ0xfLVCQ7mTzo5vkCgp",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -909,12 +610,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 24
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 180,
- "height": 110
+ "width": 100,
+ "height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -937,7 +638,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 26
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -949,10 +650,7 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@7eac7",
- "__expectedType__": "cc.SpriteFrame"
- },
+ "_spriteFrame": null,
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
@@ -982,14 +680,14 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 40
+ "__id__": 28
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 70,
+ "_right": 70,
+ "_top": 5,
+ "_bottom": 5,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -1031,7 +729,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 43
+ "__id__": 31
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1059,11 +757,11 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 45
+ "__id__": 33
},
"clickEvents": [
{
- "__id__": 46
+ "__id__": 34
}
],
"_interactable": true,
diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab
index 3708288a..e3a41895 100644
--- a/assets/resources/gui/element/mission.prefab
+++ b/assets/resources/gui/element/mission.prefab
@@ -37,56 +37,56 @@
"__id__": 506
},
{
- "__id__": 873
+ "__id__": 906
},
{
- "__id__": 913
+ "__id__": 946
},
{
- "__id__": 1000
+ "__id__": 1033
},
{
- "__id__": 1119
+ "__id__": 1152
},
{
- "__id__": 1208
+ "__id__": 1241
},
{
- "__id__": 1295
+ "__id__": 1328
},
{
- "__id__": 1325
+ "__id__": 1358
}
],
"_active": true,
"_components": [
{
- "__id__": 1369
+ "__id__": 1402
},
{
- "__id__": 1371
+ "__id__": 1404
},
{
- "__id__": 1373
+ "__id__": 1406
},
{
- "__id__": 1375
+ "__id__": 1408
},
{
- "__id__": 1377
+ "__id__": 1410
},
{
- "__id__": 1379
+ "__id__": 1412
},
{
- "__id__": 1381
+ "__id__": 1414
},
{
- "__id__": 1383
+ "__id__": 1416
}
],
"_prefab": {
- "__id__": 1385
+ "__id__": 1418
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -8865,29 +8865,29 @@
"__id__": 507
},
{
- "__id__": 595
+ "__id__": 607
},
{
- "__id__": 687
+ "__id__": 706
},
{
- "__id__": 775
+ "__id__": 801
}
],
"_active": true,
"_components": [
{
- "__id__": 866
+ "__id__": 899
},
{
- "__id__": 868
+ "__id__": 901
},
{
- "__id__": 870
+ "__id__": 903
}
],
"_prefab": {
- "__id__": 872
+ "__id__": 905
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -9017,6 +9017,30 @@
},
{
"__id__": 593
+ },
+ {
+ "__id__": 595
+ },
+ {
+ "__id__": 597
+ },
+ {
+ "__id__": 598
+ },
+ {
+ "__id__": 599
+ },
+ {
+ "__id__": 600
+ },
+ {
+ "__id__": 602
+ },
+ {
+ "__id__": 603
+ },
+ {
+ "__id__": 605
}
],
"removedComponents": []
@@ -9073,7 +9097,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -43.672,
+ "y": -31.281,
"z": 0
},
"_lrot": {
@@ -9187,7 +9211,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
},
"_lrot": {
@@ -9199,8 +9223,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.6,
- "y": 0.6,
+ "x": 0.8,
+ "y": 0.8,
"z": 1
},
"_mobility": 0,
@@ -9475,8 +9499,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -9512,7 +9536,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bff3",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -9527,7 +9551,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -9548,10 +9575,10 @@
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 20,
+ "_right": 20,
+ "_top": 10,
+ "_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -9606,7 +9633,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -7.5615234375,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -9647,8 +9674,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 27,
- "height": 27
+ "width": 50,
+ "height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -9742,7 +9769,7 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 13.5,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -9783,7 +9810,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 15.123046875,
+ "width": 23.46533203125,
"height": 54.4
},
"_anchorPoint": {
@@ -9822,8 +9849,8 @@
"_string": "2",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 20,
- "_fontSize": 20,
+ "_actualFontSize": 35,
+ "_fontSize": 35,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -9892,7 +9919,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 42.123046875,
+ "width": 50.123046875,
"height": 30
},
"_anchorPoint": {
@@ -9914,7 +9941,7 @@
"node": {
"__id__": 512
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
"__id__": 548
},
@@ -10186,7 +10213,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -270,
+ "x": -90,
"y": 0,
"z": 0
}
@@ -10252,8 +10279,8 @@
],
"value": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
}
},
{
@@ -10465,7 +10492,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
}
},
@@ -10475,6 +10502,122 @@
"86S3E4+VBNF5Q4sYq5WENB"
]
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 596
+ },
+ "propertyPath": [
+ "_left"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "98LAY3MlpCIqtnpozcBZ6V"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 596
+ },
+ "propertyPath": [
+ "_right"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 596
+ },
+ "propertyPath": [
+ "_top"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 596
+ },
+ "propertyPath": [
+ "_bottom"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 601
+ },
+ "propertyPath": [
+ "_spriteFrame"
+ ],
+ "value": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bff3",
+ "__expectedType__": "cc.SpriteFrame"
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "58xYEIMtdG64TYb0cR8Dqn"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 594
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0.8,
+ "y": 0.8,
+ "z": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 604
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "11wAdqQr5OsKSgZTMJP6zQ"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 606
+ },
+ "propertyPath": [
+ "_contentSize"
+ ],
+ "value": {
+ "__type__": "cc.Size",
+ "width": 180,
+ "height": 160
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "80XSL57n5AcZmN7NmTG9+w"
+ ]
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -10482,14 +10625,14 @@
"__id__": 506
},
"_prefab": {
- "__id__": 596
+ "__id__": 608
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 595
+ "__id__": 607
},
"asset": {
"__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510",
@@ -10497,7 +10640,7 @@
},
"fileId": "cfWG6+EKVJ3IlHCuz5Pa35",
"instance": {
- "__id__": 597
+ "__id__": 609
},
"targetOverrides": null
},
@@ -10509,48 +10652,27 @@
},
"mountedChildren": [
{
- "__id__": 598
+ "__id__": 610
},
{
- "__id__": 638
+ "__id__": 650
}
],
"mountedComponents": [
{
- "__id__": 649
+ "__id__": 661
}
],
"propertyOverrides": [
- {
- "__id__": 653
- },
- {
- "__id__": 655
- },
- {
- "__id__": 656
- },
- {
- "__id__": 657
- },
- {
- "__id__": 658
- },
- {
- "__id__": 660
- },
- {
- "__id__": 662
- },
- {
- "__id__": 664
- },
{
"__id__": 665
},
{
"__id__": 667
},
+ {
+ "__id__": 668
+ },
{
"__id__": 669
},
@@ -10564,7 +10686,7 @@
"__id__": 674
},
{
- "__id__": 675
+ "__id__": 676
},
{
"__id__": 677
@@ -10573,7 +10695,7 @@
"__id__": 679
},
{
- "__id__": 680
+ "__id__": 681
},
{
"__id__": 682
@@ -10583,6 +10705,42 @@
},
{
"__id__": 686
+ },
+ {
+ "__id__": 687
+ },
+ {
+ "__id__": 689
+ },
+ {
+ "__id__": 691
+ },
+ {
+ "__id__": 692
+ },
+ {
+ "__id__": 694
+ },
+ {
+ "__id__": 696
+ },
+ {
+ "__id__": 698
+ },
+ {
+ "__id__": 699
+ },
+ {
+ "__id__": 701
+ },
+ {
+ "__id__": 702
+ },
+ {
+ "__id__": 703
+ },
+ {
+ "__id__": 704
}
],
"removedComponents": []
@@ -10590,11 +10748,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 599
+ "__id__": 611
},
"nodes": [
{
- "__id__": 600
+ "__id__": 612
}
]
},
@@ -10610,36 +10768,36 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 595
+ "__id__": 607
}
},
"_parent": {
- "__id__": 601
+ "__id__": 613
},
"_children": [
{
- "__id__": 621
+ "__id__": 633
},
{
- "__id__": 627
+ "__id__": 639
}
],
"_active": true,
"_components": [
{
- "__id__": 633
+ "__id__": 645
},
{
- "__id__": 635
+ "__id__": 647
}
],
"_prefab": {
- "__id__": 637
+ "__id__": 649
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -43.672,
+ "y": -31.281,
"z": 0
},
"_lrot": {
@@ -10671,30 +10829,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 595
+ "__id__": 607
},
"_children": [
{
- "__id__": 602
+ "__id__": 614
},
{
- "__id__": 600
+ "__id__": 612
}
],
"_active": true,
"_components": [
{
- "__id__": 614
+ "__id__": 626
},
{
- "__id__": 616
+ "__id__": 628
},
{
- "__id__": 618
+ "__id__": 630
}
],
"_prefab": {
- "__id__": 620
+ "__id__": 632
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -10731,29 +10889,29 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 601
+ "__id__": 613
},
"_children": [
{
- "__id__": 603
+ "__id__": 615
}
],
"_active": true,
"_components": [
{
- "__id__": 609
+ "__id__": 621
},
{
- "__id__": 611
+ "__id__": 623
}
],
"_prefab": {
- "__id__": 613
+ "__id__": 625
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
},
"_lrot": {
@@ -10765,8 +10923,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.7,
- "y": 0.7,
+ "x": 0.8,
+ "y": 0.8,
"z": 1
},
"_mobility": 0,
@@ -10785,20 +10943,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 602
+ "__id__": 614
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 604
+ "__id__": 616
},
{
- "__id__": 606
+ "__id__": 618
}
],
"_prefab": {
- "__id__": 608
+ "__id__": 620
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -10835,11 +10993,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 603
+ "__id__": 615
},
"_enabled": true,
"__prefab": {
- "__id__": 605
+ "__id__": 617
},
"_contentSize": {
"__type__": "cc.Size",
@@ -10863,11 +11021,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 603
+ "__id__": 615
},
"_enabled": true,
"__prefab": {
- "__id__": 607
+ "__id__": 619
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -10944,16 +11102,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 602
+ "__id__": 614
},
"_enabled": true,
"__prefab": {
- "__id__": 610
+ "__id__": 622
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 106,
- "height": 96
+ "width": 128,
+ "height": 112
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -10972,11 +11130,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 602
+ "__id__": 614
},
"_enabled": true,
"__prefab": {
- "__id__": 612
+ "__id__": 624
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -10989,7 +11147,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@232ec",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -11005,7 +11163,7 @@
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
"__expectedType__": "cc.SpriteAtlas"
},
"_id": ""
@@ -11033,16 +11191,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 601
+ "__id__": 613
},
"_enabled": true,
"__prefab": {
- "__id__": 615
+ "__id__": 627
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -11061,11 +11219,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 601
+ "__id__": 613
},
"_enabled": true,
"__prefab": {
- "__id__": 617
+ "__id__": 629
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -11078,7 +11236,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -11093,7 +11251,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -11106,18 +11267,18 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 601
+ "__id__": 613
},
"_enabled": true,
"__prefab": {
- "__id__": 619
+ "__id__": 631
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 20,
+ "_right": 20,
+ "_top": 10,
+ "_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -11155,24 +11316,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 600
+ "__id__": 612
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 622
+ "__id__": 634
},
{
- "__id__": 624
+ "__id__": 636
}
],
"_prefab": {
- "__id__": 626
+ "__id__": 638
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -7.5615234375,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -11205,16 +11366,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 621
+ "__id__": 633
},
"_enabled": true,
"__prefab": {
- "__id__": 623
+ "__id__": 635
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 27,
- "height": 27
+ "width": 50,
+ "height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -11233,11 +11394,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 621
+ "__id__": 633
},
"_enabled": true,
"__prefab": {
- "__id__": 625
+ "__id__": 637
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -11291,24 +11452,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 600
+ "__id__": 612
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 628
+ "__id__": 640
},
{
- "__id__": 630
+ "__id__": 642
}
],
"_prefab": {
- "__id__": 632
+ "__id__": 644
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 13.5,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -11341,15 +11502,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 627
+ "__id__": 639
},
"_enabled": true,
"__prefab": {
- "__id__": 629
+ "__id__": 641
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 15.123046875,
+ "width": 23.46533203125,
"height": 54.4
},
"_anchorPoint": {
@@ -11369,11 +11530,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 627
+ "__id__": 639
},
"_enabled": true,
"__prefab": {
- "__id__": 631
+ "__id__": 643
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -11388,8 +11549,8 @@
"_string": "2",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 20,
- "_fontSize": 20,
+ "_actualFontSize": 35,
+ "_fontSize": 35,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -11450,15 +11611,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 600
+ "__id__": 612
},
"_enabled": true,
"__prefab": {
- "__id__": 634
+ "__id__": 646
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 42.123046875,
+ "width": 50.123046875,
"height": 30
},
"_anchorPoint": {
@@ -11478,11 +11639,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 600
+ "__id__": 612
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
- "__id__": 636
+ "__id__": 648
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -11526,11 +11687,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 639
+ "__id__": 651
},
"nodes": [
{
- "__id__": 640
+ "__id__": 652
}
]
},
@@ -11544,21 +11705,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 595
+ "__id__": 607
},
"_prefab": {
- "__id__": 641
+ "__id__": 653
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 595
+ "__id__": 607
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 640
+ "__id__": 652
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
@@ -11566,7 +11727,7 @@
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
- "__id__": 642
+ "__id__": 654
},
"targetOverrides": null
},
@@ -11580,19 +11741,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 643
+ "__id__": 655
},
{
- "__id__": 645
+ "__id__": 657
},
{
- "__id__": 646
+ "__id__": 658
},
{
- "__id__": 647
+ "__id__": 659
},
{
- "__id__": 648
+ "__id__": 660
}
],
"removedComponents": []
@@ -11600,7 +11761,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 644
+ "__id__": 656
},
"propertyPath": [
"_name"
@@ -11616,7 +11777,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 644
+ "__id__": 656
},
"propertyPath": [
"_lpos"
@@ -11631,7 +11792,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 644
+ "__id__": 656
},
"propertyPath": [
"_lrot"
@@ -11647,7 +11808,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 644
+ "__id__": 656
},
"propertyPath": [
"_euler"
@@ -11662,7 +11823,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 644
+ "__id__": 656
},
"propertyPath": [
"_active"
@@ -11672,11 +11833,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 650
+ "__id__": 662
},
"components": [
{
- "__id__": 651
+ "__id__": 663
}
]
},
@@ -11692,15 +11853,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 595
+ "__id__": 607
}
},
"node": {
- "__id__": 595
+ "__id__": 607
},
"_enabled": true,
"__prefab": {
- "__id__": 652
+ "__id__": 664
},
"_alignFlags": 4,
"_target": null,
@@ -11729,7 +11890,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 654
+ "__id__": 666
},
"propertyPath": [
"_name"
@@ -11745,14 +11906,14 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 654
+ "__id__": 666
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
- "x": -90,
+ "x": 90,
"y": 0,
"z": 0
}
@@ -11760,7 +11921,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 654
+ "__id__": 666
},
"propertyPath": [
"_lrot"
@@ -11776,7 +11937,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 654
+ "__id__": 666
},
"propertyPath": [
"_euler"
@@ -11791,7 +11952,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 659
+ "__id__": 671
},
"propertyPath": [
"_contentSize"
@@ -11811,15 +11972,15 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 661
+ "__id__": 673
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
}
},
{
@@ -11831,7 +11992,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 663
+ "__id__": 675
},
"propertyPath": [
"_active"
@@ -11847,7 +12008,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 663
+ "__id__": 675
},
"propertyPath": [
"_lpos"
@@ -11862,7 +12023,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 666
+ "__id__": 678
},
"propertyPath": [
"_contentSize"
@@ -11882,7 +12043,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 668
+ "__id__": 680
},
"propertyPath": [
"_spriteFrame"
@@ -11901,7 +12062,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 668
+ "__id__": 680
},
"propertyPath": [
"_atlas"
@@ -11914,15 +12075,15 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 671
+ "__id__": 683
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
- "width": 106,
- "height": 96
+ "width": 128,
+ "height": 112
}
},
{
@@ -11934,13 +12095,13 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 673
+ "__id__": 685
},
"propertyPath": [
"_spriteFrame"
],
"value": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@24ff5",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@232ec",
"__expectedType__": "cc.SpriteFrame"
}
},
@@ -11953,20 +12114,20 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 673
+ "__id__": 685
},
"propertyPath": [
"_atlas"
],
"value": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
"__expectedType__": "cc.SpriteAtlas"
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 676
+ "__id__": 688
},
"propertyPath": [
"_string"
@@ -11982,7 +12143,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 678
+ "__id__": 690
},
"propertyPath": [
"_string"
@@ -11998,7 +12159,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 659
+ "__id__": 671
},
"propertyPath": [
"_anchorPoint"
@@ -12012,7 +12173,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 681
+ "__id__": 693
},
"propertyPath": [
"_lpos"
@@ -12033,7 +12194,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 683
+ "__id__": 695
},
"propertyPath": [
"_lpos"
@@ -12054,7 +12215,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 685
+ "__id__": 697
},
"propertyPath": [
"_lpos"
@@ -12062,7 +12223,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
}
},
@@ -12075,18 +12236,83 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 685
+ "__id__": 697
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
- "x": 0.7,
- "y": 0.7,
+ "x": 0.8,
+ "y": 0.8,
"z": 1
}
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 700
+ },
+ "propertyPath": [
+ "_left"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "98LAY3MlpCIqtnpozcBZ6V"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 700
+ },
+ "propertyPath": [
+ "_right"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 700
+ },
+ "propertyPath": [
+ "_top"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 700
+ },
+ "propertyPath": [
+ "_bottom"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 705
+ },
+ "propertyPath": [
+ "_spriteFrame"
+ ],
+ "value": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
+ "__expectedType__": "cc.SpriteFrame"
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "58xYEIMtdG64TYb0cR8Dqn"
+ ]
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -12094,14 +12320,14 @@
"__id__": 506
},
"_prefab": {
- "__id__": 688
+ "__id__": 707
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 687
+ "__id__": 706
},
"asset": {
"__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510",
@@ -12109,7 +12335,7 @@
},
"fileId": "cfWG6+EKVJ3IlHCuz5Pa35",
"instance": {
- "__id__": 689
+ "__id__": 708
},
"targetOverrides": null
},
@@ -12121,60 +12347,27 @@
},
"mountedChildren": [
{
- "__id__": 690
+ "__id__": 709
},
{
- "__id__": 730
+ "__id__": 749
}
],
"mountedComponents": [
{
- "__id__": 741
+ "__id__": 760
}
],
"propertyOverrides": [
- {
- "__id__": 745
- },
- {
- "__id__": 747
- },
- {
- "__id__": 748
- },
- {
- "__id__": 749
- },
- {
- "__id__": 750
- },
- {
- "__id__": 752
- },
- {
- "__id__": 754
- },
- {
- "__id__": 756
- },
- {
- "__id__": 758
- },
- {
- "__id__": 759
- },
- {
- "__id__": 761
- },
- {
- "__id__": 763
- },
{
"__id__": 764
},
{
"__id__": 766
},
+ {
+ "__id__": 767
+ },
{
"__id__": 768
},
@@ -12186,6 +12379,57 @@
},
{
"__id__": 773
+ },
+ {
+ "__id__": 775
+ },
+ {
+ "__id__": 777
+ },
+ {
+ "__id__": 778
+ },
+ {
+ "__id__": 780
+ },
+ {
+ "__id__": 782
+ },
+ {
+ "__id__": 783
+ },
+ {
+ "__id__": 785
+ },
+ {
+ "__id__": 787
+ },
+ {
+ "__id__": 788
+ },
+ {
+ "__id__": 790
+ },
+ {
+ "__id__": 792
+ },
+ {
+ "__id__": 794
+ },
+ {
+ "__id__": 796
+ },
+ {
+ "__id__": 797
+ },
+ {
+ "__id__": 798
+ },
+ {
+ "__id__": 799
+ },
+ {
+ "__id__": 800
}
],
"removedComponents": []
@@ -12193,11 +12437,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 691
+ "__id__": 710
},
"nodes": [
{
- "__id__": 692
+ "__id__": 711
}
]
},
@@ -12213,36 +12457,36 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 687
+ "__id__": 706
}
},
"_parent": {
- "__id__": 693
+ "__id__": 712
},
"_children": [
{
- "__id__": 713
+ "__id__": 732
},
{
- "__id__": 719
+ "__id__": 738
}
],
"_active": true,
"_components": [
{
- "__id__": 725
+ "__id__": 744
},
{
- "__id__": 727
+ "__id__": 746
}
],
"_prefab": {
- "__id__": 729
+ "__id__": 748
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -43.672,
+ "y": -31.281,
"z": 0
},
"_lrot": {
@@ -12274,30 +12518,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 687
+ "__id__": 706
},
"_children": [
{
- "__id__": 694
+ "__id__": 713
},
{
- "__id__": 692
+ "__id__": 711
}
],
"_active": true,
"_components": [
{
- "__id__": 706
+ "__id__": 725
},
{
- "__id__": 708
+ "__id__": 727
},
{
- "__id__": 710
+ "__id__": 729
}
],
"_prefab": {
- "__id__": 712
+ "__id__": 731
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -12334,29 +12578,29 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 693
+ "__id__": 712
},
"_children": [
{
- "__id__": 695
+ "__id__": 714
}
],
"_active": true,
"_components": [
{
- "__id__": 701
+ "__id__": 720
},
{
- "__id__": 703
+ "__id__": 722
}
],
"_prefab": {
- "__id__": 705
+ "__id__": 724
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
},
"_lrot": {
@@ -12368,8 +12612,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.6,
- "y": 0.6,
+ "x": 0.8,
+ "y": 0.8,
"z": 1
},
"_mobility": 0,
@@ -12388,20 +12632,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 694
+ "__id__": 713
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 696
+ "__id__": 715
},
{
- "__id__": 698
+ "__id__": 717
}
],
"_prefab": {
- "__id__": 700
+ "__id__": 719
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -12438,11 +12682,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 695
+ "__id__": 714
},
"_enabled": true,
"__prefab": {
- "__id__": 697
+ "__id__": 716
},
"_contentSize": {
"__type__": "cc.Size",
@@ -12466,11 +12710,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 695
+ "__id__": 714
},
"_enabled": true,
"__prefab": {
- "__id__": 699
+ "__id__": 718
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -12547,11 +12791,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 694
+ "__id__": 713
},
"_enabled": true,
"__prefab": {
- "__id__": 702
+ "__id__": 721
},
"_contentSize": {
"__type__": "cc.Size",
@@ -12575,11 +12819,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 694
+ "__id__": 713
},
"_enabled": true,
"__prefab": {
- "__id__": 704
+ "__id__": 723
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -12636,16 +12880,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 693
+ "__id__": 712
},
"_enabled": true,
"__prefab": {
- "__id__": 707
+ "__id__": 726
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -12664,11 +12908,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 693
+ "__id__": 712
},
"_enabled": true,
"__prefab": {
- "__id__": 709
+ "__id__": 728
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -12681,7 +12925,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -12696,7 +12940,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -12709,18 +12956,18 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 693
+ "__id__": 712
},
"_enabled": true,
"__prefab": {
- "__id__": 711
+ "__id__": 730
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 20,
+ "_right": 20,
+ "_top": 10,
+ "_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -12758,24 +13005,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 692
+ "__id__": 711
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 714
+ "__id__": 733
},
{
- "__id__": 716
+ "__id__": 735
}
],
"_prefab": {
- "__id__": 718
+ "__id__": 737
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -7.5615234375,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -12808,16 +13055,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 713
+ "__id__": 732
},
"_enabled": true,
"__prefab": {
- "__id__": 715
+ "__id__": 734
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 27,
- "height": 27
+ "width": 50,
+ "height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -12836,11 +13083,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 713
+ "__id__": 732
},
"_enabled": true,
"__prefab": {
- "__id__": 717
+ "__id__": 736
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -12894,24 +13141,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 692
+ "__id__": 711
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 720
+ "__id__": 739
},
{
- "__id__": 722
+ "__id__": 741
}
],
"_prefab": {
- "__id__": 724
+ "__id__": 743
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 13.5,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -12944,15 +13191,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 719
+ "__id__": 738
},
"_enabled": true,
"__prefab": {
- "__id__": 721
+ "__id__": 740
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 15.123046875,
+ "width": 23.46533203125,
"height": 54.4
},
"_anchorPoint": {
@@ -12972,11 +13219,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 719
+ "__id__": 738
},
"_enabled": true,
"__prefab": {
- "__id__": 723
+ "__id__": 742
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -12991,8 +13238,8 @@
"_string": "2",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 20,
- "_fontSize": 20,
+ "_actualFontSize": 35,
+ "_fontSize": 35,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -13053,15 +13300,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 692
+ "__id__": 711
},
"_enabled": true,
"__prefab": {
- "__id__": 726
+ "__id__": 745
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 42.123046875,
+ "width": 50.123046875,
"height": 30
},
"_anchorPoint": {
@@ -13081,11 +13328,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 692
+ "__id__": 711
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
- "__id__": 728
+ "__id__": 747
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -13129,11 +13376,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 731
+ "__id__": 750
},
"nodes": [
{
- "__id__": 732
+ "__id__": 751
}
]
},
@@ -13147,21 +13394,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 687
+ "__id__": 706
},
"_prefab": {
- "__id__": 733
+ "__id__": 752
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 687
+ "__id__": 706
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 732
+ "__id__": 751
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
@@ -13169,7 +13416,7 @@
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
- "__id__": 734
+ "__id__": 753
},
"targetOverrides": null
},
@@ -13183,19 +13430,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 735
+ "__id__": 754
},
{
- "__id__": 737
+ "__id__": 756
},
{
- "__id__": 738
+ "__id__": 757
},
{
- "__id__": 739
+ "__id__": 758
},
{
- "__id__": 740
+ "__id__": 759
}
],
"removedComponents": []
@@ -13203,7 +13450,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 736
+ "__id__": 755
},
"propertyPath": [
"_name"
@@ -13219,7 +13466,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 736
+ "__id__": 755
},
"propertyPath": [
"_lpos"
@@ -13234,7 +13481,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 736
+ "__id__": 755
},
"propertyPath": [
"_lrot"
@@ -13250,7 +13497,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 736
+ "__id__": 755
},
"propertyPath": [
"_euler"
@@ -13265,7 +13512,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 736
+ "__id__": 755
},
"propertyPath": [
"_active"
@@ -13275,11 +13522,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 742
+ "__id__": 761
},
"components": [
{
- "__id__": 743
+ "__id__": 762
}
]
},
@@ -13295,15 +13542,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 687
+ "__id__": 706
}
},
"node": {
- "__id__": 687
+ "__id__": 706
},
"_enabled": true,
"__prefab": {
- "__id__": 744
+ "__id__": 763
},
"_alignFlags": 4,
"_target": null,
@@ -13332,7 +13579,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 746
+ "__id__": 765
},
"propertyPath": [
"_name"
@@ -13348,7 +13595,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 746
+ "__id__": 765
},
"propertyPath": [
"_lpos"
@@ -13363,7 +13610,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 746
+ "__id__": 765
},
"propertyPath": [
"_lrot"
@@ -13379,7 +13626,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 746
+ "__id__": 765
},
"propertyPath": [
"_euler"
@@ -13394,7 +13641,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 751
+ "__id__": 770
},
"propertyPath": [
"_contentSize"
@@ -13414,15 +13661,15 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 753
+ "__id__": 772
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
}
},
{
@@ -13434,7 +13681,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 755
+ "__id__": 774
},
"propertyPath": [
"_contentSize"
@@ -13454,7 +13701,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 757
+ "__id__": 776
},
"propertyPath": [
"_spriteFrame"
@@ -13473,7 +13720,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 757
+ "__id__": 776
},
"propertyPath": [
"_atlas"
@@ -13486,7 +13733,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 760
+ "__id__": 779
},
"propertyPath": [
"_contentSize"
@@ -13506,7 +13753,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 762
+ "__id__": 781
},
"propertyPath": [
"_spriteFrame"
@@ -13525,7 +13772,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 762
+ "__id__": 781
},
"propertyPath": [
"_atlas"
@@ -13538,7 +13785,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 765
+ "__id__": 784
},
"propertyPath": [
"_string"
@@ -13554,7 +13801,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 767
+ "__id__": 786
},
"propertyPath": [
"_string"
@@ -13570,7 +13817,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 751
+ "__id__": 770
},
"propertyPath": [
"_anchorPoint"
@@ -13584,7 +13831,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 770
+ "__id__": 789
},
"propertyPath": [
"_lpos"
@@ -13605,7 +13852,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 772
+ "__id__": 791
},
"propertyPath": [
"_lpos"
@@ -13626,7 +13873,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 774
+ "__id__": 793
},
"propertyPath": [
"_lpos"
@@ -13634,7 +13881,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
}
},
@@ -13644,6 +13891,77 @@
"86S3E4+VBNF5Q4sYq5WENB"
]
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 795
+ },
+ "propertyPath": [
+ "_left"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "98LAY3MlpCIqtnpozcBZ6V"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 795
+ },
+ "propertyPath": [
+ "_right"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 795
+ },
+ "propertyPath": [
+ "_top"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 795
+ },
+ "propertyPath": [
+ "_bottom"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 765
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 793
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0.8,
+ "y": 0.8,
+ "z": 1
+ }
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -13651,14 +13969,14 @@
"__id__": 506
},
"_prefab": {
- "__id__": 776
+ "__id__": 802
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 775
+ "__id__": 801
},
"asset": {
"__uuid__": "99b1fd19-5e71-4e63-9682-d82b23244510",
@@ -13666,7 +13984,7 @@
},
"fileId": "cfWG6+EKVJ3IlHCuz5Pa35",
"instance": {
- "__id__": 777
+ "__id__": 803
},
"targetOverrides": null
},
@@ -13678,77 +13996,95 @@
},
"mountedChildren": [
{
- "__id__": 778
+ "__id__": 804
},
{
- "__id__": 818
+ "__id__": 844
}
],
"mountedComponents": [
{
- "__id__": 829
+ "__id__": 855
}
],
"propertyOverrides": [
- {
- "__id__": 833
- },
- {
- "__id__": 835
- },
- {
- "__id__": 836
- },
- {
- "__id__": 837
- },
- {
- "__id__": 838
- },
- {
- "__id__": 840
- },
- {
- "__id__": 842
- },
- {
- "__id__": 844
- },
- {
- "__id__": 846
- },
- {
- "__id__": 847
- },
- {
- "__id__": 849
- },
- {
- "__id__": 851
- },
- {
- "__id__": 852
- },
- {
- "__id__": 854
- },
- {
- "__id__": 856
- },
- {
- "__id__": 858
- },
{
"__id__": 859
},
{
"__id__": 861
},
+ {
+ "__id__": 862
+ },
{
"__id__": 863
},
{
- "__id__": 865
+ "__id__": 864
+ },
+ {
+ "__id__": 866
+ },
+ {
+ "__id__": 868
+ },
+ {
+ "__id__": 870
+ },
+ {
+ "__id__": 872
+ },
+ {
+ "__id__": 873
+ },
+ {
+ "__id__": 875
+ },
+ {
+ "__id__": 877
+ },
+ {
+ "__id__": 878
+ },
+ {
+ "__id__": 880
+ },
+ {
+ "__id__": 882
+ },
+ {
+ "__id__": 884
+ },
+ {
+ "__id__": 885
+ },
+ {
+ "__id__": 887
+ },
+ {
+ "__id__": 889
+ },
+ {
+ "__id__": 891
+ },
+ {
+ "__id__": 892
+ },
+ {
+ "__id__": 894
+ },
+ {
+ "__id__": 895
+ },
+ {
+ "__id__": 896
+ },
+ {
+ "__id__": 897
+ },
+ {
+ "__id__": 898
}
],
"removedComponents": []
@@ -13756,11 +14092,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 779
+ "__id__": 805
},
"nodes": [
{
- "__id__": 780
+ "__id__": 806
}
]
},
@@ -13776,36 +14112,36 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 775
+ "__id__": 801
}
},
"_parent": {
- "__id__": 781
+ "__id__": 807
},
"_children": [
{
- "__id__": 801
+ "__id__": 827
},
{
- "__id__": 807
+ "__id__": 833
}
],
"_active": true,
"_components": [
{
- "__id__": 813
+ "__id__": 839
},
{
- "__id__": 815
+ "__id__": 841
}
],
"_prefab": {
- "__id__": 817
+ "__id__": 843
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -43.672,
+ "y": -31.281,
"z": 0
},
"_lrot": {
@@ -13837,30 +14173,30 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 775
+ "__id__": 801
},
"_children": [
{
- "__id__": 782
+ "__id__": 808
},
{
- "__id__": 780
+ "__id__": 806
}
],
"_active": true,
"_components": [
{
- "__id__": 794
+ "__id__": 820
},
{
- "__id__": 796
+ "__id__": 822
},
{
- "__id__": 798
+ "__id__": 824
}
],
"_prefab": {
- "__id__": 800
+ "__id__": 826
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -13897,29 +14233,29 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 781
+ "__id__": 807
},
"_children": [
{
- "__id__": 783
+ "__id__": 809
}
],
"_active": true,
"_components": [
{
- "__id__": 789
+ "__id__": 815
},
{
- "__id__": 791
+ "__id__": 817
}
],
"_prefab": {
- "__id__": 793
+ "__id__": 819
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
},
"_lrot": {
@@ -13931,8 +14267,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.6,
- "y": 0.6,
+ "x": 0.8,
+ "y": 0.8,
"z": 1
},
"_mobility": 0,
@@ -13951,20 +14287,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 782
+ "__id__": 808
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 784
+ "__id__": 810
},
{
- "__id__": 786
+ "__id__": 812
}
],
"_prefab": {
- "__id__": 788
+ "__id__": 814
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -14001,11 +14337,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 783
+ "__id__": 809
},
"_enabled": true,
"__prefab": {
- "__id__": 785
+ "__id__": 811
},
"_contentSize": {
"__type__": "cc.Size",
@@ -14029,11 +14365,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 783
+ "__id__": 809
},
"_enabled": true,
"__prefab": {
- "__id__": 787
+ "__id__": 813
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -14110,11 +14446,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 782
+ "__id__": 808
},
"_enabled": true,
"__prefab": {
- "__id__": 790
+ "__id__": 816
},
"_contentSize": {
"__type__": "cc.Size",
@@ -14138,11 +14474,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 782
+ "__id__": 808
},
"_enabled": true,
"__prefab": {
- "__id__": 792
+ "__id__": 818
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -14199,16 +14535,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 781
+ "__id__": 807
},
"_enabled": true,
"__prefab": {
- "__id__": 795
+ "__id__": 821
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -14227,11 +14563,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 781
+ "__id__": 807
},
"_enabled": true,
"__prefab": {
- "__id__": 797
+ "__id__": 823
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -14244,7 +14580,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "6165ffc9-a838-4a33-b569-bdbaaab0e6b4@65cbe",
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -14259,7 +14595,10 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
- "_atlas": null,
+ "_atlas": {
+ "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "__expectedType__": "cc.SpriteAtlas"
+ },
"_id": ""
},
{
@@ -14272,18 +14611,18 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 781
+ "__id__": 807
},
"_enabled": true,
"__prefab": {
- "__id__": 799
+ "__id__": 825
},
"_alignFlags": 45,
"_target": null,
- "_left": 0,
- "_right": 0,
- "_top": 0,
- "_bottom": 0,
+ "_left": 20,
+ "_right": 20,
+ "_top": 10,
+ "_bottom": 10,
"_horizontalCenter": 0,
"_verticalCenter": 0,
"_isAbsLeft": true,
@@ -14321,24 +14660,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 780
+ "__id__": 806
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 802
+ "__id__": 828
},
{
- "__id__": 804
+ "__id__": 830
}
],
"_prefab": {
- "__id__": 806
+ "__id__": 832
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -7.5615234375,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -14371,16 +14710,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 801
+ "__id__": 827
},
"_enabled": true,
"__prefab": {
- "__id__": 803
+ "__id__": 829
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 27,
- "height": 27
+ "width": 50,
+ "height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -14399,11 +14738,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 801
+ "__id__": 827
},
"_enabled": true,
"__prefab": {
- "__id__": 805
+ "__id__": 831
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -14457,24 +14796,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 780
+ "__id__": 806
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 808
+ "__id__": 834
},
{
- "__id__": 810
+ "__id__": 836
}
],
"_prefab": {
- "__id__": 812
+ "__id__": 838
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 13.5,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -14507,15 +14846,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 807
+ "__id__": 833
},
"_enabled": true,
"__prefab": {
- "__id__": 809
+ "__id__": 835
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 15.123046875,
+ "width": 23.46533203125,
"height": 54.4
},
"_anchorPoint": {
@@ -14535,11 +14874,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 807
+ "__id__": 833
},
"_enabled": true,
"__prefab": {
- "__id__": 811
+ "__id__": 837
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -14554,8 +14893,8 @@
"_string": "2",
"_horizontalAlign": 1,
"_verticalAlign": 1,
- "_actualFontSize": 20,
- "_fontSize": 20,
+ "_actualFontSize": 35,
+ "_fontSize": 35,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -14616,15 +14955,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 780
+ "__id__": 806
},
"_enabled": true,
"__prefab": {
- "__id__": 814
+ "__id__": 840
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 42.123046875,
+ "width": 50.123046875,
"height": 30
},
"_anchorPoint": {
@@ -14644,11 +14983,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 780
+ "__id__": 806
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
- "__id__": 816
+ "__id__": 842
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -14692,11 +15031,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 819
+ "__id__": 845
},
"nodes": [
{
- "__id__": 820
+ "__id__": 846
}
]
},
@@ -14710,21 +15049,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 775
+ "__id__": 801
},
"_prefab": {
- "__id__": 821
+ "__id__": 847
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 775
+ "__id__": 801
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 820
+ "__id__": 846
},
"asset": {
"__uuid__": "86a3c4cd-71c7-4502-b713-65f0ace7912a",
@@ -14732,7 +15071,7 @@
},
"fileId": "d3jYvT7whFS5scQFZeO5AK",
"instance": {
- "__id__": 822
+ "__id__": 848
},
"targetOverrides": null
},
@@ -14746,19 +15085,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 823
+ "__id__": 849
},
{
- "__id__": 825
+ "__id__": 851
},
{
- "__id__": 826
+ "__id__": 852
},
{
- "__id__": 827
+ "__id__": 853
},
{
- "__id__": 828
+ "__id__": 854
}
],
"removedComponents": []
@@ -14766,7 +15105,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 824
+ "__id__": 850
},
"propertyPath": [
"_name"
@@ -14782,7 +15121,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 824
+ "__id__": 850
},
"propertyPath": [
"_lpos"
@@ -14797,7 +15136,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 824
+ "__id__": 850
},
"propertyPath": [
"_lrot"
@@ -14813,7 +15152,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 824
+ "__id__": 850
},
"propertyPath": [
"_euler"
@@ -14828,7 +15167,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 824
+ "__id__": 850
},
"propertyPath": [
"_active"
@@ -14838,11 +15177,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 830
+ "__id__": 856
},
"components": [
{
- "__id__": 831
+ "__id__": 857
}
]
},
@@ -14858,15 +15197,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 775
+ "__id__": 801
}
},
"node": {
- "__id__": 775
+ "__id__": 801
},
"_enabled": true,
"__prefab": {
- "__id__": 832
+ "__id__": 858
},
"_alignFlags": 4,
"_target": null,
@@ -14895,7 +15234,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 834
+ "__id__": 860
},
"propertyPath": [
"_name"
@@ -14911,7 +15250,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 834
+ "__id__": 860
},
"propertyPath": [
"_lpos"
@@ -14926,7 +15265,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 834
+ "__id__": 860
},
"propertyPath": [
"_lrot"
@@ -14942,7 +15281,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 834
+ "__id__": 860
},
"propertyPath": [
"_euler"
@@ -14957,7 +15296,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 839
+ "__id__": 865
},
"propertyPath": [
"_contentSize"
@@ -14977,15 +15316,15 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 841
+ "__id__": 867
},
"propertyPath": [
"_contentSize"
],
"value": {
"__type__": "cc.Size",
- "width": 180,
- "height": 160
+ "width": 140,
+ "height": 140
}
},
{
@@ -14997,7 +15336,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 843
+ "__id__": 869
},
"propertyPath": [
"_contentSize"
@@ -15017,7 +15356,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 845
+ "__id__": 871
},
"propertyPath": [
"_spriteFrame"
@@ -15036,7 +15375,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 845
+ "__id__": 871
},
"propertyPath": [
"_atlas"
@@ -15049,7 +15388,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 848
+ "__id__": 874
},
"propertyPath": [
"_contentSize"
@@ -15069,7 +15408,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 850
+ "__id__": 876
},
"propertyPath": [
"_spriteFrame"
@@ -15088,7 +15427,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 850
+ "__id__": 876
},
"propertyPath": [
"_atlas"
@@ -15101,7 +15440,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 853
+ "__id__": 879
},
"propertyPath": [
"_string"
@@ -15117,7 +15456,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 855
+ "__id__": 881
},
"propertyPath": [
"_string"
@@ -15133,7 +15472,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 857
+ "__id__": 883
},
"propertyPath": [
"_contentSize"
@@ -15153,7 +15492,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 839
+ "__id__": 865
},
"propertyPath": [
"_anchorPoint"
@@ -15167,7 +15506,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 860
+ "__id__": 886
},
"propertyPath": [
"_lpos"
@@ -15188,7 +15527,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 862
+ "__id__": 888
},
"propertyPath": [
"_lpos"
@@ -15209,7 +15548,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 864
+ "__id__": 890
},
"propertyPath": [
"_lpos"
@@ -15217,7 +15556,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 16.67,
+ "y": 38.768,
"z": 0
}
},
@@ -15230,13 +15569,84 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 834
+ "__id__": 860
},
"propertyPath": [
"_active"
],
+ "value": false
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 893
+ },
+ "propertyPath": [
+ "_left"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "98LAY3MlpCIqtnpozcBZ6V"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 893
+ },
+ "propertyPath": [
+ "_right"
+ ],
+ "value": 20
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 893
+ },
+ "propertyPath": [
+ "_top"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 893
+ },
+ "propertyPath": [
+ "_bottom"
+ ],
+ "value": 10
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 893
+ },
+ "propertyPath": [
+ "_enabled"
+ ],
"value": true
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 890
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0.8,
+ "y": 0.8,
+ "z": 1
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -15247,11 +15657,11 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 867
+ "__id__": 900
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 720,
+ "width": 360,
"height": 150
},
"_anchorPoint": {
@@ -15275,12 +15685,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 869
+ "__id__": 902
},
"_alignFlags": 44,
"_target": null,
- "_left": 0,
- "_right": 0,
+ "_left": 180,
+ "_right": 180,
"_top": 0,
"_bottom": 0,
"_horizontalCenter": 0,
@@ -15311,9 +15721,9 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 871
+ "__id__": 904
},
- "_resizeMode": 0,
+ "_resizeMode": 1,
"_layoutType": 1,
"_cellSize": {
"__type__": "cc.Size",
@@ -15362,32 +15772,32 @@
},
"_children": [
{
- "__id__": 874
+ "__id__": 907
},
{
- "__id__": 884
+ "__id__": 917
},
{
- "__id__": 894
+ "__id__": 927
}
],
"_active": false,
"_components": [
{
- "__id__": 904
+ "__id__": 937
},
{
- "__id__": 906
+ "__id__": 939
},
{
- "__id__": 908
+ "__id__": 941
},
{
- "__id__": 910
+ "__id__": 943
}
],
"_prefab": {
- "__id__": 912
+ "__id__": 945
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15424,21 +15834,21 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 873
+ "__id__": 906
},
"_children": [
{
- "__id__": 875
+ "__id__": 908
}
],
"_active": true,
"_components": [
{
- "__id__": 881
+ "__id__": 914
}
],
"_prefab": {
- "__id__": 883
+ "__id__": 916
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15475,20 +15885,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 874
+ "__id__": 907
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 876
+ "__id__": 909
},
{
- "__id__": 878
+ "__id__": 911
}
],
"_prefab": {
- "__id__": 880
+ "__id__": 913
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15525,11 +15935,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 875
+ "__id__": 908
},
"_enabled": true,
"__prefab": {
- "__id__": 877
+ "__id__": 910
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15553,11 +15963,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 875
+ "__id__": 908
},
"_enabled": true,
"__prefab": {
- "__id__": 879
+ "__id__": 912
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15611,11 +16021,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 874
+ "__id__": 907
},
"_enabled": true,
"__prefab": {
- "__id__": 882
+ "__id__": 915
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15652,21 +16062,21 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 873
+ "__id__": 906
},
"_children": [
{
- "__id__": 885
+ "__id__": 918
}
],
"_active": true,
"_components": [
{
- "__id__": 891
+ "__id__": 924
}
],
"_prefab": {
- "__id__": 893
+ "__id__": 926
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15703,20 +16113,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 884
+ "__id__": 917
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 886
+ "__id__": 919
},
{
- "__id__": 888
+ "__id__": 921
}
],
"_prefab": {
- "__id__": 890
+ "__id__": 923
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15753,11 +16163,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 885
+ "__id__": 918
},
"_enabled": true,
"__prefab": {
- "__id__": 887
+ "__id__": 920
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15781,11 +16191,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 885
+ "__id__": 918
},
"_enabled": true,
"__prefab": {
- "__id__": 889
+ "__id__": 922
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -15839,11 +16249,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 884
+ "__id__": 917
},
"_enabled": true,
"__prefab": {
- "__id__": 892
+ "__id__": 925
},
"_contentSize": {
"__type__": "cc.Size",
@@ -15880,21 +16290,21 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 873
+ "__id__": 906
},
"_children": [
{
- "__id__": 895
+ "__id__": 928
}
],
"_active": true,
"_components": [
{
- "__id__": 901
+ "__id__": 934
}
],
"_prefab": {
- "__id__": 903
+ "__id__": 936
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15931,20 +16341,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 894
+ "__id__": 927
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 896
+ "__id__": 929
},
{
- "__id__": 898
+ "__id__": 931
}
],
"_prefab": {
- "__id__": 900
+ "__id__": 933
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -15981,11 +16391,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 895
+ "__id__": 928
},
"_enabled": true,
"__prefab": {
- "__id__": 897
+ "__id__": 930
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16009,11 +16419,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 895
+ "__id__": 928
},
"_enabled": true,
"__prefab": {
- "__id__": 899
+ "__id__": 932
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -16067,11 +16477,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 894
+ "__id__": 927
},
"_enabled": true,
"__prefab": {
- "__id__": 902
+ "__id__": 935
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16108,11 +16518,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 873
+ "__id__": 906
},
"_enabled": true,
"__prefab": {
- "__id__": 905
+ "__id__": 938
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16136,11 +16546,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 873
+ "__id__": 906
},
"_enabled": true,
"__prefab": {
- "__id__": 907
+ "__id__": 940
},
"_alignFlags": 44,
"_target": null,
@@ -16172,11 +16582,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 873
+ "__id__": 906
},
"_enabled": true,
"__prefab": {
- "__id__": 909
+ "__id__": 942
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -16210,11 +16620,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 873
+ "__id__": 906
},
"_enabled": true,
"__prefab": {
- "__id__": 911
+ "__id__": 944
},
"_id": ""
},
@@ -16245,35 +16655,35 @@
},
"_children": [
{
- "__id__": 914
+ "__id__": 947
},
{
- "__id__": 922
+ "__id__": 955
},
{
- "__id__": 971
+ "__id__": 1004
},
{
- "__id__": 979
+ "__id__": 1012
}
],
"_active": false,
"_components": [
{
- "__id__": 991
+ "__id__": 1024
},
{
- "__id__": 993
+ "__id__": 1026
},
{
- "__id__": 995
+ "__id__": 1028
},
{
- "__id__": 997
+ "__id__": 1030
}
],
"_prefab": {
- "__id__": 999
+ "__id__": 1032
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16310,23 +16720,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 913
+ "__id__": 946
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 915
+ "__id__": 948
},
{
- "__id__": 917
+ "__id__": 950
},
{
- "__id__": 919
+ "__id__": 952
}
],
"_prefab": {
- "__id__": 921
+ "__id__": 954
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -16363,11 +16773,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 914
+ "__id__": 947
},
"_enabled": true,
"__prefab": {
- "__id__": 916
+ "__id__": 949
},
"_contentSize": {
"__type__": "cc.Size",
@@ -16391,11 +16801,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 914
+ "__id__": 947
},
"_enabled": true,
"__prefab": {
- "__id__": 918
+ "__id__": 951
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -16436,11 +16846,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 914
+ "__id__": 947
},
"_enabled": true,
"__prefab": {
- "__id__": 920
+ "__id__": 953
},
"_alignFlags": 45,
"_target": null,
@@ -16483,17 +16893,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 913
+ "__id__": 946
},
"_prefab": {
- "__id__": 923
+ "__id__": 956
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 922
+ "__id__": 955
},
"asset": {
"__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3",
@@ -16501,7 +16911,7 @@
},
"fileId": "50T0YGiGBH7qZZFeATiEP+",
"instance": {
- "__id__": 924
+ "__id__": 957
},
"targetOverrides": null
},
@@ -16513,40 +16923,40 @@
},
"mountedChildren": [
{
- "__id__": 925
+ "__id__": 958
}
],
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 955
+ "__id__": 988
},
{
- "__id__": 957
+ "__id__": 990
},
{
- "__id__": 958
+ "__id__": 991
},
{
- "__id__": 959
+ "__id__": 992
},
{
- "__id__": 960
+ "__id__": 993
},
{
- "__id__": 962
+ "__id__": 995
},
{
- "__id__": 964
+ "__id__": 997
},
{
- "__id__": 966
+ "__id__": 999
},
{
- "__id__": 968
+ "__id__": 1001
},
{
- "__id__": 970
+ "__id__": 1003
}
],
"removedComponents": []
@@ -16554,11 +16964,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 926
+ "__id__": 959
},
"nodes": [
{
- "__id__": 927
+ "__id__": 960
}
]
},
@@ -16572,21 +16982,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 922
+ "__id__": 955
},
"_prefab": {
- "__id__": 928
+ "__id__": 961
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 922
+ "__id__": 955
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 927
+ "__id__": 960
},
"asset": {
"__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2",
@@ -16594,7 +17004,7 @@
},
"fileId": "99dvuw5eJJzqP11ZqucD+r",
"instance": {
- "__id__": 929
+ "__id__": 962
},
"targetOverrides": null
},
@@ -16608,55 +17018,55 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 930
+ "__id__": 963
},
{
- "__id__": 932
+ "__id__": 965
},
{
- "__id__": 933
+ "__id__": 966
},
{
- "__id__": 934
+ "__id__": 967
},
{
- "__id__": 935
+ "__id__": 968
},
{
- "__id__": 937
+ "__id__": 970
},
{
- "__id__": 939
+ "__id__": 972
},
{
- "__id__": 940
+ "__id__": 973
},
{
- "__id__": 942
+ "__id__": 975
},
{
- "__id__": 944
+ "__id__": 977
},
{
- "__id__": 946
+ "__id__": 979
},
{
- "__id__": 947
+ "__id__": 980
},
{
- "__id__": 949
+ "__id__": 982
},
{
- "__id__": 950
+ "__id__": 983
},
{
- "__id__": 951
+ "__id__": 984
},
{
- "__id__": 953
+ "__id__": 986
},
{
- "__id__": 954
+ "__id__": 987
}
],
"removedComponents": []
@@ -16664,7 +17074,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 931
+ "__id__": 964
},
"propertyPath": [
"_name"
@@ -16680,7 +17090,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 931
+ "__id__": 964
},
"propertyPath": [
"_lpos"
@@ -16695,7 +17105,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 931
+ "__id__": 964
},
"propertyPath": [
"_lrot"
@@ -16711,7 +17121,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 931
+ "__id__": 964
},
"propertyPath": [
"_euler"
@@ -16726,7 +17136,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 936
+ "__id__": 969
},
"propertyPath": [
"_top"
@@ -16742,7 +17152,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 938
+ "__id__": 971
},
"propertyPath": [
"_active"
@@ -16758,7 +17168,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 936
+ "__id__": 969
},
"propertyPath": [
"_left"
@@ -16768,7 +17178,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 941
+ "__id__": 974
},
"propertyPath": [
"_contentSize"
@@ -16788,7 +17198,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 943
+ "__id__": 976
},
"propertyPath": [
"_contentSize"
@@ -16808,7 +17218,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 945
+ "__id__": 978
},
"propertyPath": [
"_contentSize"
@@ -16828,7 +17238,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 936
+ "__id__": 969
},
"propertyPath": [
"_right"
@@ -16838,7 +17248,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 948
+ "__id__": 981
},
"propertyPath": [
"_alignFlags"
@@ -16854,7 +17264,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 948
+ "__id__": 981
},
"propertyPath": [
"_top"
@@ -16864,7 +17274,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 948
+ "__id__": 981
},
"propertyPath": [
"_bottom"
@@ -16874,7 +17284,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 952
+ "__id__": 985
},
"propertyPath": [
"_lpos"
@@ -16895,7 +17305,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 936
+ "__id__": 969
},
"propertyPath": [
"_alignFlags"
@@ -16905,7 +17315,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 936
+ "__id__": 969
},
"propertyPath": [
"_bottom"
@@ -16915,7 +17325,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 956
+ "__id__": 989
},
"propertyPath": [
"_name"
@@ -16931,7 +17341,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 956
+ "__id__": 989
},
"propertyPath": [
"_lpos"
@@ -16946,7 +17356,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 956
+ "__id__": 989
},
"propertyPath": [
"_lrot"
@@ -16962,7 +17372,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 956
+ "__id__": 989
},
"propertyPath": [
"_euler"
@@ -16977,7 +17387,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 961
+ "__id__": 994
},
"propertyPath": [
"_contentSize"
@@ -16997,7 +17407,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 963
+ "__id__": 996
},
"propertyPath": [
"_contentSize"
@@ -17017,7 +17427,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 965
+ "__id__": 998
},
"propertyPath": [
"_contentSize"
@@ -17037,7 +17447,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 967
+ "__id__": 1000
},
"propertyPath": [
"_contentSize"
@@ -17057,7 +17467,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 969
+ "__id__": 1002
},
"propertyPath": [
"_active"
@@ -17073,7 +17483,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 956
+ "__id__": 989
},
"propertyPath": [
"_active"
@@ -17086,23 +17496,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 913
+ "__id__": 946
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 972
+ "__id__": 1005
},
{
- "__id__": 974
+ "__id__": 1007
},
{
- "__id__": 976
+ "__id__": 1009
}
],
"_prefab": {
- "__id__": 978
+ "__id__": 1011
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17139,11 +17549,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 971
+ "__id__": 1004
},
"_enabled": true,
"__prefab": {
- "__id__": 973
+ "__id__": 1006
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17167,11 +17577,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 971
+ "__id__": 1004
},
"_enabled": true,
"__prefab": {
- "__id__": 975
+ "__id__": 1008
},
"_alignFlags": 18,
"_target": null,
@@ -17203,11 +17613,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 971
+ "__id__": 1004
},
"_enabled": false,
"__prefab": {
- "__id__": 977
+ "__id__": 1010
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -17252,17 +17662,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 913
+ "__id__": 946
},
"_prefab": {
- "__id__": 980
+ "__id__": 1013
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 979
+ "__id__": 1012
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -17270,7 +17680,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 981
+ "__id__": 1014
},
"targetOverrides": null
},
@@ -17283,21 +17693,21 @@
"mountedChildren": [],
"mountedComponents": [
{
- "__id__": 982
+ "__id__": 1015
}
],
"propertyOverrides": [
{
- "__id__": 986
+ "__id__": 1019
},
{
- "__id__": 988
+ "__id__": 1021
},
{
- "__id__": 989
+ "__id__": 1022
},
{
- "__id__": 990
+ "__id__": 1023
}
],
"removedComponents": []
@@ -17305,11 +17715,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 983
+ "__id__": 1016
},
"components": [
{
- "__id__": 984
+ "__id__": 1017
}
]
},
@@ -17325,15 +17735,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 979
+ "__id__": 1012
}
},
"node": {
- "__id__": 979
+ "__id__": 1012
},
"_enabled": true,
"__prefab": {
- "__id__": 985
+ "__id__": 1018
},
"_alignFlags": 2,
"_target": null,
@@ -17362,7 +17772,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 987
+ "__id__": 1020
},
"propertyPath": [
"_name"
@@ -17378,7 +17788,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 987
+ "__id__": 1020
},
"propertyPath": [
"_lpos"
@@ -17393,7 +17803,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 987
+ "__id__": 1020
},
"propertyPath": [
"_lrot"
@@ -17409,7 +17819,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 987
+ "__id__": 1020
},
"propertyPath": [
"_euler"
@@ -17427,11 +17837,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 913
+ "__id__": 946
},
"_enabled": true,
"__prefab": {
- "__id__": 992
+ "__id__": 1025
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17455,11 +17865,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 913
+ "__id__": 946
},
"_enabled": true,
"__prefab": {
- "__id__": 994
+ "__id__": 1027
},
"_alignFlags": 45,
"_target": null,
@@ -17491,11 +17901,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 913
+ "__id__": 946
},
"_enabled": false,
"__prefab": {
- "__id__": 996
+ "__id__": 1029
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -17529,11 +17939,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 913
+ "__id__": 946
},
"_enabled": true,
"__prefab": {
- "__id__": 998
+ "__id__": 1031
},
"_id": ""
},
@@ -17564,35 +17974,35 @@
},
"_children": [
{
- "__id__": 1001
+ "__id__": 1034
},
{
- "__id__": 1009
+ "__id__": 1042
},
{
- "__id__": 1058
+ "__id__": 1091
},
{
- "__id__": 1066
+ "__id__": 1099
}
],
"_active": false,
"_components": [
{
- "__id__": 1110
+ "__id__": 1143
},
{
- "__id__": 1112
+ "__id__": 1145
},
{
- "__id__": 1114
+ "__id__": 1147
},
{
- "__id__": 1116
+ "__id__": 1149
}
],
"_prefab": {
- "__id__": 1118
+ "__id__": 1151
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17629,23 +18039,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1000
+ "__id__": 1033
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1002
+ "__id__": 1035
},
{
- "__id__": 1004
+ "__id__": 1037
},
{
- "__id__": 1006
+ "__id__": 1039
}
],
"_prefab": {
- "__id__": 1008
+ "__id__": 1041
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -17682,11 +18092,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1001
+ "__id__": 1034
},
"_enabled": true,
"__prefab": {
- "__id__": 1003
+ "__id__": 1036
},
"_contentSize": {
"__type__": "cc.Size",
@@ -17710,11 +18120,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1001
+ "__id__": 1034
},
"_enabled": true,
"__prefab": {
- "__id__": 1005
+ "__id__": 1038
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -17755,11 +18165,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1001
+ "__id__": 1034
},
"_enabled": true,
"__prefab": {
- "__id__": 1007
+ "__id__": 1040
},
"_alignFlags": 45,
"_target": null,
@@ -17802,17 +18212,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1000
+ "__id__": 1033
},
"_prefab": {
- "__id__": 1010
+ "__id__": 1043
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1009
+ "__id__": 1042
},
"asset": {
"__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3",
@@ -17820,7 +18230,7 @@
},
"fileId": "50T0YGiGBH7qZZFeATiEP+",
"instance": {
- "__id__": 1011
+ "__id__": 1044
},
"targetOverrides": null
},
@@ -17832,40 +18242,40 @@
},
"mountedChildren": [
{
- "__id__": 1012
+ "__id__": 1045
}
],
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1042
+ "__id__": 1075
},
{
- "__id__": 1044
+ "__id__": 1077
},
{
- "__id__": 1045
+ "__id__": 1078
},
{
- "__id__": 1046
+ "__id__": 1079
},
{
- "__id__": 1047
+ "__id__": 1080
},
{
- "__id__": 1049
+ "__id__": 1082
},
{
- "__id__": 1051
+ "__id__": 1084
},
{
- "__id__": 1053
+ "__id__": 1086
},
{
- "__id__": 1055
+ "__id__": 1088
},
{
- "__id__": 1056
+ "__id__": 1089
}
],
"removedComponents": []
@@ -17873,11 +18283,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 1013
+ "__id__": 1046
},
"nodes": [
{
- "__id__": 1014
+ "__id__": 1047
}
]
},
@@ -17891,21 +18301,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1009
+ "__id__": 1042
},
"_prefab": {
- "__id__": 1015
+ "__id__": 1048
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 1009
+ "__id__": 1042
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1014
+ "__id__": 1047
},
"asset": {
"__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2",
@@ -17913,7 +18323,7 @@
},
"fileId": "99dvuw5eJJzqP11ZqucD+r",
"instance": {
- "__id__": 1016
+ "__id__": 1049
},
"targetOverrides": null
},
@@ -17927,55 +18337,55 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1017
+ "__id__": 1050
},
{
- "__id__": 1019
+ "__id__": 1052
},
{
- "__id__": 1020
+ "__id__": 1053
},
{
- "__id__": 1021
+ "__id__": 1054
},
{
- "__id__": 1022
+ "__id__": 1055
},
{
- "__id__": 1024
+ "__id__": 1057
},
{
- "__id__": 1026
+ "__id__": 1059
},
{
- "__id__": 1027
+ "__id__": 1060
},
{
- "__id__": 1029
+ "__id__": 1062
},
{
- "__id__": 1031
+ "__id__": 1064
},
{
- "__id__": 1033
+ "__id__": 1066
},
{
- "__id__": 1034
+ "__id__": 1067
},
{
- "__id__": 1036
+ "__id__": 1069
},
{
- "__id__": 1037
+ "__id__": 1070
},
{
- "__id__": 1038
+ "__id__": 1071
},
{
- "__id__": 1040
+ "__id__": 1073
},
{
- "__id__": 1041
+ "__id__": 1074
}
],
"removedComponents": []
@@ -17983,7 +18393,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1018
+ "__id__": 1051
},
"propertyPath": [
"_name"
@@ -17999,7 +18409,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1018
+ "__id__": 1051
},
"propertyPath": [
"_lpos"
@@ -18014,7 +18424,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1018
+ "__id__": 1051
},
"propertyPath": [
"_lrot"
@@ -18030,7 +18440,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1018
+ "__id__": 1051
},
"propertyPath": [
"_euler"
@@ -18045,7 +18455,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1023
+ "__id__": 1056
},
"propertyPath": [
"_top"
@@ -18061,7 +18471,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1025
+ "__id__": 1058
},
"propertyPath": [
"_active"
@@ -18077,7 +18487,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1023
+ "__id__": 1056
},
"propertyPath": [
"_left"
@@ -18087,7 +18497,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1028
+ "__id__": 1061
},
"propertyPath": [
"_contentSize"
@@ -18107,7 +18517,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1030
+ "__id__": 1063
},
"propertyPath": [
"_contentSize"
@@ -18127,7 +18537,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1032
+ "__id__": 1065
},
"propertyPath": [
"_contentSize"
@@ -18147,7 +18557,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1023
+ "__id__": 1056
},
"propertyPath": [
"_right"
@@ -18157,7 +18567,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1035
+ "__id__": 1068
},
"propertyPath": [
"_alignFlags"
@@ -18173,7 +18583,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1035
+ "__id__": 1068
},
"propertyPath": [
"_top"
@@ -18183,7 +18593,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1035
+ "__id__": 1068
},
"propertyPath": [
"_bottom"
@@ -18193,7 +18603,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1039
+ "__id__": 1072
},
"propertyPath": [
"_lpos"
@@ -18214,7 +18624,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1023
+ "__id__": 1056
},
"propertyPath": [
"_alignFlags"
@@ -18224,7 +18634,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1023
+ "__id__": 1056
},
"propertyPath": [
"_bottom"
@@ -18234,7 +18644,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1043
+ "__id__": 1076
},
"propertyPath": [
"_name"
@@ -18250,7 +18660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1043
+ "__id__": 1076
},
"propertyPath": [
"_lpos"
@@ -18265,7 +18675,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1043
+ "__id__": 1076
},
"propertyPath": [
"_lrot"
@@ -18281,7 +18691,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1043
+ "__id__": 1076
},
"propertyPath": [
"_euler"
@@ -18296,7 +18706,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1048
+ "__id__": 1081
},
"propertyPath": [
"_contentSize"
@@ -18316,7 +18726,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1050
+ "__id__": 1083
},
"propertyPath": [
"_contentSize"
@@ -18336,7 +18746,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1052
+ "__id__": 1085
},
"propertyPath": [
"_contentSize"
@@ -18356,7 +18766,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1054
+ "__id__": 1087
},
"propertyPath": [
"_contentSize"
@@ -18376,7 +18786,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1043
+ "__id__": 1076
},
"propertyPath": [
"_active"
@@ -18386,7 +18796,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1057
+ "__id__": 1090
},
"propertyPath": [
"_active"
@@ -18405,23 +18815,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1000
+ "__id__": 1033
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1059
+ "__id__": 1092
},
{
- "__id__": 1061
+ "__id__": 1094
},
{
- "__id__": 1063
+ "__id__": 1096
}
],
"_prefab": {
- "__id__": 1065
+ "__id__": 1098
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18458,11 +18868,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1058
+ "__id__": 1091
},
"_enabled": true,
"__prefab": {
- "__id__": 1060
+ "__id__": 1093
},
"_contentSize": {
"__type__": "cc.Size",
@@ -18486,11 +18896,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1058
+ "__id__": 1091
},
"_enabled": true,
"__prefab": {
- "__id__": 1062
+ "__id__": 1095
},
"_alignFlags": 18,
"_target": null,
@@ -18522,11 +18932,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1058
+ "__id__": 1091
},
"_enabled": false,
"__prefab": {
- "__id__": 1064
+ "__id__": 1097
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -18573,33 +18983,33 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1000
+ "__id__": 1033
},
"_children": [
{
- "__id__": 1067
+ "__id__": 1100
},
{
- "__id__": 1077
+ "__id__": 1110
}
],
"_active": true,
"_components": [
{
- "__id__": 1101
+ "__id__": 1134
},
{
- "__id__": 1103
+ "__id__": 1136
},
{
- "__id__": 1105
+ "__id__": 1138
},
{
- "__id__": 1107
+ "__id__": 1140
}
],
"_prefab": {
- "__id__": 1109
+ "__id__": 1142
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -18634,17 +19044,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1066
+ "__id__": 1099
},
"_prefab": {
- "__id__": 1068
+ "__id__": 1101
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1067
+ "__id__": 1100
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -18652,7 +19062,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 1069
+ "__id__": 1102
},
"targetOverrides": null
},
@@ -18666,31 +19076,31 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1070
+ "__id__": 1103
},
{
- "__id__": 1072
+ "__id__": 1105
},
{
- "__id__": 1073
+ "__id__": 1106
},
{
- "__id__": 1074
+ "__id__": 1107
}
],
"removedComponents": [
{
- "__id__": 1075
+ "__id__": 1108
},
{
- "__id__": 1076
+ "__id__": 1109
}
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1071
+ "__id__": 1104
},
"propertyPath": [
"_name"
@@ -18706,7 +19116,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1071
+ "__id__": 1104
},
"propertyPath": [
"_lpos"
@@ -18721,7 +19131,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1071
+ "__id__": 1104
},
"propertyPath": [
"_lrot"
@@ -18737,7 +19147,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1071
+ "__id__": 1104
},
"propertyPath": [
"_euler"
@@ -18765,17 +19175,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1066
+ "__id__": 1099
},
"_prefab": {
- "__id__": 1078
+ "__id__": 1111
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1077
+ "__id__": 1110
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -18783,7 +19193,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 1079
+ "__id__": 1112
},
"targetOverrides": null
},
@@ -18797,55 +19207,55 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1080
+ "__id__": 1113
},
{
- "__id__": 1082
+ "__id__": 1115
},
{
- "__id__": 1083
+ "__id__": 1116
},
{
- "__id__": 1084
+ "__id__": 1117
},
{
- "__id__": 1085
+ "__id__": 1118
},
{
- "__id__": 1087
+ "__id__": 1120
},
{
- "__id__": 1089
+ "__id__": 1122
},
{
- "__id__": 1091
+ "__id__": 1124
},
{
- "__id__": 1093
+ "__id__": 1126
},
{
- "__id__": 1094
+ "__id__": 1127
},
{
- "__id__": 1096
+ "__id__": 1129
},
{
- "__id__": 1098
+ "__id__": 1131
}
],
"removedComponents": [
{
- "__id__": 1099
+ "__id__": 1132
},
{
- "__id__": 1100
+ "__id__": 1133
}
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1081
+ "__id__": 1114
},
"propertyPath": [
"_name"
@@ -18861,7 +19271,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1081
+ "__id__": 1114
},
"propertyPath": [
"_lpos"
@@ -18876,7 +19286,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1081
+ "__id__": 1114
},
"propertyPath": [
"_lrot"
@@ -18892,7 +19302,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1081
+ "__id__": 1114
},
"propertyPath": [
"_euler"
@@ -18907,7 +19317,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1086
+ "__id__": 1119
},
"propertyPath": [
"_active"
@@ -18923,7 +19333,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1088
+ "__id__": 1121
},
"propertyPath": [
"_lpos"
@@ -18944,7 +19354,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1090
+ "__id__": 1123
},
"propertyPath": [
"_contentSize"
@@ -18964,7 +19374,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1092
+ "__id__": 1125
},
"propertyPath": [
"_top"
@@ -18980,7 +19390,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1092
+ "__id__": 1125
},
"propertyPath": [
"_bottom"
@@ -18990,7 +19400,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1095
+ "__id__": 1128
},
"propertyPath": [
"_string"
@@ -19006,7 +19416,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1097
+ "__id__": 1130
},
"propertyPath": [
"_contentSize"
@@ -19026,7 +19436,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1081
+ "__id__": 1114
},
"propertyPath": [
"_active"
@@ -19051,11 +19461,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1066
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1102
+ "__id__": 1135
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19079,11 +19489,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1066
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1104
+ "__id__": 1137
},
"_alignFlags": 42,
"_target": null,
@@ -19115,11 +19525,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1066
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1106
+ "__id__": 1139
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -19153,11 +19563,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1066
+ "__id__": 1099
},
"_enabled": true,
"__prefab": {
- "__id__": 1108
+ "__id__": 1141
},
"_alignFlags": 0,
"_target": null,
@@ -19202,11 +19612,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1000
+ "__id__": 1033
},
"_enabled": true,
"__prefab": {
- "__id__": 1111
+ "__id__": 1144
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19230,11 +19640,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1000
+ "__id__": 1033
},
"_enabled": true,
"__prefab": {
- "__id__": 1113
+ "__id__": 1146
},
"_alignFlags": 45,
"_target": null,
@@ -19266,11 +19676,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1000
+ "__id__": 1033
},
"_enabled": false,
"__prefab": {
- "__id__": 1115
+ "__id__": 1148
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -19304,11 +19714,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1000
+ "__id__": 1033
},
"_enabled": true,
"__prefab": {
- "__id__": 1117
+ "__id__": 1150
},
"_id": ""
},
@@ -19339,35 +19749,35 @@
},
"_children": [
{
- "__id__": 1120
+ "__id__": 1153
},
{
- "__id__": 1128
+ "__id__": 1161
},
{
- "__id__": 1177
+ "__id__": 1210
},
{
- "__id__": 1185
+ "__id__": 1218
}
],
"_active": false,
"_components": [
{
- "__id__": 1199
+ "__id__": 1232
},
{
- "__id__": 1201
+ "__id__": 1234
},
{
- "__id__": 1203
+ "__id__": 1236
},
{
- "__id__": 1205
+ "__id__": 1238
}
],
"_prefab": {
- "__id__": 1207
+ "__id__": 1240
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19404,23 +19814,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1119
+ "__id__": 1152
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1121
+ "__id__": 1154
},
{
- "__id__": 1123
+ "__id__": 1156
},
{
- "__id__": 1125
+ "__id__": 1158
}
],
"_prefab": {
- "__id__": 1127
+ "__id__": 1160
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -19457,11 +19867,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1120
+ "__id__": 1153
},
"_enabled": true,
"__prefab": {
- "__id__": 1122
+ "__id__": 1155
},
"_contentSize": {
"__type__": "cc.Size",
@@ -19485,11 +19895,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1120
+ "__id__": 1153
},
"_enabled": true,
"__prefab": {
- "__id__": 1124
+ "__id__": 1157
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -19530,11 +19940,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1120
+ "__id__": 1153
},
"_enabled": true,
"__prefab": {
- "__id__": 1126
+ "__id__": 1159
},
"_alignFlags": 45,
"_target": null,
@@ -19577,17 +19987,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1119
+ "__id__": 1152
},
"_prefab": {
- "__id__": 1129
+ "__id__": 1162
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1128
+ "__id__": 1161
},
"asset": {
"__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3",
@@ -19595,7 +20005,7 @@
},
"fileId": "50T0YGiGBH7qZZFeATiEP+",
"instance": {
- "__id__": 1130
+ "__id__": 1163
},
"targetOverrides": null
},
@@ -19607,40 +20017,40 @@
},
"mountedChildren": [
{
- "__id__": 1131
+ "__id__": 1164
}
],
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1161
+ "__id__": 1194
},
{
- "__id__": 1163
+ "__id__": 1196
},
{
- "__id__": 1164
+ "__id__": 1197
},
{
- "__id__": 1165
+ "__id__": 1198
},
{
- "__id__": 1166
+ "__id__": 1199
},
{
- "__id__": 1168
+ "__id__": 1201
},
{
- "__id__": 1170
+ "__id__": 1203
},
{
- "__id__": 1172
+ "__id__": 1205
},
{
- "__id__": 1174
+ "__id__": 1207
},
{
- "__id__": 1176
+ "__id__": 1209
}
],
"removedComponents": []
@@ -19648,11 +20058,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 1132
+ "__id__": 1165
},
"nodes": [
{
- "__id__": 1133
+ "__id__": 1166
}
]
},
@@ -19666,21 +20076,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1128
+ "__id__": 1161
},
"_prefab": {
- "__id__": 1134
+ "__id__": 1167
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 1128
+ "__id__": 1161
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1133
+ "__id__": 1166
},
"asset": {
"__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2",
@@ -19688,7 +20098,7 @@
},
"fileId": "99dvuw5eJJzqP11ZqucD+r",
"instance": {
- "__id__": 1135
+ "__id__": 1168
},
"targetOverrides": null
},
@@ -19702,55 +20112,55 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1136
+ "__id__": 1169
},
{
- "__id__": 1138
+ "__id__": 1171
},
{
- "__id__": 1139
+ "__id__": 1172
},
{
- "__id__": 1140
+ "__id__": 1173
},
{
- "__id__": 1141
+ "__id__": 1174
},
{
- "__id__": 1143
+ "__id__": 1176
},
{
- "__id__": 1145
+ "__id__": 1178
},
{
- "__id__": 1146
+ "__id__": 1179
},
{
- "__id__": 1148
+ "__id__": 1181
},
{
- "__id__": 1150
+ "__id__": 1183
},
{
- "__id__": 1152
+ "__id__": 1185
},
{
- "__id__": 1153
+ "__id__": 1186
},
{
- "__id__": 1155
+ "__id__": 1188
},
{
- "__id__": 1156
+ "__id__": 1189
},
{
- "__id__": 1157
+ "__id__": 1190
},
{
- "__id__": 1159
+ "__id__": 1192
},
{
- "__id__": 1160
+ "__id__": 1193
}
],
"removedComponents": []
@@ -19758,7 +20168,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1137
+ "__id__": 1170
},
"propertyPath": [
"_name"
@@ -19774,7 +20184,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1137
+ "__id__": 1170
},
"propertyPath": [
"_lpos"
@@ -19789,7 +20199,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1137
+ "__id__": 1170
},
"propertyPath": [
"_lrot"
@@ -19805,7 +20215,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1137
+ "__id__": 1170
},
"propertyPath": [
"_euler"
@@ -19820,7 +20230,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1142
+ "__id__": 1175
},
"propertyPath": [
"_top"
@@ -19836,7 +20246,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1144
+ "__id__": 1177
},
"propertyPath": [
"_active"
@@ -19852,7 +20262,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1142
+ "__id__": 1175
},
"propertyPath": [
"_left"
@@ -19862,7 +20272,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1147
+ "__id__": 1180
},
"propertyPath": [
"_contentSize"
@@ -19882,7 +20292,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1149
+ "__id__": 1182
},
"propertyPath": [
"_contentSize"
@@ -19902,7 +20312,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1151
+ "__id__": 1184
},
"propertyPath": [
"_contentSize"
@@ -19922,7 +20332,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1142
+ "__id__": 1175
},
"propertyPath": [
"_right"
@@ -19932,7 +20342,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1154
+ "__id__": 1187
},
"propertyPath": [
"_alignFlags"
@@ -19948,7 +20358,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1154
+ "__id__": 1187
},
"propertyPath": [
"_top"
@@ -19958,7 +20368,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1154
+ "__id__": 1187
},
"propertyPath": [
"_bottom"
@@ -19968,7 +20378,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1158
+ "__id__": 1191
},
"propertyPath": [
"_lpos"
@@ -19989,7 +20399,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1142
+ "__id__": 1175
},
"propertyPath": [
"_alignFlags"
@@ -19999,7 +20409,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1142
+ "__id__": 1175
},
"propertyPath": [
"_bottom"
@@ -20009,7 +20419,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1162
+ "__id__": 1195
},
"propertyPath": [
"_name"
@@ -20025,7 +20435,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1162
+ "__id__": 1195
},
"propertyPath": [
"_lpos"
@@ -20040,7 +20450,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1162
+ "__id__": 1195
},
"propertyPath": [
"_lrot"
@@ -20056,7 +20466,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1162
+ "__id__": 1195
},
"propertyPath": [
"_euler"
@@ -20071,7 +20481,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1167
+ "__id__": 1200
},
"propertyPath": [
"_contentSize"
@@ -20091,7 +20501,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1169
+ "__id__": 1202
},
"propertyPath": [
"_contentSize"
@@ -20111,7 +20521,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1171
+ "__id__": 1204
},
"propertyPath": [
"_contentSize"
@@ -20131,7 +20541,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1173
+ "__id__": 1206
},
"propertyPath": [
"_contentSize"
@@ -20151,7 +20561,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1175
+ "__id__": 1208
},
"propertyPath": [
"_active"
@@ -20167,7 +20577,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1162
+ "__id__": 1195
},
"propertyPath": [
"_active"
@@ -20180,23 +20590,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1119
+ "__id__": 1152
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1178
+ "__id__": 1211
},
{
- "__id__": 1180
+ "__id__": 1213
},
{
- "__id__": 1182
+ "__id__": 1215
}
],
"_prefab": {
- "__id__": 1184
+ "__id__": 1217
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20233,11 +20643,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1177
+ "__id__": 1210
},
"_enabled": true,
"__prefab": {
- "__id__": 1179
+ "__id__": 1212
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20261,11 +20671,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1177
+ "__id__": 1210
},
"_enabled": true,
"__prefab": {
- "__id__": 1181
+ "__id__": 1214
},
"_alignFlags": 18,
"_target": null,
@@ -20297,11 +20707,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1177
+ "__id__": 1210
},
"_enabled": false,
"__prefab": {
- "__id__": 1183
+ "__id__": 1216
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -20346,17 +20756,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1119
+ "__id__": 1152
},
"_prefab": {
- "__id__": 1186
+ "__id__": 1219
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1185
+ "__id__": 1218
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -20364,7 +20774,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 1187
+ "__id__": 1220
},
"targetOverrides": null
},
@@ -20377,40 +20787,40 @@
"mountedChildren": [],
"mountedComponents": [
{
- "__id__": 1188
+ "__id__": 1221
}
],
"propertyOverrides": [
{
- "__id__": 1192
+ "__id__": 1225
},
{
- "__id__": 1194
+ "__id__": 1227
},
{
- "__id__": 1195
+ "__id__": 1228
},
{
- "__id__": 1196
+ "__id__": 1229
}
],
"removedComponents": [
{
- "__id__": 1197
+ "__id__": 1230
},
{
- "__id__": 1198
+ "__id__": 1231
}
]
},
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 1189
+ "__id__": 1222
},
"components": [
{
- "__id__": 1190
+ "__id__": 1223
}
]
},
@@ -20426,15 +20836,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 1185
+ "__id__": 1218
}
},
"node": {
- "__id__": 1185
+ "__id__": 1218
},
"_enabled": true,
"__prefab": {
- "__id__": 1191
+ "__id__": 1224
},
"_alignFlags": 2,
"_target": null,
@@ -20463,7 +20873,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1193
+ "__id__": 1226
},
"propertyPath": [
"_name"
@@ -20479,7 +20889,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1193
+ "__id__": 1226
},
"propertyPath": [
"_lpos"
@@ -20494,7 +20904,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1193
+ "__id__": 1226
},
"propertyPath": [
"_lrot"
@@ -20510,7 +20920,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1193
+ "__id__": 1226
},
"propertyPath": [
"_euler"
@@ -20540,11 +20950,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1119
+ "__id__": 1152
},
"_enabled": true,
"__prefab": {
- "__id__": 1200
+ "__id__": 1233
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20568,11 +20978,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1119
+ "__id__": 1152
},
"_enabled": true,
"__prefab": {
- "__id__": 1202
+ "__id__": 1235
},
"_alignFlags": 45,
"_target": null,
@@ -20604,11 +21014,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1119
+ "__id__": 1152
},
"_enabled": false,
"__prefab": {
- "__id__": 1204
+ "__id__": 1237
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -20642,11 +21052,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1119
+ "__id__": 1152
},
"_enabled": true,
"__prefab": {
- "__id__": 1206
+ "__id__": 1239
},
"_id": ""
},
@@ -20677,35 +21087,35 @@
},
"_children": [
{
- "__id__": 1209
+ "__id__": 1242
},
{
- "__id__": 1217
+ "__id__": 1250
},
{
- "__id__": 1266
+ "__id__": 1299
},
{
- "__id__": 1274
+ "__id__": 1307
}
],
"_active": false,
"_components": [
{
- "__id__": 1286
+ "__id__": 1319
},
{
- "__id__": 1288
+ "__id__": 1321
},
{
- "__id__": 1290
+ "__id__": 1323
},
{
- "__id__": 1292
+ "__id__": 1325
}
],
"_prefab": {
- "__id__": 1294
+ "__id__": 1327
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20742,23 +21152,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1208
+ "__id__": 1241
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1210
+ "__id__": 1243
},
{
- "__id__": 1212
+ "__id__": 1245
},
{
- "__id__": 1214
+ "__id__": 1247
}
],
"_prefab": {
- "__id__": 1216
+ "__id__": 1249
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -20795,11 +21205,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1209
+ "__id__": 1242
},
"_enabled": true,
"__prefab": {
- "__id__": 1211
+ "__id__": 1244
},
"_contentSize": {
"__type__": "cc.Size",
@@ -20823,11 +21233,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1209
+ "__id__": 1242
},
"_enabled": true,
"__prefab": {
- "__id__": 1213
+ "__id__": 1246
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -20868,11 +21278,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1209
+ "__id__": 1242
},
"_enabled": true,
"__prefab": {
- "__id__": 1215
+ "__id__": 1248
},
"_alignFlags": 45,
"_target": null,
@@ -20915,17 +21325,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1208
+ "__id__": 1241
},
"_prefab": {
- "__id__": 1218
+ "__id__": 1251
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1217
+ "__id__": 1250
},
"asset": {
"__uuid__": "555f7387-1025-41a8-a2a8-ff61c76004a3",
@@ -20933,7 +21343,7 @@
},
"fileId": "50T0YGiGBH7qZZFeATiEP+",
"instance": {
- "__id__": 1219
+ "__id__": 1252
},
"targetOverrides": null
},
@@ -20945,40 +21355,40 @@
},
"mountedChildren": [
{
- "__id__": 1220
+ "__id__": 1253
}
],
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1250
+ "__id__": 1283
},
{
- "__id__": 1252
+ "__id__": 1285
},
{
- "__id__": 1253
+ "__id__": 1286
},
{
- "__id__": 1254
+ "__id__": 1287
},
{
- "__id__": 1255
+ "__id__": 1288
},
{
- "__id__": 1257
+ "__id__": 1290
},
{
- "__id__": 1259
+ "__id__": 1292
},
{
- "__id__": 1261
+ "__id__": 1294
},
{
- "__id__": 1263
+ "__id__": 1296
},
{
- "__id__": 1265
+ "__id__": 1298
}
],
"removedComponents": []
@@ -20986,11 +21396,11 @@
{
"__type__": "cc.MountedChildrenInfo",
"targetInfo": {
- "__id__": 1221
+ "__id__": 1254
},
"nodes": [
{
- "__id__": 1222
+ "__id__": 1255
}
]
},
@@ -21004,21 +21414,21 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1217
+ "__id__": 1250
},
"_prefab": {
- "__id__": 1223
+ "__id__": 1256
},
"__editorExtras__": {
"mountedRoot": {
- "__id__": 1217
+ "__id__": 1250
}
}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1222
+ "__id__": 1255
},
"asset": {
"__uuid__": "b5782405-f3d9-4d45-ba8c-01b5ec2748b2",
@@ -21026,7 +21436,7 @@
},
"fileId": "99dvuw5eJJzqP11ZqucD+r",
"instance": {
- "__id__": 1224
+ "__id__": 1257
},
"targetOverrides": null
},
@@ -21040,55 +21450,55 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 1225
+ "__id__": 1258
},
{
- "__id__": 1227
+ "__id__": 1260
},
{
- "__id__": 1228
+ "__id__": 1261
},
{
- "__id__": 1229
+ "__id__": 1262
},
{
- "__id__": 1230
+ "__id__": 1263
},
{
- "__id__": 1232
+ "__id__": 1265
},
{
- "__id__": 1234
+ "__id__": 1267
},
{
- "__id__": 1235
+ "__id__": 1268
},
{
- "__id__": 1237
+ "__id__": 1270
},
{
- "__id__": 1239
+ "__id__": 1272
},
{
- "__id__": 1241
+ "__id__": 1274
},
{
- "__id__": 1242
+ "__id__": 1275
},
{
- "__id__": 1244
+ "__id__": 1277
},
{
- "__id__": 1245
+ "__id__": 1278
},
{
- "__id__": 1246
+ "__id__": 1279
},
{
- "__id__": 1248
+ "__id__": 1281
},
{
- "__id__": 1249
+ "__id__": 1282
}
],
"removedComponents": []
@@ -21096,7 +21506,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1226
+ "__id__": 1259
},
"propertyPath": [
"_name"
@@ -21112,7 +21522,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1226
+ "__id__": 1259
},
"propertyPath": [
"_lpos"
@@ -21127,7 +21537,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1226
+ "__id__": 1259
},
"propertyPath": [
"_lrot"
@@ -21143,7 +21553,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1226
+ "__id__": 1259
},
"propertyPath": [
"_euler"
@@ -21158,7 +21568,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1231
+ "__id__": 1264
},
"propertyPath": [
"_top"
@@ -21174,7 +21584,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1233
+ "__id__": 1266
},
"propertyPath": [
"_active"
@@ -21190,7 +21600,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1231
+ "__id__": 1264
},
"propertyPath": [
"_left"
@@ -21200,7 +21610,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1236
+ "__id__": 1269
},
"propertyPath": [
"_contentSize"
@@ -21220,7 +21630,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1238
+ "__id__": 1271
},
"propertyPath": [
"_contentSize"
@@ -21240,7 +21650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1240
+ "__id__": 1273
},
"propertyPath": [
"_contentSize"
@@ -21260,7 +21670,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1231
+ "__id__": 1264
},
"propertyPath": [
"_right"
@@ -21270,7 +21680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1243
+ "__id__": 1276
},
"propertyPath": [
"_alignFlags"
@@ -21286,7 +21696,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1243
+ "__id__": 1276
},
"propertyPath": [
"_top"
@@ -21296,7 +21706,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1243
+ "__id__": 1276
},
"propertyPath": [
"_bottom"
@@ -21306,7 +21716,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1247
+ "__id__": 1280
},
"propertyPath": [
"_lpos"
@@ -21327,7 +21737,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1231
+ "__id__": 1264
},
"propertyPath": [
"_alignFlags"
@@ -21337,7 +21747,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1231
+ "__id__": 1264
},
"propertyPath": [
"_bottom"
@@ -21347,7 +21757,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1251
+ "__id__": 1284
},
"propertyPath": [
"_name"
@@ -21363,7 +21773,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1251
+ "__id__": 1284
},
"propertyPath": [
"_lpos"
@@ -21378,7 +21788,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1251
+ "__id__": 1284
},
"propertyPath": [
"_lrot"
@@ -21394,7 +21804,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1251
+ "__id__": 1284
},
"propertyPath": [
"_euler"
@@ -21409,7 +21819,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1256
+ "__id__": 1289
},
"propertyPath": [
"_contentSize"
@@ -21429,7 +21839,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1258
+ "__id__": 1291
},
"propertyPath": [
"_contentSize"
@@ -21449,7 +21859,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1260
+ "__id__": 1293
},
"propertyPath": [
"_contentSize"
@@ -21469,7 +21879,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1262
+ "__id__": 1295
},
"propertyPath": [
"_contentSize"
@@ -21489,7 +21899,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1264
+ "__id__": 1297
},
"propertyPath": [
"_active"
@@ -21505,7 +21915,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1251
+ "__id__": 1284
},
"propertyPath": [
"_active"
@@ -21518,23 +21928,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1208
+ "__id__": 1241
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1267
+ "__id__": 1300
},
{
- "__id__": 1269
+ "__id__": 1302
},
{
- "__id__": 1271
+ "__id__": 1304
}
],
"_prefab": {
- "__id__": 1273
+ "__id__": 1306
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -21571,11 +21981,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1266
+ "__id__": 1299
},
"_enabled": true,
"__prefab": {
- "__id__": 1268
+ "__id__": 1301
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21599,11 +22009,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1266
+ "__id__": 1299
},
"_enabled": true,
"__prefab": {
- "__id__": 1270
+ "__id__": 1303
},
"_alignFlags": 18,
"_target": null,
@@ -21635,11 +22045,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1266
+ "__id__": 1299
},
"_enabled": false,
"__prefab": {
- "__id__": 1272
+ "__id__": 1305
},
"_resizeMode": 0,
"_layoutType": 1,
@@ -21684,17 +22094,17 @@
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
- "__id__": 1208
+ "__id__": 1241
},
"_prefab": {
- "__id__": 1275
+ "__id__": 1308
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1274
+ "__id__": 1307
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -21702,7 +22112,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 1276
+ "__id__": 1309
},
"targetOverrides": null
},
@@ -21715,21 +22125,21 @@
"mountedChildren": [],
"mountedComponents": [
{
- "__id__": 1277
+ "__id__": 1310
}
],
"propertyOverrides": [
{
- "__id__": 1281
+ "__id__": 1314
},
{
- "__id__": 1283
+ "__id__": 1316
},
{
- "__id__": 1284
+ "__id__": 1317
},
{
- "__id__": 1285
+ "__id__": 1318
}
],
"removedComponents": []
@@ -21737,11 +22147,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 1278
+ "__id__": 1311
},
"components": [
{
- "__id__": 1279
+ "__id__": 1312
}
]
},
@@ -21757,15 +22167,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 1274
+ "__id__": 1307
}
},
"node": {
- "__id__": 1274
+ "__id__": 1307
},
"_enabled": true,
"__prefab": {
- "__id__": 1280
+ "__id__": 1313
},
"_alignFlags": 2,
"_target": null,
@@ -21794,7 +22204,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1282
+ "__id__": 1315
},
"propertyPath": [
"_name"
@@ -21810,7 +22220,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1282
+ "__id__": 1315
},
"propertyPath": [
"_lpos"
@@ -21825,7 +22235,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1282
+ "__id__": 1315
},
"propertyPath": [
"_lrot"
@@ -21841,7 +22251,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 1282
+ "__id__": 1315
},
"propertyPath": [
"_euler"
@@ -21859,11 +22269,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1208
+ "__id__": 1241
},
"_enabled": true,
"__prefab": {
- "__id__": 1287
+ "__id__": 1320
},
"_contentSize": {
"__type__": "cc.Size",
@@ -21887,11 +22297,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1208
+ "__id__": 1241
},
"_enabled": true,
"__prefab": {
- "__id__": 1289
+ "__id__": 1322
},
"_alignFlags": 45,
"_target": null,
@@ -21923,11 +22333,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1208
+ "__id__": 1241
},
"_enabled": false,
"__prefab": {
- "__id__": 1291
+ "__id__": 1324
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -21961,11 +22371,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1208
+ "__id__": 1241
},
"_enabled": true,
"__prefab": {
- "__id__": 1293
+ "__id__": 1326
},
"_id": ""
},
@@ -21996,26 +22406,26 @@
},
"_children": [
{
- "__id__": 1296
+ "__id__": 1329
},
{
- "__id__": 1302
+ "__id__": 1335
},
{
- "__id__": 1310
+ "__id__": 1343
}
],
"_active": true,
"_components": [
{
- "__id__": 1320
+ "__id__": 1353
},
{
- "__id__": 1322
+ "__id__": 1355
}
],
"_prefab": {
- "__id__": 1324
+ "__id__": 1357
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22052,20 +22462,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1295
+ "__id__": 1328
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1297
+ "__id__": 1330
},
{
- "__id__": 1299
+ "__id__": 1332
}
],
"_prefab": {
- "__id__": 1301
+ "__id__": 1334
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22102,11 +22512,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1296
+ "__id__": 1329
},
"_enabled": true,
"__prefab": {
- "__id__": 1298
+ "__id__": 1331
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22130,11 +22540,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1296
+ "__id__": 1329
},
"_enabled": true,
"__prefab": {
- "__id__": 1300
+ "__id__": 1333
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22188,23 +22598,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1295
+ "__id__": 1328
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 1303
+ "__id__": 1336
},
{
- "__id__": 1305
+ "__id__": 1338
},
{
- "__id__": 1307
+ "__id__": 1340
}
],
"_prefab": {
- "__id__": 1309
+ "__id__": 1342
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22241,11 +22651,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1302
+ "__id__": 1335
},
"_enabled": true,
"__prefab": {
- "__id__": 1304
+ "__id__": 1337
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22269,11 +22679,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1302
+ "__id__": 1335
},
"_enabled": true,
"__prefab": {
- "__id__": 1306
+ "__id__": 1339
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22317,11 +22727,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1302
+ "__id__": 1335
},
"_enabled": true,
"__prefab": {
- "__id__": 1308
+ "__id__": 1341
},
"_alignFlags": 40,
"_target": null,
@@ -22366,26 +22776,26 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1295
+ "__id__": 1328
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1311
+ "__id__": 1344
},
{
- "__id__": 1313
+ "__id__": 1346
},
{
- "__id__": 1315
+ "__id__": 1348
},
{
- "__id__": 1317
+ "__id__": 1350
}
],
"_prefab": {
- "__id__": 1319
+ "__id__": 1352
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22422,11 +22832,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1310
+ "__id__": 1343
},
"_enabled": true,
"__prefab": {
- "__id__": 1312
+ "__id__": 1345
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22450,11 +22860,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1310
+ "__id__": 1343
},
"_enabled": true,
"__prefab": {
- "__id__": 1314
+ "__id__": 1347
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22518,11 +22928,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1310
+ "__id__": 1343
},
"_enabled": true,
"__prefab": {
- "__id__": 1316
+ "__id__": 1349
},
"_params": [],
"_dataID": "",
@@ -22538,11 +22948,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1310
+ "__id__": 1343
},
"_enabled": true,
"__prefab": {
- "__id__": 1318
+ "__id__": 1351
},
"_alignFlags": 45,
"_target": null,
@@ -22587,11 +22997,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1295
+ "__id__": 1328
},
"_enabled": true,
"__prefab": {
- "__id__": 1321
+ "__id__": 1354
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22615,11 +23025,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1295
+ "__id__": 1328
},
"_enabled": true,
"__prefab": {
- "__id__": 1323
+ "__id__": 1356
},
"_alignFlags": 1,
"_target": null,
@@ -22668,26 +23078,26 @@
},
"_children": [
{
- "__id__": 1326
+ "__id__": 1359
},
{
- "__id__": 1342
+ "__id__": 1375
},
{
- "__id__": 1352
+ "__id__": 1385
}
],
"_active": true,
"_components": [
{
- "__id__": 1364
+ "__id__": 1397
},
{
- "__id__": 1366
+ "__id__": 1399
}
],
"_prefab": {
- "__id__": 1368
+ "__id__": 1401
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22724,24 +23134,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1325
+ "__id__": 1358
},
"_children": [
{
- "__id__": 1327
+ "__id__": 1360
},
{
- "__id__": 1333
+ "__id__": 1366
}
],
"_active": true,
"_components": [
{
- "__id__": 1339
+ "__id__": 1372
}
],
"_prefab": {
- "__id__": 1341
+ "__id__": 1374
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22778,20 +23188,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1326
+ "__id__": 1359
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1328
+ "__id__": 1361
},
{
- "__id__": 1330
+ "__id__": 1363
}
],
"_prefab": {
- "__id__": 1332
+ "__id__": 1365
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22828,11 +23238,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1327
+ "__id__": 1360
},
"_enabled": true,
"__prefab": {
- "__id__": 1329
+ "__id__": 1362
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22856,11 +23266,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1327
+ "__id__": 1360
},
"_enabled": true,
"__prefab": {
- "__id__": 1331
+ "__id__": 1364
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -22917,20 +23327,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1326
+ "__id__": 1359
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1334
+ "__id__": 1367
},
{
- "__id__": 1336
+ "__id__": 1369
}
],
"_prefab": {
- "__id__": 1338
+ "__id__": 1371
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -22967,11 +23377,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1333
+ "__id__": 1366
},
"_enabled": true,
"__prefab": {
- "__id__": 1335
+ "__id__": 1368
},
"_contentSize": {
"__type__": "cc.Size",
@@ -22995,11 +23405,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1333
+ "__id__": 1366
},
"_enabled": true,
"__prefab": {
- "__id__": 1337
+ "__id__": 1370
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23076,11 +23486,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1326
+ "__id__": 1359
},
"_enabled": true,
"__prefab": {
- "__id__": 1340
+ "__id__": 1373
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23117,21 +23527,21 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1325
+ "__id__": 1358
},
"_children": [
{
- "__id__": 1343
+ "__id__": 1376
}
],
"_active": false,
"_components": [
{
- "__id__": 1349
+ "__id__": 1382
}
],
"_prefab": {
- "__id__": 1351
+ "__id__": 1384
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23168,20 +23578,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1342
+ "__id__": 1375
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1344
+ "__id__": 1377
},
{
- "__id__": 1346
+ "__id__": 1379
}
],
"_prefab": {
- "__id__": 1348
+ "__id__": 1381
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23218,11 +23628,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1343
+ "__id__": 1376
},
"_enabled": true,
"__prefab": {
- "__id__": 1345
+ "__id__": 1378
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23246,11 +23656,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1343
+ "__id__": 1376
},
"_enabled": true,
"__prefab": {
- "__id__": 1347
+ "__id__": 1380
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23327,11 +23737,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1342
+ "__id__": 1375
},
"_enabled": true,
"__prefab": {
- "__id__": 1350
+ "__id__": 1383
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23368,24 +23778,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1325
+ "__id__": 1358
},
"_children": [
{
- "__id__": 1353
+ "__id__": 1386
}
],
"_active": true,
"_components": [
{
- "__id__": 1359
+ "__id__": 1392
},
{
- "__id__": 1361
+ "__id__": 1394
}
],
"_prefab": {
- "__id__": 1363
+ "__id__": 1396
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23422,20 +23832,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1352
+ "__id__": 1385
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 1354
+ "__id__": 1387
},
{
- "__id__": 1356
+ "__id__": 1389
}
],
"_prefab": {
- "__id__": 1358
+ "__id__": 1391
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -23472,11 +23882,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1353
+ "__id__": 1386
},
"_enabled": true,
"__prefab": {
- "__id__": 1355
+ "__id__": 1388
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23500,11 +23910,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1353
+ "__id__": 1386
},
"_enabled": true,
"__prefab": {
- "__id__": 1357
+ "__id__": 1390
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23561,11 +23971,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1352
+ "__id__": 1385
},
"_enabled": true,
"__prefab": {
- "__id__": 1360
+ "__id__": 1393
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23589,11 +23999,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1352
+ "__id__": 1385
},
"_enabled": true,
"__prefab": {
- "__id__": 1362
+ "__id__": 1395
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -23670,11 +24080,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1325
+ "__id__": 1358
},
"_enabled": true,
"__prefab": {
- "__id__": 1365
+ "__id__": 1398
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23698,11 +24108,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 1325
+ "__id__": 1358
},
"_enabled": true,
"__prefab": {
- "__id__": 1367
+ "__id__": 1400
},
"_alignFlags": 41,
"_target": null,
@@ -23751,7 +24161,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1370
+ "__id__": 1403
},
"_contentSize": {
"__type__": "cc.Size",
@@ -23779,7 +24189,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1372
+ "__id__": 1405
},
"_alignFlags": 21,
"_target": null,
@@ -23815,16 +24225,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1374
+ "__id__": 1407
},
"debugMode": false,
"showMemoryPanel": true,
"start_btn": null,
"time_node": {
- "__id__": 1325
+ "__id__": 1358
},
"tooltip": {
- "__id__": 1295
+ "__id__": 1328
},
"_id": ""
},
@@ -23842,23 +24252,23 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1376
+ "__id__": 1409
},
"cardPanNode": {
- "__id__": 1000
+ "__id__": 1033
},
"cards_node": {
- "__id__": 1058
+ "__id__": 1091
},
"cardPrefab": {
"__uuid__": "f2f9a3e0-d0f5-46f4-84bd-dd54c2248470",
"__expectedType__": "cc.Prefab"
},
"closeCards": {
- "__id__": 1077
+ "__id__": 1110
},
"nock_node": {
- "__id__": 873
+ "__id__": 906
},
"showHeros": {
"__id__": 507
@@ -23873,64 +24283,64 @@
"__id__": 539
},
"showEquips": {
- "__id__": 595
+ "__id__": 607
},
"equipsPanNode": {
- "__id__": 913
+ "__id__": 946
},
"equipsBoxNode": {
- "__id__": 971
+ "__id__": 1004
},
"equipPrefab": {
"__uuid__": "f30f91b1-3100-4d9e-befb-cdde5f86e6f8",
"__expectedType__": "cc.Prefab"
},
"showEquipsCost": {
- "__id__": 627
+ "__id__": 639
},
"showSkills": {
- "__id__": 687
+ "__id__": 706
},
"skillPanNode": {
- "__id__": 1119
+ "__id__": 1152
},
"skillBoxNode": {
- "__id__": 1177
+ "__id__": 1210
},
"sCardPrefab": {
"__uuid__": "78a5b2d1-a34b-4190-895d-7d0aa22037cc",
"__expectedType__": "cc.Prefab"
},
"showSkillsCost": {
- "__id__": 719
+ "__id__": 738
},
"showShop": {
- "__id__": 775
+ "__id__": 801
},
"shopPanNode": {
- "__id__": 1208
+ "__id__": 1241
},
"shopBoxNode": {
- "__id__": 1266
+ "__id__": 1299
},
"itemPrefab": {
"__uuid__": "abae16b3-c2a2-4971-95b1-fc121f769554",
"__expectedType__": "cc.Prefab"
},
"showShopCost": {
- "__id__": 807
+ "__id__": 833
},
"skill_refresh": {
- "__id__": 1185
+ "__id__": 1218
},
"equip_refresh": {
- "__id__": 979
+ "__id__": 1012
},
"shop_refresh": {
- "__id__": 1274
+ "__id__": 1307
},
"cards_chou": {
- "__id__": 1067
+ "__id__": 1100
},
"coins_node": {
"__id__": 172
@@ -23957,7 +24367,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1378
+ "__id__": 1411
},
"_id": ""
},
@@ -23975,7 +24385,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1380
+ "__id__": 1413
},
"debugMode": false,
"_id": ""
@@ -23994,7 +24404,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1382
+ "__id__": 1415
},
"skill_box": {
"__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343",
@@ -24016,7 +24426,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 1384
+ "__id__": 1417
},
"equip_box": {
"__uuid__": "66d7902d-2a85-43d5-8cbb-671cc7dbb275",
@@ -24043,75 +24453,75 @@
"instance": null,
"targetOverrides": [
{
- "__id__": 1386
+ "__id__": 1419
},
{
- "__id__": 1388
+ "__id__": 1421
},
{
- "__id__": 1390
+ "__id__": 1423
},
{
- "__id__": 1392
+ "__id__": 1425
}
],
"nestedPrefabInstanceRoots": [
{
- "__id__": 1274
+ "__id__": 1307
},
{
- "__id__": 1217
+ "__id__": 1250
},
{
- "__id__": 1222
+ "__id__": 1255
},
{
- "__id__": 1185
+ "__id__": 1218
},
{
- "__id__": 1128
+ "__id__": 1161
},
{
- "__id__": 1133
+ "__id__": 1166
},
{
- "__id__": 1077
+ "__id__": 1110
},
{
- "__id__": 1067
+ "__id__": 1100
},
{
- "__id__": 1009
+ "__id__": 1042
},
{
- "__id__": 1014
+ "__id__": 1047
},
{
- "__id__": 979
+ "__id__": 1012
},
{
- "__id__": 922
+ "__id__": 955
},
{
- "__id__": 927
+ "__id__": 960
},
{
- "__id__": 775
+ "__id__": 801
},
{
- "__id__": 820
+ "__id__": 846
},
{
- "__id__": 687
+ "__id__": 706
},
{
- "__id__": 732
+ "__id__": 751
},
{
- "__id__": 595
+ "__id__": 607
},
{
- "__id__": 640
+ "__id__": 652
},
{
"__id__": 507
@@ -24166,7 +24576,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 1375
+ "__id__": 1408
},
"sourceInfo": null,
"propertyPath": [
@@ -24176,7 +24586,7 @@
"__id__": 507
},
"targetInfo": {
- "__id__": 1387
+ "__id__": 1420
}
},
{
@@ -24188,17 +24598,17 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 1375
+ "__id__": 1408
},
"sourceInfo": null,
"propertyPath": [
"showEquipsCost"
],
"target": {
- "__id__": 595
+ "__id__": 607
},
"targetInfo": {
- "__id__": 1389
+ "__id__": 1422
}
},
{
@@ -24210,17 +24620,17 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 1375
+ "__id__": 1408
},
"sourceInfo": null,
"propertyPath": [
"showSkillsCost"
],
"target": {
- "__id__": 687
+ "__id__": 706
},
"targetInfo": {
- "__id__": 1391
+ "__id__": 1424
}
},
{
@@ -24232,17 +24642,17 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 1375
+ "__id__": 1408
},
"sourceInfo": null,
"propertyPath": [
"showShopCost"
],
"target": {
- "__id__": 775
+ "__id__": 801
},
"targetInfo": {
- "__id__": 1393
+ "__id__": 1426
}
},
{
diff --git a/assets/resources/gui/ui3.plist b/assets/resources/gui/ui3.plist
index 350643ba..740bc96d 100644
--- a/assets/resources/gui/ui3.plist
+++ b/assets/resources/gui/ui3.plist
@@ -17,7 +17,7 @@
spriteSourceSize
{64,66}
textureRect
- {{1819,1107},{64,66}}
+ {{1426,649},{64,66}}
textureRotated
@@ -34,7 +34,7 @@
spriteSourceSize
{64,66}
textureRect
- {{1834,1175},{64,66}}
+ {{1920,726},{64,66}}
textureRotated
@@ -51,9 +51,9 @@
spriteSourceSize
{60,85}
textureRect
- {{678,1249},{60,85}}
+ {{1654,1140},{60,85}}
textureRotated
-
+
ArrowIconButton_01_Prev.png
@@ -68,9 +68,9 @@
spriteSourceSize
{60,85}
textureRect
- {{740,1259},{60,85}}
+ {{1920,595},{60,85}}
textureRotated
-
+
ArrowIconButton_02_Next.png
@@ -85,9 +85,9 @@
spriteSourceSize
{46,76}
textureRect
- {{1926,511},{46,76}}
+ {{1872,669},{46,76}}
textureRotated
-
+
ArrowIconButton_02_Prev.png
@@ -102,7 +102,7 @@
spriteSourceSize
{46,76}
textureRect
- {{1799,756},{46,76}}
+ {{1872,747},{46,76}}
textureRotated
@@ -119,9 +119,9 @@
spriteSourceSize
{57,80}
textureRect
- {{1844,394},{57,80}}
+ {{1686,450},{57,80}}
textureRotated
-
+
Artboard 40.png
@@ -153,9 +153,9 @@
spriteSourceSize
{145,82}
textureRect
- {{1644,252},{115,64}}
+ {{117,1304},{115,64}}
textureRotated
-
+
Artboard 45.png
@@ -170,9 +170,9 @@
spriteSourceSize
{152,76}
textureRect
- {{897,978},{124,64}}
+ {{1173,1292},{124,64}}
textureRotated
-
+
Artboard 62.png
@@ -187,9 +187,9 @@
spriteSourceSize
{112,117}
textureRect
- {{1075,1055},{106,113}}
+ {{1299,1292},{106,113}}
textureRotated
-
+
Badge_Value_02.png
@@ -204,9 +204,9 @@
spriteSourceSize
{104,108}
textureRect
- {{1297,1151},{104,108}}
+ {{1927,485},{104,108}}
textureRotated
-
+
BaseFrame_Border_Rectangle_H80_Gradient.png
@@ -221,9 +221,94 @@
spriteSourceSize
{60,386}
textureRect
- {{320,693},{60,386}}
+ {{157,879},{60,386}}
textureRotated
-
+
+
+ BubbleFrame01_Hexagon_Bg_Blue.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {250,243}
+ spriteSourceSize
+ {250,243}
+ textureRect
+ {{320,731},{250,243}}
+ textureRotated
+
+
+ BubbleFrame01_Hexagon_Bg_Green.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {250,243}
+ spriteSourceSize
+ {250,243}
+ textureRect
+ {{219,976},{250,243}}
+ textureRotated
+
+
+ BubbleFrame01_Hexagon_Bg_Yellow.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {250,243}
+ spriteSourceSize
+ {250,243}
+ textureRect
+ {{1007,431},{250,243}}
+ textureRotated
+
+
+ BubbleFrame01_Hexagon_FocusBorder.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {254,244}
+ spriteSourceSize
+ {254,244}
+ textureRect
+ {{1497,65},{254,244}}
+ textureRotated
+
+
+ BubbleFrame01_Hexagon_FocusGlow.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {306,298}
+ spriteSourceSize
+ {306,298}
+ textureRect
+ {{320,431},{306,298}}
+ textureRotated
+
BubbleFrame04_White_Arrow.png
@@ -238,9 +323,9 @@
spriteSourceSize
{38,35}
textureRect
- {{1797,1188},{38,35}}
+ {{1836,1384},{38,35}}
textureRotated
-
+
BubbleFrame04_White_Bg.png
@@ -255,9 +340,9 @@
spriteSourceSize
{64,72}
textureRect
- {{1753,1114},{64,72}}
+ {{1964,155},{64,72}}
textureRotated
-
+
Button_Convex_Rectangle_01_Gray.png
@@ -272,7 +357,7 @@
spriteSourceSize
{40,48}
textureRect
- {{1950,663},{40,48}}
+ {{1010,1358},{40,48}}
textureRotated
@@ -289,9 +374,9 @@
spriteSourceSize
{40,48}
textureRect
- {{1905,751},{40,48}}
+ {{905,634},{40,48}}
textureRotated
-
+
Button_Convex_Rectangle_01_H58_Gray.png
@@ -306,9 +391,9 @@
spriteSourceSize
{50,58}
textureRect
- {{1309,597},{50,58}}
+ {{1986,657},{50,58}}
textureRotated
-
+
CardFrame03_d.png
@@ -323,7 +408,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1834,1243},{64,64}}
+ {{1866,956},{64,64}}
textureRotated
@@ -340,7 +425,7 @@
spriteSourceSize
{64,67}
textureRect
- {{1811,1038},{64,67}}
+ {{1920,657},{64,67}}
textureRotated
@@ -357,7 +442,7 @@
spriteSourceSize
{40,40}
textureRect
- {{1905,801},{40,40}}
+ {{1204,1358},{40,40}}
textureRotated
@@ -374,7 +459,7 @@
spriteSourceSize
{56,56}
textureRect
- {{1892,635},{56,56}}
+ {{1797,1200},{56,56}}
textureRotated
@@ -391,7 +476,7 @@
spriteSourceSize
{108,108}
textureRect
- {{1720,534},{108,108}}
+ {{1430,821},{108,108}}
textureRotated
@@ -408,7 +493,7 @@
spriteSourceSize
{108,108}
textureRect
- {{1720,534},{108,108}}
+ {{1430,821},{108,108}}
textureRotated
@@ -442,7 +527,7 @@
spriteSourceSize
{56,63}
textureRect
- {{1243,1287},{56,63}}
+ {{1196,366},{56,63}}
textureRotated
@@ -459,7 +544,7 @@
spriteSourceSize
{48,189}
textureRect
- {{877,431},{48,189}}
+ {{1259,593},{48,189}}
textureRotated
@@ -476,9 +561,9 @@
spriteSourceSize
{48,52}
textureRect
- {{1788,834},{48,52}}
+ {{1986,717},{48,52}}
textureRotated
-
+
Dropdown_01_Bg.png
@@ -493,9 +578,9 @@
spriteSourceSize
{29,30}
textureRect
- {{1917,1057},{29,30}}
+ {{1996,1274},{29,30}}
textureRotated
-
+
Dropdown_01_Focus.png
@@ -510,7 +595,7 @@
spriteSourceSize
{31,30}
textureRect
- {{596,1075},{31,30}}
+ {{1963,1274},{31,30}}
textureRotated
@@ -527,7 +612,7 @@
spriteSourceSize
{27,20}
textureRect
- {{1866,722},{27,20}}
+ {{157,1267},{27,20}}
textureRotated
@@ -544,7 +629,7 @@
spriteSourceSize
{42,37}
textureRect
- {{1853,922},{42,37}}
+ {{1944,1123},{42,37}}
textureRotated
@@ -561,9 +646,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1494,533},{114,116}}
+ {{429,1403},{114,116}}
textureRotated
-
+
Effect_Lihgt_02.png
@@ -595,7 +680,7 @@
spriteSourceSize
{38,42}
textureRect
- {{2004,571},{38,42}}
+ {{1836,1340},{38,42}}
textureRotated
@@ -612,7 +697,7 @@
spriteSourceSize
{183,183}
textureRect
- {{1429,162},{183,183}}
+ {{572,736},{183,183}}
textureRotated
@@ -629,7 +714,7 @@
spriteSourceSize
{183,183}
textureRect
- {{699,490},{183,183}}
+ {{757,736},{183,183}}
textureRotated
@@ -646,7 +731,7 @@
spriteSourceSize
{299,299}
textureRect
- {{1,879},{299,299}}
+ {{1196,65},{299,299}}
textureRotated
@@ -663,7 +748,7 @@
spriteSourceSize
{231,225}
textureRect
- {{1196,162},{231,225}}
+ {{1259,366},{231,225}}
textureRotated
@@ -680,9 +765,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1747,1052},{60,62}}
+ {{1922,864},{60,62}}
textureRotated
-
+
ItemFrame00~03_BgGlow.png
@@ -697,7 +782,7 @@
spriteSourceSize
{133,133}
textureRect
- {{503,796},{133,133}}
+ {{1818,223},{133,133}}
textureRotated
@@ -714,7 +799,7 @@
spriteSourceSize
{50,39}
textureRect
- {{1780,1305},{50,39}}
+ {{1654,1360},{50,39}}
textureRotated
@@ -731,9 +816,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1830,534},{60,62}}
+ {{1866,1022},{60,62}}
textureRotated
-
+
ItemFrame00~03_CornerDeco.png
@@ -748,7 +833,7 @@
spriteSourceSize
{110,110}
textureRect
- {{1732,318},{110,110}}
+ {{317,1407},{110,110}}
textureRotated
@@ -765,7 +850,7 @@
spriteSourceSize
{76,78}
textureRect
- {{1926,431},{76,78}}
+ {{1654,1280},{76,78}}
textureRotated
@@ -782,7 +867,7 @@
spriteSourceSize
{52,52}
textureRect
- {{1014,1168},{52,52}}
+ {{1868,902},{52,52}}
textureRotated
@@ -799,7 +884,7 @@
spriteSourceSize
{52,52}
textureRect
- {{1950,559},{52,52}}
+ {{1854,1084},{52,52}}
textureRotated
@@ -816,7 +901,7 @@
spriteSourceSize
{48,48}
textureRect
- {{1950,613},{48,48}}
+ {{1855,1138},{48,48}}
textureRotated
@@ -833,7 +918,7 @@
spriteSourceSize
{40,40}
textureRect
- {{1979,985},{40,40}}
+ {{1830,1421},{40,40}}
textureRotated
@@ -850,7 +935,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1610,532},{108,116}}
+ {{1316,703},{108,116}}
textureRotated
@@ -867,7 +952,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1644,122},{128,104}}
+ {{309,1277},{128,104}}
textureRotated
@@ -884,7 +969,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1372,527},{120,118}}
+ {{471,1159},{120,118}}
textureRotated
@@ -901,9 +986,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1523,1017},{112,116}}
+ {{1198,706},{112,116}}
textureRotated
-
+
ItemIcon_Coin_Silver.png
@@ -918,9 +1003,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1614,318},{112,116}}
+ {{1382,1400},{112,116}}
textureRotated
-
+
ItemIcon_Compass.png
@@ -935,7 +1020,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1172,649},{120,120}}
+ {{1173,1170},{120,120}}
textureRotated
@@ -952,9 +1037,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1073,795},{128,102}}
+ {{677,1413},{128,102}}
textureRotated
-
+
ItemIcon_Dungeon.png
@@ -969,9 +1054,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1294,649},{124,108}}
+ {{1304,821},{124,108}}
textureRotated
-
+
ItemIcon_Friend.png
@@ -986,7 +1071,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1291,775},{124,108}}
+ {{1540,821},{124,108}}
textureRotated
@@ -1003,7 +1088,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1494,651},{116,120}}
+ {{1411,1169},{116,120}}
textureRotated
@@ -1020,9 +1105,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1494,403},{128,112}}
+ {{1068,706},{128,112}}
textureRotated
-
+
ItemIcon_Gear_Bow.png
@@ -1037,9 +1122,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1635,886},{108,112}}
+ {{1540,1071},{108,112}}
textureRotated
-
+
ItemIcon_Gear_Hammer.png
@@ -1054,7 +1139,7 @@
spriteSourceSize
{128,128}
textureRect
- {{422,1219},{124,120}}
+ {{183,1277},{124,120}}
textureRotated
@@ -1071,9 +1156,9 @@
spriteSourceSize
{128,128}
textureRect
- {{892,1106},{114,120}}
+ {{1295,1170},{114,120}}
textureRotated
-
+
ItemIcon_Gear_Sword.png
@@ -1088,9 +1173,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1637,1000},{108,112}}
+ {{1540,1291},{108,112}}
textureRotated
-
+
ItemIcon_Gift_Purple.png
@@ -1105,9 +1190,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1523,1135},{116,108}}
+ {{1620,1401},{116,108}}
textureRotated
-
+
ItemIcon_Gift_Yellow.png
@@ -1122,9 +1207,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1612,650},{116,108}}
+ {{1636,586},{116,108}}
textureRotated
-
+
ItemIcon_Map.png
@@ -1139,7 +1224,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1932,81},{122,110}}
+ {{1540,947},{122,110}}
textureRotated
@@ -1156,9 +1241,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1810,201},{120,104}}
+ {{1650,696},{120,104}}
textureRotated
-
+
ItemIcon_Medal_Bronze_2.png
@@ -1173,7 +1258,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1511,773},{120,104}}
+ {{1650,818},{120,104}}
textureRotated
@@ -1190,7 +1275,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1060,665},{128,110}}
+ {{1094,1040},{128,110}}
textureRotated
@@ -1207,7 +1292,7 @@
spriteSourceSize
{128,128}
textureRect
- {{963,976},{128,110}}
+ {{1182,910},{128,110}}
textureRotated
@@ -1224,9 +1309,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1075,925},{128,104}}
+ {{547,1411},{128,104}}
textureRotated
-
+
ItemIcon_Medal_Silver_2.png
@@ -1241,7 +1326,7 @@
spriteSourceSize
{128,128}
textureRect
- {{802,1222},{128,104}}
+ {{1206,1040},{128,104}}
textureRotated
@@ -1258,7 +1343,7 @@
spriteSourceSize
{128,128}
textureRect
- {{775,978},{120,122}}
+ {{415,1279},{120,122}}
textureRotated
@@ -1275,7 +1360,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1372,403},{120,122}}
+ {{942,794},{120,122}}
textureRotated
@@ -1292,9 +1377,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1297,1027},{122,108}}
+ {{1529,1181},{122,108}}
textureRotated
-
+
ItemIcon_Ranking_Gold.png
@@ -1309,9 +1394,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1401,775},{122,108}}
+ {{1745,462},{122,108}}
textureRotated
-
+
ItemIcon_Scroll.png
@@ -1326,7 +1411,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1932,205},{110,120}}
+ {{1754,572},{110,120}}
textureRotated
@@ -1343,9 +1428,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1401,899},{122,112}}
+ {{1496,1401},{122,112}}
textureRotated
-
+
ItemIcon_Shop.png
@@ -1360,9 +1445,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1617,768},{116,106}}
+ {{1422,931},{116,106}}
textureRotated
-
+
ItemIcon_Skill_Attack.png
@@ -1377,7 +1462,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1641,1114},{110,112}}
+ {{1756,816},{110,112}}
textureRotated
@@ -1394,9 +1479,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1070,1170},{124,116}}
+ {{942,676},{124,116}}
textureRotated
-
+
ItemIcon_Skill_Damage.png
@@ -1411,7 +1496,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1177,771},{128,112}}
+ {{1068,910},{128,112}}
textureRotated
@@ -1428,7 +1513,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1181,901},{128,112}}
+ {{1312,1039},{128,112}}
textureRotated
@@ -1445,9 +1530,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1407,1145},{108,114}}
+ {{1652,940},{108,114}}
textureRotated
-
+
ItemIcon_Skill_Health.png
@@ -1462,9 +1547,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1295,901},{124,104}}
+ {{1414,1291},{124,104}}
textureRotated
-
+
ItemIcon_Skull_Boss.png
@@ -1479,7 +1564,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1068,431},{126,112}}
+ {{1254,1400},{126,112}}
textureRotated
@@ -1496,7 +1581,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1183,1031},{126,112}}
+ {{1426,1039},{126,112}}
textureRotated
@@ -1513,7 +1598,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1407,1023},{114,120}}
+ {{1756,694},{114,120}}
textureRotated
@@ -1530,7 +1615,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1810,81},{120,118}}
+ {{1010,1400},{120,118}}
textureRotated
@@ -1547,9 +1632,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1515,895},{120,118}}
+ {{1132,1400},{120,118}}
textureRotated
-
+
ItemIcon_Ticket_Gold.png
@@ -1564,9 +1649,9 @@
spriteSourceSize
{128,128}
textureRect
- {{908,1222},{128,102}}
+ {{1806,358},{128,102}}
textureRotated
-
+
ItemIcon_Timer_Gold.png
@@ -1581,9 +1666,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1188,1159},{106,126}}
+ {{1294,931},{106,126}}
textureRotated
-
+
ItemIcon_Trophy.png
@@ -1598,7 +1683,7 @@
spriteSourceSize
{128,128}
textureRect
- {{548,1249},{128,98}}
+ {{866,1418},{128,98}}
textureRotated
@@ -1615,9 +1700,9 @@
spriteSourceSize
{61,39}
textureRect
- {{1761,252},{61,39}}
+ {{1094,1170},{61,39}}
textureRotated
-
+
Label_Flag_01_Single_Blue.png
@@ -1632,7 +1717,7 @@
spriteSourceSize
{52,75}
textureRect
- {{1747,975},{52,75}}
+ {{1866,592},{52,75}}
textureRotated
@@ -1649,7 +1734,7 @@
spriteSourceSize
{52,75}
textureRect
- {{1780,1228},{52,75}}
+ {{1868,825},{52,75}}
textureRotated
@@ -1666,7 +1751,7 @@
spriteSourceSize
{52,75}
textureRect
- {{1799,884},{52,75}}
+ {{1984,794},{52,75}}
textureRotated
@@ -1683,7 +1768,7 @@
spriteSourceSize
{52,75}
textureRect
- {{1801,961},{52,75}}
+ {{1984,871},{52,75}}
textureRotated
@@ -1700,7 +1785,7 @@
spriteSourceSize
{48,29}
textureRect
- {{2013,1},{48,29}}
+ {{2007,595},{48,29}}
textureRotated
@@ -1717,7 +1802,7 @@
spriteSourceSize
{146,146}
textureRect
- {{884,481},{142,144}}
+ {{1492,367},{142,144}}
textureRotated
@@ -1734,7 +1819,7 @@
spriteSourceSize
{146,146}
textureRect
- {{708,675},{144,142}}
+ {{739,1209},{144,142}}
textureRotated
@@ -1751,7 +1836,7 @@
spriteSourceSize
{146,146}
textureRect
- {{854,690},{144,142}}
+ {{922,921},{144,142}}
textureRotated
@@ -1768,7 +1853,7 @@
spriteSourceSize
{146,146}
textureRect
- {{596,1107},{144,140}}
+ {{1818,81},{144,140}}
textureRotated
@@ -1785,9 +1870,9 @@
spriteSourceSize
{146,146}
textureRect
- {{1196,445},{142,144}}
+ {{885,1212},{142,144}}
textureRotated
-
+
Loading_Circle_3.png
@@ -1802,7 +1887,7 @@
spriteSourceSize
{146,146}
textureRect
- {{784,834},{142,142}}
+ {{1492,513},{142,142}}
textureRotated
@@ -1819,7 +1904,7 @@
spriteSourceSize
{146,146}
textureRect
- {{302,1060},{146,142}}
+ {{774,921},{146,142}}
textureRotated
@@ -1836,7 +1921,7 @@
spriteSourceSize
{146,146}
textureRect
- {{483,931},{144,142}}
+ {{741,1065},{144,142}}
textureRotated
@@ -1853,7 +1938,7 @@
spriteSourceSize
{146,146}
textureRect
- {{450,1075},{144,142}}
+ {{593,1207},{144,142}}
textureRotated
@@ -1870,9 +1955,9 @@
spriteSourceSize
{146,146}
textureRect
- {{278,1204},{142,146}}
+ {{593,1063},{142,146}}
textureRotated
-
+
Loading_Circle_8.png
@@ -1887,9 +1972,9 @@
spriteSourceSize
{146,146}
textureRect
- {{638,819},{142,144}}
+ {{950,1065},{142,144}}
textureRotated
-
+
Loading_Circle_9.png
@@ -1904,9 +1989,9 @@
spriteSourceSize
{146,146}
textureRect
- {{629,963},{142,144}}
+ {{1029,1211},{142,144}}
textureRotated
-
+
Popup01_Basic_Single.png
@@ -1921,7 +2006,7 @@
spriteSourceSize
{54,63}
textureRect
- {{1178,1296},{54,63}}
+ {{395,1221},{54,63}}
textureRotated
@@ -1938,9 +2023,9 @@
spriteSourceSize
{54,61}
textureRect
- {{1725,830},{54,61}}
+ {{1741,1140},{54,61}}
textureRotated
-
+
Popup01_Basic_White_Light.png
@@ -1955,7 +2040,7 @@
spriteSourceSize
{50,24}
textureRect
- {{1,1326},{50,24}}
+ {{1922,928},{50,24}}
textureRotated
@@ -1972,9 +2057,9 @@
spriteSourceSize
{54,61}
textureRect
- {{1725,830},{54,61}}
+ {{1741,1140},{54,61}}
textureRotated
-
+
Popup02~09_Topber_White_BgTop.png
@@ -1989,9 +2074,9 @@
spriteSourceSize
{48,26}
textureRect
- {{1973,51},{48,26}}
+ {{914,676},{48,26}}
textureRotated
-
+
Popup02~09_Topber_White_BgTopLight.png
@@ -2006,7 +2091,7 @@
spriteSourceSize
{50,24}
textureRect
- {{1,1326},{50,24}}
+ {{1922,928},{50,24}}
textureRotated
@@ -2023,9 +2108,9 @@
spriteSourceSize
{54,106}
textureRect
- {{1070,1296},{54,106}}
+ {{537,1279},{54,106}}
textureRotated
-
+
Popup07_Topbar_Divided_Single_Blue.png
@@ -2040,7 +2125,7 @@
spriteSourceSize
{54,174}
textureRect
- {{1196,389},{54,174}}
+ {{1497,311},{54,174}}
textureRotated
@@ -2057,7 +2142,7 @@
spriteSourceSize
{54,174}
textureRect
- {{1429,347},{54,174}}
+ {{219,1221},{54,174}}
textureRotated
@@ -2074,7 +2159,7 @@
spriteSourceSize
{59,275}
textureRect
- {{1,1180},{59,275}}
+ {{628,634},{59,275}}
textureRotated
@@ -2108,9 +2193,9 @@
spriteSourceSize
{56,58}
textureRect
- {{1892,575},{56,58}}
+ {{1735,1265},{56,58}}
textureRotated
-
+
SkillFrame_01_Border_Blue.png
@@ -2125,7 +2210,7 @@
spriteSourceSize
{56,58}
textureRect
- {{1888,693},{56,58}}
+ {{1732,1323},{56,58}}
textureRotated
@@ -2142,9 +2227,9 @@
spriteSourceSize
{56,58}
textureRect
- {{1948,705},{56,58}}
+ {{1730,1381},{56,58}}
textureRotated
-
+
SkillFrame_01_Border_Purple.png
@@ -2159,7 +2244,7 @@
spriteSourceSize
{56,58}
textureRect
- {{1847,756},{56,58}}
+ {{1730,1441},{56,58}}
textureRotated
@@ -2176,7 +2261,7 @@
spriteSourceSize
{56,58}
textureRect
- {{1947,763},{56,58}}
+ {{1762,1042},{56,58}}
textureRotated
@@ -2193,7 +2278,7 @@
spriteSourceSize
{56,58}
textureRect
- {{1847,816},{56,58}}
+ {{1797,1140},{56,58}}
textureRotated
@@ -2210,7 +2295,7 @@
spriteSourceSize
{140,83}
textureRect
- {{928,834},{140,83}}
+ {{1953,223},{140,83}}
textureRotated
@@ -2227,9 +2312,9 @@
spriteSourceSize
{150,28}
textureRect
- {{1342,445},{150,28}}
+ {{1259,643},{150,28}}
textureRotated
-
+
Slider_Border_Tapered_02_Fill_Green.Png
@@ -2244,7 +2329,7 @@
spriteSourceSize
{150,28}
textureRect
- {{742,1107},{150,28}}
+ {{1656,367},{150,28}}
textureRotated
@@ -2278,9 +2363,9 @@
spriteSourceSize
{150,28}
textureRect
- {{1614,162},{150,28}}
+ {{1259,673},{150,28}}
textureRotated
-
+
Slider_Border_Tapered_02_OffWhite.Png
@@ -2295,9 +2380,9 @@
spriteSourceSize
{150,28}
textureRect
- {{772,1107},{150,28}}
+ {{1068,676},{150,28}}
textureRotated
-
+
Slider_Handle_01_Border.png
@@ -2312,7 +2397,7 @@
spriteSourceSize
{105,57}
textureRect
- {{1525,1245},{105,57}}
+ {{807,1413},{105,57}}
textureRotated
@@ -2329,7 +2414,7 @@
spriteSourceSize
{25,25}
textureRect
- {{1167,545},{25,25}}
+ {{1220,676},{25,25}}
textureRotated
@@ -2346,7 +2431,7 @@
spriteSourceSize
{23,24}
textureRect
- {{1031,665},{23,24}}
+ {{1068,1040},{23,24}}
textureRotated
@@ -2363,7 +2448,7 @@
spriteSourceSize
{23,24}
textureRect
- {{253,1241},{23,24}}
+ {{2013,1},{23,24}}
textureRotated
@@ -2397,7 +2482,7 @@
spriteSourceSize
{4,18}
textureRect
- {{2003,1139},{4,18}}
+ {{1254,1514},{4,18}}
textureRotated
@@ -2414,9 +2499,9 @@
spriteSourceSize
{4,18}
textureRect
- {{483,918},{4,18}}
+ {{1866,669},{4,18}}
textureRotated
-
+
Slider_Play_02_Border.png
@@ -2431,9 +2516,9 @@
spriteSourceSize
{87,52}
textureRect
- {{1745,886},{87,52}}
+ {{1656,532},{87,52}}
textureRotated
-
+
Slider_Play_02_Fill_Red.png
@@ -2448,9 +2533,9 @@
spriteSourceSize
{194,18}
textureRect
- {{1,1306},{194,18}}
+ {{1636,367},{194,18}}
textureRotated
-
+
Swich_01_Bg_Off.png
@@ -2465,7 +2550,7 @@
spriteSourceSize
{102,82}
textureRect
- {{1421,1255},{102,82}}
+ {{1,1436},{102,82}}
textureRotated
@@ -2482,9 +2567,9 @@
spriteSourceSize
{102,82}
textureRect
- {{1584,1245},{102,82}}
+ {{1654,1056},{102,82}}
textureRotated
-
+
Swich_01_handle.png
@@ -2499,7 +2584,7 @@
spriteSourceSize
{81,85}
textureRect
- {{1844,307},{81,85}}
+ {{219,879},{81,85}}
textureRotated
@@ -2516,9 +2601,9 @@
spriteSourceSize
{137,58}
textureRect
- {{1000,690},{137,58}}
+ {{593,1351},{137,58}}
textureRotated
-
+
Title_01_NoDeco_LightGreen.Png
@@ -2533,9 +2618,9 @@
spriteSourceSize
{137,58}
textureRect
- {{1013,829},{137,58}}
+ {{732,1353},{137,58}}
textureRotated
-
+
Title_01_NoDeco_Red.Png
@@ -2550,7 +2635,7 @@
spriteSourceSize
{137,58}
textureRect
- {{1028,545},{137,58}}
+ {{871,1358},{137,58}}
textureRotated
@@ -2567,9 +2652,9 @@
spriteSourceSize
{137,58}
textureRect
- {{1031,605},{137,58}}
+ {{1686,311},{137,58}}
textureRotated
-
+
Title_01_NoDeco_White.Png
@@ -2584,9 +2669,9 @@
spriteSourceSize
{137,58}
textureRect
- {{1170,589},{137,58}}
+ {{1746,317},{137,58}}
textureRotated
-
+
Title_01_NoDeco_Yellow.Png
@@ -2601,9 +2686,9 @@
spriteSourceSize
{137,58}
textureRect
- {{1750,65},{137,58}}
+ {{1496,657},{137,58}}
textureRotated
-
+
Title_Result_Victory.png
@@ -2618,7 +2703,7 @@
spriteSourceSize
{377,201}
textureRect
- {{320,490},{377,201}}
+ {{628,431},{377,201}}
textureRotated
@@ -2635,9 +2720,9 @@
spriteSourceSize
{181,120}
textureRect
- {{320,796},{181,120}}
+ {{471,976},{181,120}}
textureRotated
-
+
Toggle_Check_01_Off.png
@@ -2652,7 +2737,7 @@
spriteSourceSize
{40,40}
textureRect
- {{1937,1015},{40,40}}
+ {{1876,1346},{40,40}}
textureRotated
@@ -2669,7 +2754,7 @@
spriteSourceSize
{40,40}
textureRect
- {{1979,1027},{40,40}}
+ {{1868,1464},{40,40}}
textureRotated
@@ -2686,9 +2771,9 @@
spriteSourceSize
{68,60}
textureRect
- {{638,755},{68,60}}
+ {{1922,794},{68,60}}
textureRotated
-
+
Toggle_Check_02_On.png
@@ -2703,7 +2788,7 @@
spriteSourceSize
{80,76}
textureRect
- {{1844,453},{80,76}}
+ {{1653,1202},{80,76}}
textureRotated
@@ -2720,7 +2805,7 @@
spriteSourceSize
{60,60}
textureRect
- {{1830,598},{60,60}}
+ {{1735,1203},{60,60}}
textureRotated
@@ -2737,7 +2822,7 @@
spriteSourceSize
{60,60}
textureRect
- {{1826,660},{60,60}}
+ {{1932,954},{60,60}}
textureRotated
@@ -2754,7 +2839,7 @@
spriteSourceSize
{44,44}
textureRect
- {{197,1306},{44,44}}
+ {{1855,1188},{44,44}}
textureRotated
@@ -2771,7 +2856,7 @@
spriteSourceSize
{44,44}
textureRect
- {{1853,876},{44,44}}
+ {{1944,1077},{44,44}}
textureRotated
@@ -2788,7 +2873,7 @@
spriteSourceSize
{72,72}
textureRect
- {{1725,756},{72,72}}
+ {{1964,81},{72,72}}
textureRotated
@@ -2805,7 +2890,7 @@
spriteSourceSize
{111,110}
textureRect
- {{1668,1228},{111,110}}
+ {{205,1407},{111,110}}
textureRotated
@@ -2822,7 +2907,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1927,327},{102,110}}
+ {{1426,717},{102,110}}
textureRotated
@@ -2839,7 +2924,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1732,430},{102,110}}
+ {{1538,717},{102,110}}
textureRotated
@@ -2856,7 +2941,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1722,644},{102,110}}
+ {{1762,930},{102,110}}
textureRotated
@@ -2873,9 +2958,9 @@
spriteSourceSize
{128,128}
textureRect
- {{802,1102},{118,88}}
+ {{1064,820},{118,88}}
textureRotated
-
+
UI_Rewards_Trophy_01_Gold.png
@@ -2890,9 +2975,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1404,647},{118,88}}
+ {{1184,820},{118,88}}
textureRotated
-
+
UI_Rewards_Trophy_01_Silver.png
@@ -2907,9 +2992,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1301,1257},{118,88}}
+ {{1936,365},{118,88}}
textureRotated
-
+
bg6.png
@@ -2924,9 +3009,9 @@
spriteSourceSize
{555,57}
textureRect
- {{320,431},{555,57}}
+ {{1,879},{555,57}}
textureRotated
-
+
bg_ar.png
@@ -2941,9 +3026,9 @@
spriteSourceSize
{96,98}
textureRect
- {{1608,432},{96,98}}
+ {{105,1421},{96,98}}
textureRotated
-
+
bg_line.png
@@ -2958,9 +3043,9 @@
spriteSourceSize
{250,63}
textureRect
- {{1,1241},{250,63}}
+ {{1753,65},{250,63}}
textureRotated
-
+
bg_title.png
@@ -2975,9 +3060,9 @@
spriteSourceSize
{540,55}
textureRect
- {{1196,65},{540,55}}
+ {{60,879},{540,55}}
textureRotated
-
+
boss.png
@@ -3009,9 +3094,9 @@
spriteSourceSize
{145,61}
textureRect
- {{884,627},{145,61}}
+ {{887,1065},{145,61}}
textureRotated
-
+
function_icon_abstract.png
@@ -3026,9 +3111,9 @@
spriteSourceSize
{64,64}
textureRect
- {{243,1306},{44,32}}
+ {{1855,1234},{44,32}}
textureRotated
-
+
function_icon_archer.png
@@ -3043,7 +3128,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1963,1069},{36,36}}
+ {{1885,1268},{36,36}}
textureRotated
@@ -3060,7 +3145,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1905,843},{40,38}}
+ {{1883,1306},{40,38}}
textureRotated
@@ -3077,7 +3162,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1899,883},{36,44}}
+ {{1990,1078},{36,44}}
textureRotated
@@ -3094,7 +3179,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1897,1008},{38,38}}
+ {{1990,1116},{38,38}}
textureRotated
@@ -3111,7 +3196,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1945,895},{42,34}}
+ {{1797,1258},{42,34}}
textureRotated
@@ -3128,7 +3213,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1947,821},{44,40}}
+ {{1158,1358},{44,40}}
textureRotated
@@ -3145,9 +3230,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1028,481},{48,38}}
+ {{1108,1357},{48,38}}
textureRotated
-
+
function_icon_buckler.png
@@ -3162,7 +3247,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1965,1107},{36,36}}
+ {{1905,1176},{36,36}}
textureRotated
@@ -3179,7 +3264,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1877,1048},{38,38}}
+ {{1988,1156},{38,38}}
textureRotated
@@ -3196,7 +3281,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1826,722},{38,32}}
+ {{1943,1194},{38,32}}
textureRotated
@@ -3213,7 +3298,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1753,1188},{42,38}}
+ {{1994,1038},{42,38}}
textureRotated
@@ -3230,7 +3315,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1885,1088},{38,38}}
+ {{1901,1214},{38,38}}
textureRotated
@@ -3247,9 +3332,9 @@
spriteSourceSize
{64,64}
textureRect
- {{2004,431},{48,38}}
+ {{1758,1100},{48,38}}
textureRotated
-
+
function_icon_dice.png
@@ -3264,9 +3349,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1900,1168},{36,38}}
+ {{1983,1196},{36,38}}
textureRotated
-
+
function_icon_feather.png
@@ -3281,7 +3366,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2007,797},{36,34}}
+ {{1999,1306},{36,34}}
textureRotated
@@ -3298,7 +3383,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1947,863},{30,42}}
+ {{1944,1162},{30,42}}
textureRotated
@@ -3315,7 +3400,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1885,1128},{38,38}}
+ {{1941,1228},{38,38}}
textureRotated
@@ -3332,7 +3417,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1993,835},{42,34}}
+ {{1792,1368},{42,34}}
textureRotated
@@ -3349,7 +3434,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1900,1208},{38,38}}
+ {{1981,1234},{38,38}}
textureRotated
@@ -3366,9 +3451,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1750,204},{46,40}}
+ {{955,634},{46,40}}
textureRotated
-
+
function_icon_heart.png
@@ -3383,7 +3468,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2008,705},{46,34}}
+ {{1908,1084},{46,34}}
textureRotated
@@ -3400,9 +3485,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1888,1309},{34,40}}
+ {{1876,1388},{34,40}}
textureRotated
-
+
function_icon_helmet_2.png
@@ -3417,9 +3502,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1892,531},{32,42}}
+ {{1795,1294},{32,42}}
textureRotated
-
+
function_icon_knight.png
@@ -3434,7 +3519,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2000,615},{42,44}}
+ {{1994,948},{42,44}}
textureRotated
@@ -3451,7 +3536,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1900,1248},{38,38}}
+ {{1925,1306},{38,38}}
textureRotated
@@ -3468,7 +3553,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1991,871},{42,34}}
+ {{1841,1268},{42,34}}
textureRotated
@@ -3485,7 +3570,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1989,907},{42,34}}
+ {{1839,1304},{42,34}}
textureRotated
@@ -3502,9 +3587,9 @@
spriteSourceSize
{64,64}
textureRect
- {{2004,527},{38,42}}
+ {{1792,1328},{38,42}}
textureRotated
-
+
function_icon_moneybag_dollar.png
@@ -3519,9 +3604,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1925,1088},{36,38}}
+ {{1923,1268},{36,38}}
textureRotated
-
+
function_icon_paw.png
@@ -3536,9 +3621,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1897,966},{38,40}}
+ {{1872,1424},{38,40}}
textureRotated
-
+
function_icon_potion_2.png
@@ -3553,7 +3638,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1938,1168},{32,38}}
+ {{1965,1306},{32,38}}
textureRotated
@@ -3570,9 +3655,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1832,1309},{54,40}}
+ {{1450,593},{54,40}}
textureRotated
-
+
function_icon_preference_1.png
@@ -3587,7 +3672,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2003,1101},{36,36}}
+ {{1958,1386},{36,36}}
textureRotated
@@ -3604,9 +3689,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1855,961},{46,40}}
+ {{1060,1358},{46,40}}
textureRotated
-
+
function_icon_setting_2.png
@@ -3621,7 +3706,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1972,1145},{36,36}}
+ {{1954,1426},{36,36}}
textureRotated
@@ -3638,7 +3723,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1925,1128},{38,38}}
+ {{1918,1346},{38,38}}
textureRotated
@@ -3655,7 +3740,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1940,1208},{38,38}}
+ {{1918,1386},{38,38}}
textureRotated
@@ -3672,9 +3757,9 @@
spriteSourceSize
{64,64}
textureRect
- {{1897,922},{42,38}}
+ {{1822,1042},{42,38}}
textureRotated
-
+
function_icon_spiderweb.png
@@ -3689,7 +3774,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1937,931},{40,40}}
+ {{1246,1358},{40,40}}
textureRotated
@@ -3706,7 +3791,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2008,753},{34,42}}
+ {{1908,1132},{34,42}}
textureRotated
@@ -3723,7 +3808,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2000,661},{42,42}}
+ {{1994,994},{42,42}}
textureRotated
@@ -3740,7 +3825,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1940,1248},{38,38}}
+ {{1914,1426},{38,38}}
textureRotated
@@ -3757,7 +3842,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1937,973},{40,40}}
+ {{1788,1404},{40,40}}
textureRotated
@@ -3774,7 +3859,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1979,943},{40,40}}
+ {{1788,1446},{40,40}}
textureRotated
@@ -3791,9 +3876,9 @@
spriteSourceSize
{64,64}
textureRect
- {{606,755},{30,38}}
+ {{1788,1488},{30,38}}
textureRotated
-
+
function_icon_volume.png
@@ -3808,7 +3893,7 @@
spriteSourceSize
{64,64}
textureRect
- {{548,1219},{28,38}}
+ {{1973,51},{28,38}}
textureRotated
@@ -3825,7 +3910,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1924,1288},{38,38}}
+ {{1910,1466},{38,38}}
textureRotated
@@ -3842,7 +3927,7 @@
spriteSourceSize
{64,64}
textureRect
- {{1964,1288},{38,38}}
+ {{1958,1346},{38,38}}
textureRotated
@@ -3859,7 +3944,7 @@
spriteSourceSize
{64,64}
textureRect
- {{2004,1069},{30,38}}
+ {{1828,1488},{30,38}}
textureRotated
@@ -3876,9 +3961,9 @@
spriteSourceSize
{64,64}
textureRect
- {{2004,481},{38,44}}
+ {{1808,1100},{38,44}}
textureRotated
-
+
play_character_target.png
@@ -3893,7 +3978,7 @@
spriteSourceSize
{128,56}
textureRect
- {{1012,1222},{128,56}}
+ {{1869,462},{128,56}}
textureRotated
@@ -3910,9 +3995,9 @@
spriteSourceSize
{423,38}
textureRect
- {{1196,122},{423,38}}
+ {{117,879},{423,38}}
textureRotated
-
+
red_dot.png
@@ -3927,7 +4012,7 @@
spriteSourceSize
{36,36}
textureRect
- {{1980,1183},{36,36}}
+ {{1950,1466},{36,36}}
textureRotated
@@ -3944,7 +4029,7 @@
spriteSourceSize
{284,39}
textureRect
- {{320,755},{284,39}}
+ {{628,695},{284,39}}
textureRotated
@@ -3961,7 +4046,7 @@
spriteSourceSize
{179,140}
textureRect
- {{302,918},{179,140}}
+ {{593,921},{179,140}}
textureRotated
@@ -3978,9 +4063,9 @@
spriteSourceSize
{59,60}
textureRect
- {{1014,1106},{59,60}}
+ {{1932,1016},{59,60}}
textureRotated
-
+
wave info.png
@@ -4011,9 +4096,9 @@
realTextureFileName
ui3.png
size
- {2043,1351}
+ {2037,1519}
smartupdate
- $TexturePacker:SmartUpdate:59facce957d643c5e4f55c0bcf6a08a2:6af06e4faae7fde55637e15de71121db:e1bf24f6fd107d358e5ec626ea4dfc29$
+ $TexturePacker:SmartUpdate:679172191dc140dcd6bf7b01aa1cbb44:982a1f2bdeeac62b622d657ffdabd1b2:e1bf24f6fd107d358e5ec626ea4dfc29$
textureFileName
ui3.png
diff --git a/assets/resources/gui/ui3.plist.meta b/assets/resources/gui/ui3.plist.meta
index 0f965199..fc1865be 100644
--- a/assets/resources/gui/ui3.plist.meta
+++ b/assets/resources/gui/ui3.plist.meta
@@ -18,8 +18,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1980,
- "trimY": 1183,
+ "trimX": 1950,
+ "trimY": 1466,
"width": 36,
"height": 36,
"rawWidth": 36,
@@ -61,11 +61,11 @@
"name": "Popup04_Topber_Single",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1070,
- "trimY": 1296,
+ "trimX": 537,
+ "trimY": 1279,
"width": 54,
"height": 106,
"rawWidth": 54,
@@ -110,8 +110,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2013,
- "trimY": 1,
+ "trimX": 2007,
+ "trimY": 595,
"width": 48,
"height": 29,
"rawWidth": 48,
@@ -156,8 +156,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1511,
- "trimY": 773,
+ "trimX": 1650,
+ "trimY": 818,
"width": 120,
"height": 104,
"rawWidth": 128,
@@ -202,8 +202,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 596,
- "trimY": 1075,
+ "trimX": 1963,
+ "trimY": 1274,
"width": 31,
"height": 30,
"rawWidth": 31,
@@ -248,8 +248,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1938,
- "trimY": 1168,
+ "trimX": 1965,
+ "trimY": 1306,
"width": 32,
"height": 38,
"rawWidth": 64,
@@ -294,8 +294,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1178,
- "trimY": 1296,
+ "trimX": 395,
+ "trimY": 1221,
"width": 54,
"height": 63,
"rawWidth": 54,
@@ -340,8 +340,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 963,
- "trimY": 976,
+ "trimX": 1182,
+ "trimY": 910,
"width": 128,
"height": 110,
"rawWidth": 128,
@@ -383,11 +383,11 @@
"name": "Swich_01_Bg_On",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1584,
- "trimY": 1245,
+ "trimX": 1654,
+ "trimY": 1056,
"width": 102,
"height": 82,
"rawWidth": 102,
@@ -429,11 +429,11 @@
"name": "Dropdown_01_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1917,
- "trimY": 1057,
+ "trimX": 1996,
+ "trimY": 1274,
"width": 29,
"height": 30,
"rawWidth": 29,
@@ -475,11 +475,11 @@
"name": "Slider_Border_Tapered_02_Fill_Blue",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1342,
- "trimY": 445,
+ "trimX": 1259,
+ "trimY": 643,
"width": 150,
"height": 28,
"rawWidth": 150,
@@ -524,8 +524,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2003,
- "trimY": 1139,
+ "trimX": 1254,
+ "trimY": 1514,
"width": 4,
"height": 18,
"rawWidth": 4,
@@ -567,11 +567,11 @@
"name": "ItemIcon_Gift_Yellow",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1612,
- "trimY": 650,
+ "trimX": 1636,
+ "trimY": 586,
"width": 116,
"height": 108,
"rawWidth": 128,
@@ -616,8 +616,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1826,
- "trimY": 722,
+ "trimX": 1943,
+ "trimY": 1194,
"width": 38,
"height": 32,
"rawWidth": 64,
@@ -651,6 +651,52 @@
],
"subMetas": {}
},
+ "78245": {
+ "importer": "sprite-frame",
+ "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@78245",
+ "displayName": "",
+ "id": "78245",
+ "name": "BubbleFrame01_Hexagon_FocusGlow",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 320,
+ "trimY": 431,
+ "width": 306,
+ "height": 298,
+ "rawWidth": 306,
+ "rawHeight": 298,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+ "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"87274": {
"importer": "sprite-frame",
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@87274",
@@ -662,8 +708,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2003,
- "trimY": 1101,
+ "trimX": 1958,
+ "trimY": 1386,
"width": 36,
"height": 36,
"rawWidth": 64,
@@ -708,8 +754,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 253,
- "trimY": 1241,
+ "trimX": 2013,
+ "trimY": 1,
"width": 23,
"height": 24,
"rawWidth": 23,
@@ -754,8 +800,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1844,
- "trimY": 307,
+ "trimX": 219,
+ "trimY": 879,
"width": 81,
"height": 85,
"rawWidth": 81,
@@ -800,8 +846,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1866,
- "trimY": 722,
+ "trimX": 157,
+ "trimY": 1267,
"width": 27,
"height": 20,
"rawWidth": 27,
@@ -843,11 +889,11 @@
"name": "ItemFrame00~03_Border",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1830,
- "trimY": 534,
+ "trimX": 1866,
+ "trimY": 1022,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -889,11 +935,11 @@
"name": "ItemIcon_Medal_Bronze_1",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1810,
- "trimY": 201,
+ "trimX": 1650,
+ "trimY": 696,
"width": 120,
"height": 104,
"rawWidth": 128,
@@ -935,11 +981,11 @@
"name": "bg_title",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1196,
- "trimY": 65,
+ "trimX": 60,
+ "trimY": 879,
"width": 540,
"height": 55,
"rawWidth": 540,
@@ -984,8 +1030,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1819,
- "trimY": 1107,
+ "trimX": 1426,
+ "trimY": 649,
"width": 64,
"height": 66,
"rawWidth": 64,
@@ -1030,8 +1076,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1834,
- "trimY": 1175,
+ "trimX": 1920,
+ "trimY": 726,
"width": 64,
"height": 66,
"rawWidth": 64,
@@ -1073,11 +1119,11 @@
"name": "ArrowIconButton_01_Next",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 678,
- "trimY": 1249,
+ "trimX": 1654,
+ "trimY": 1140,
"width": 60,
"height": 85,
"rawWidth": 60,
@@ -1119,11 +1165,11 @@
"name": "ArrowIconButton_01_Prev",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 740,
- "trimY": 1259,
+ "trimX": 1920,
+ "trimY": 595,
"width": 60,
"height": 85,
"rawWidth": 60,
@@ -1165,11 +1211,11 @@
"name": "ArrowIconButton_02_Next",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1926,
- "trimY": 511,
+ "trimX": 1872,
+ "trimY": 669,
"width": 46,
"height": 76,
"rawWidth": 46,
@@ -1214,8 +1260,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1799,
- "trimY": 756,
+ "trimX": 1872,
+ "trimY": 747,
"width": 46,
"height": 76,
"rawWidth": 46,
@@ -1257,11 +1303,11 @@
"name": "ArrowIconButton_03_Back",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1844,
- "trimY": 394,
+ "trimX": 1686,
+ "trimY": 450,
"width": 57,
"height": 80,
"rawWidth": 57,
@@ -1349,11 +1395,11 @@
"name": "Artboard 42",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 2,
"offsetY": 0,
- "trimX": 1644,
- "trimY": 252,
+ "trimX": 117,
+ "trimY": 1304,
"width": 115,
"height": 64,
"rawWidth": 145,
@@ -1395,11 +1441,11 @@
"name": "Artboard 45",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -7,
"offsetY": 0,
- "trimX": 897,
- "trimY": 978,
+ "trimX": 1173,
+ "trimY": 1292,
"width": 124,
"height": 64,
"rawWidth": 152,
@@ -1441,11 +1487,11 @@
"name": "Artboard 62",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1075,
- "trimY": 1055,
+ "trimX": 1299,
+ "trimY": 1292,
"width": 106,
"height": 113,
"rawWidth": 112,
@@ -1487,11 +1533,11 @@
"name": "Badge_Value_02",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1297,
- "trimY": 1151,
+ "trimX": 1927,
+ "trimY": 485,
"width": 104,
"height": 108,
"rawWidth": 104,
@@ -1533,11 +1579,11 @@
"name": "BaseFrame_Border_Rectangle_H80_Gradient",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 320,
- "trimY": 693,
+ "trimX": 157,
+ "trimY": 879,
"width": 60,
"height": 386,
"rawWidth": 60,
@@ -1571,6 +1617,190 @@
],
"subMetas": {}
},
+ "62d7f": {
+ "importer": "sprite-frame",
+ "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@62d7f",
+ "displayName": "",
+ "id": "62d7f",
+ "name": "BubbleFrame01_Hexagon_Bg_Blue",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 320,
+ "trimY": 731,
+ "width": 250,
+ "height": 243,
+ "rawWidth": 250,
+ "rawHeight": 243,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+ "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9bff3": {
+ "importer": "sprite-frame",
+ "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@9bff3",
+ "displayName": "",
+ "id": "9bff3",
+ "name": "BubbleFrame01_Hexagon_Bg_Green",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 219,
+ "trimY": 976,
+ "width": 250,
+ "height": 243,
+ "rawWidth": 250,
+ "rawHeight": 243,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+ "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "bd51c": {
+ "importer": "sprite-frame",
+ "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@bd51c",
+ "displayName": "",
+ "id": "bd51c",
+ "name": "BubbleFrame01_Hexagon_Bg_Yellow",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1007,
+ "trimY": 431,
+ "width": 250,
+ "height": 243,
+ "rawWidth": 250,
+ "rawHeight": 243,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+ "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "b1311": {
+ "importer": "sprite-frame",
+ "uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@b1311",
+ "displayName": "",
+ "id": "b1311",
+ "name": "BubbleFrame01_Hexagon_FocusBorder",
+ "userData": {
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1497,
+ "trimY": 65,
+ "width": 254,
+ "height": 244,
+ "rawWidth": 254,
+ "rawHeight": 244,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "0c35d8c7-1528-42ce-b7c4-20fbb1baab11@6c48a",
+ "atlasUuid": "cb93c900-b440-4571-91d1-7da1636e3d73",
+ "trimType": "auto"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"4bcea": {
"importer": "sprite-frame",
"uuid": "cb93c900-b440-4571-91d1-7da1636e3d73@4bcea",
@@ -1579,11 +1809,11 @@
"name": "BubbleFrame04_White_Arrow",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1797,
- "trimY": 1188,
+ "trimX": 1836,
+ "trimY": 1384,
"width": 38,
"height": 35,
"rawWidth": 38,
@@ -1625,11 +1855,11 @@
"name": "BubbleFrame04_White_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1753,
- "trimY": 1114,
+ "trimX": 1964,
+ "trimY": 155,
"width": 64,
"height": 72,
"rawWidth": 64,
@@ -1674,8 +1904,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1950,
- "trimY": 663,
+ "trimX": 1010,
+ "trimY": 1358,
"width": 40,
"height": 48,
"rawWidth": 40,
@@ -1717,11 +1947,11 @@
"name": "Button_Convex_Rectangle_01_Green",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1905,
- "trimY": 751,
+ "trimX": 905,
+ "trimY": 634,
"width": 40,
"height": 48,
"rawWidth": 40,
@@ -1763,11 +1993,11 @@
"name": "Button_Convex_Rectangle_01_H58_Gray",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1309,
- "trimY": 597,
+ "trimX": 1986,
+ "trimY": 657,
"width": 50,
"height": 58,
"rawWidth": 50,
@@ -1812,8 +2042,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1834,
- "trimY": 1243,
+ "trimX": 1866,
+ "trimY": 956,
"width": 64,
"height": 64,
"rawWidth": 64,
@@ -1858,8 +2088,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1811,
- "trimY": 1038,
+ "trimX": 1920,
+ "trimY": 657,
"width": 64,
"height": 67,
"rawWidth": 64,
@@ -1904,8 +2134,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1905,
- "trimY": 801,
+ "trimX": 1204,
+ "trimY": 1358,
"width": 40,
"height": 40,
"rawWidth": 40,
@@ -1950,8 +2180,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1892,
- "trimY": 635,
+ "trimX": 1797,
+ "trimY": 1200,
"width": 56,
"height": 56,
"rawWidth": 56,
@@ -1996,8 +2226,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1720,
- "trimY": 534,
+ "trimX": 1430,
+ "trimY": 821,
"width": 108,
"height": 108,
"rawWidth": 108,
@@ -2042,8 +2272,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1720,
- "trimY": 534,
+ "trimX": 1430,
+ "trimY": 821,
"width": 108,
"height": 108,
"rawWidth": 108,
@@ -2134,8 +2364,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1243,
- "trimY": 1287,
+ "trimX": 1196,
+ "trimY": 366,
"width": 56,
"height": 63,
"rawWidth": 56,
@@ -2180,8 +2410,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 877,
- "trimY": 431,
+ "trimX": 1259,
+ "trimY": 593,
"width": 48,
"height": 189,
"rawWidth": 48,
@@ -2223,11 +2453,11 @@
"name": "CardFrame_Rectangle_02_InnerBorder",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1788,
- "trimY": 834,
+ "trimX": 1986,
+ "trimY": 717,
"width": 48,
"height": 52,
"rawWidth": 48,
@@ -2272,8 +2502,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1853,
- "trimY": 922,
+ "trimX": 1944,
+ "trimY": 1123,
"width": 42,
"height": 37,
"rawWidth": 42,
@@ -2315,11 +2545,11 @@
"name": "Effect_Light_01_128",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1494,
- "trimY": 533,
+ "trimX": 429,
+ "trimY": 1403,
"width": 114,
"height": 116,
"rawWidth": 128,
@@ -2410,8 +2640,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2004,
- "trimY": 571,
+ "trimX": 1836,
+ "trimY": 1340,
"width": 38,
"height": 42,
"rawWidth": 38,
@@ -2456,8 +2686,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1429,
- "trimY": 162,
+ "trimX": 572,
+ "trimY": 736,
"width": 183,
"height": 183,
"rawWidth": 183,
@@ -2502,8 +2732,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 699,
- "trimY": 490,
+ "trimX": 757,
+ "trimY": 736,
"width": 183,
"height": 183,
"rawWidth": 183,
@@ -2548,8 +2778,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 879,
+ "trimX": 1196,
+ "trimY": 65,
"width": 299,
"height": 299,
"rawWidth": 299,
@@ -2594,8 +2824,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1196,
- "trimY": 162,
+ "trimX": 1259,
+ "trimY": 366,
"width": 231,
"height": 225,
"rawWidth": 231,
@@ -2637,11 +2867,11 @@
"name": "ItemFrame00~03_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1747,
- "trimY": 1052,
+ "trimX": 1922,
+ "trimY": 864,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -2686,8 +2916,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 503,
- "trimY": 796,
+ "trimX": 1818,
+ "trimY": 223,
"width": 133,
"height": 133,
"rawWidth": 133,
@@ -2732,8 +2962,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1780,
- "trimY": 1305,
+ "trimX": 1654,
+ "trimY": 1360,
"width": 50,
"height": 39,
"rawWidth": 50,
@@ -2778,8 +3008,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1732,
- "trimY": 318,
+ "trimX": 317,
+ "trimY": 1407,
"width": 110,
"height": 110,
"rawWidth": 110,
@@ -2824,8 +3054,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1926,
- "trimY": 431,
+ "trimX": 1654,
+ "trimY": 1280,
"width": 76,
"height": 78,
"rawWidth": 76,
@@ -2870,8 +3100,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1014,
- "trimY": 1168,
+ "trimX": 1868,
+ "trimY": 902,
"width": 52,
"height": 52,
"rawWidth": 52,
@@ -2916,8 +3146,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1950,
- "trimY": 559,
+ "trimX": 1854,
+ "trimY": 1084,
"width": 52,
"height": 52,
"rawWidth": 52,
@@ -2962,8 +3192,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1950,
- "trimY": 613,
+ "trimX": 1855,
+ "trimY": 1138,
"width": 48,
"height": 48,
"rawWidth": 48,
@@ -3008,8 +3238,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1979,
- "trimY": 985,
+ "trimX": 1830,
+ "trimY": 1421,
"width": 40,
"height": 40,
"rawWidth": 40,
@@ -3054,8 +3284,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1610,
- "trimY": 532,
+ "trimX": 1316,
+ "trimY": 703,
"width": 108,
"height": 116,
"rawWidth": 128,
@@ -3100,8 +3330,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1644,
- "trimY": 122,
+ "trimX": 309,
+ "trimY": 1277,
"width": 128,
"height": 104,
"rawWidth": 128,
@@ -3146,8 +3376,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1372,
- "trimY": 527,
+ "trimX": 471,
+ "trimY": 1159,
"width": 120,
"height": 118,
"rawWidth": 128,
@@ -3189,11 +3419,11 @@
"name": "ItemIcon_Coin_Gold",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1523,
- "trimY": 1017,
+ "trimX": 1198,
+ "trimY": 706,
"width": 112,
"height": 116,
"rawWidth": 128,
@@ -3235,11 +3465,11 @@
"name": "ItemIcon_Coin_Silver",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1614,
- "trimY": 318,
+ "trimX": 1382,
+ "trimY": 1400,
"width": 112,
"height": 116,
"rawWidth": 128,
@@ -3284,8 +3514,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1172,
- "trimY": 649,
+ "trimX": 1173,
+ "trimY": 1170,
"width": 120,
"height": 120,
"rawWidth": 128,
@@ -3327,11 +3557,11 @@
"name": "ItemIcon_Crown_2",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1073,
- "trimY": 795,
+ "trimX": 677,
+ "trimY": 1413,
"width": 128,
"height": 102,
"rawWidth": 128,
@@ -3373,11 +3603,11 @@
"name": "ItemIcon_Dungeon",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1294,
- "trimY": 649,
+ "trimX": 1304,
+ "trimY": 821,
"width": 124,
"height": 108,
"rawWidth": 128,
@@ -3422,8 +3652,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1291,
- "trimY": 775,
+ "trimX": 1540,
+ "trimY": 821,
"width": 124,
"height": 108,
"rawWidth": 128,
@@ -3468,8 +3698,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1494,
- "trimY": 651,
+ "trimX": 1411,
+ "trimY": 1169,
"width": 116,
"height": 120,
"rawWidth": 128,
@@ -3511,11 +3741,11 @@
"name": "ItemIcon_Gear_Armor",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1494,
- "trimY": 403,
+ "trimX": 1068,
+ "trimY": 706,
"width": 128,
"height": 112,
"rawWidth": 128,
@@ -3557,11 +3787,11 @@
"name": "ItemIcon_Gear_Bow",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1635,
- "trimY": 886,
+ "trimX": 1540,
+ "trimY": 1071,
"width": 108,
"height": 112,
"rawWidth": 128,
@@ -3606,8 +3836,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 422,
- "trimY": 1219,
+ "trimX": 183,
+ "trimY": 1277,
"width": 124,
"height": 120,
"rawWidth": 128,
@@ -3649,11 +3879,11 @@
"name": "ItemIcon_Gear_Helmet",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 892,
- "trimY": 1106,
+ "trimX": 1295,
+ "trimY": 1170,
"width": 114,
"height": 120,
"rawWidth": 128,
@@ -3695,11 +3925,11 @@
"name": "ItemIcon_Gear_Sword",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1637,
- "trimY": 1000,
+ "trimX": 1540,
+ "trimY": 1291,
"width": 108,
"height": 112,
"rawWidth": 128,
@@ -3741,11 +3971,11 @@
"name": "ItemIcon_Gift_Purple",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1523,
- "trimY": 1135,
+ "trimX": 1620,
+ "trimY": 1401,
"width": 116,
"height": 108,
"rawWidth": 128,
@@ -3790,8 +4020,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1932,
- "trimY": 81,
+ "trimX": 1540,
+ "trimY": 947,
"width": 122,
"height": 110,
"rawWidth": 128,
@@ -3836,8 +4066,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1060,
- "trimY": 665,
+ "trimX": 1094,
+ "trimY": 1040,
"width": 128,
"height": 110,
"rawWidth": 128,
@@ -3879,11 +4109,11 @@
"name": "ItemIcon_Medal_Silver_1",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1075,
- "trimY": 925,
+ "trimX": 547,
+ "trimY": 1411,
"width": 128,
"height": 104,
"rawWidth": 128,
@@ -3928,8 +4158,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 802,
- "trimY": 1222,
+ "trimX": 1206,
+ "trimY": 1040,
"width": 128,
"height": 104,
"rawWidth": 128,
@@ -3974,8 +4204,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 775,
- "trimY": 978,
+ "trimX": 415,
+ "trimY": 1279,
"width": 120,
"height": 122,
"rawWidth": 128,
@@ -4020,8 +4250,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1372,
- "trimY": 403,
+ "trimX": 942,
+ "trimY": 794,
"width": 120,
"height": 122,
"rawWidth": 128,
@@ -4063,11 +4293,11 @@
"name": "ItemIcon_Ranking",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1297,
- "trimY": 1027,
+ "trimX": 1529,
+ "trimY": 1181,
"width": 122,
"height": 108,
"rawWidth": 128,
@@ -4109,11 +4339,11 @@
"name": "ItemIcon_Ranking_Gold",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1401,
- "trimY": 775,
+ "trimX": 1745,
+ "trimY": 462,
"width": 122,
"height": 108,
"rawWidth": 128,
@@ -4158,8 +4388,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1932,
- "trimY": 205,
+ "trimX": 1754,
+ "trimY": 572,
"width": 110,
"height": 120,
"rawWidth": 128,
@@ -4201,11 +4431,11 @@
"name": "ItemIcon_Scroll_Feather",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1401,
- "trimY": 899,
+ "trimX": 1496,
+ "trimY": 1401,
"width": 122,
"height": 112,
"rawWidth": 128,
@@ -4247,11 +4477,11 @@
"name": "ItemIcon_Shop",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1617,
- "trimY": 768,
+ "trimX": 1422,
+ "trimY": 931,
"width": 116,
"height": 106,
"rawWidth": 128,
@@ -4296,8 +4526,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1641,
- "trimY": 1114,
+ "trimX": 1756,
+ "trimY": 816,
"width": 110,
"height": 112,
"rawWidth": 128,
@@ -4339,11 +4569,11 @@
"name": "ItemIcon_Skill_Critical",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1070,
- "trimY": 1170,
+ "trimX": 942,
+ "trimY": 676,
"width": 124,
"height": 116,
"rawWidth": 128,
@@ -4388,8 +4618,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1177,
- "trimY": 771,
+ "trimX": 1068,
+ "trimY": 910,
"width": 128,
"height": 112,
"rawWidth": 128,
@@ -4434,8 +4664,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1181,
- "trimY": 901,
+ "trimX": 1312,
+ "trimY": 1039,
"width": 128,
"height": 112,
"rawWidth": 128,
@@ -4477,11 +4707,11 @@
"name": "ItemIcon_Skill_Defense",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1407,
- "trimY": 1145,
+ "trimX": 1652,
+ "trimY": 940,
"width": 108,
"height": 114,
"rawWidth": 128,
@@ -4523,11 +4753,11 @@
"name": "ItemIcon_Skill_Health",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1295,
- "trimY": 901,
+ "trimX": 1414,
+ "trimY": 1291,
"width": 124,
"height": 104,
"rawWidth": 128,
@@ -4572,8 +4802,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1068,
- "trimY": 431,
+ "trimX": 1254,
+ "trimY": 1400,
"width": 126,
"height": 112,
"rawWidth": 128,
@@ -4618,8 +4848,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1183,
- "trimY": 1031,
+ "trimX": 1426,
+ "trimY": 1039,
"width": 126,
"height": 112,
"rawWidth": 128,
@@ -4664,8 +4894,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1407,
- "trimY": 1023,
+ "trimX": 1756,
+ "trimY": 694,
"width": 114,
"height": 120,
"rawWidth": 128,
@@ -4710,8 +4940,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1810,
- "trimY": 81,
+ "trimX": 1010,
+ "trimY": 1400,
"width": 120,
"height": 118,
"rawWidth": 128,
@@ -4753,11 +4983,11 @@
"name": "ItemIcon_Star_Disable",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1515,
- "trimY": 895,
+ "trimX": 1132,
+ "trimY": 1400,
"width": 120,
"height": 118,
"rawWidth": 128,
@@ -4799,11 +5029,11 @@
"name": "ItemIcon_Ticket_Gold",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 908,
- "trimY": 1222,
+ "trimX": 1806,
+ "trimY": 358,
"width": 128,
"height": 102,
"rawWidth": 128,
@@ -4845,11 +5075,11 @@
"name": "ItemIcon_Timer_Gold",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1188,
- "trimY": 1159,
+ "trimX": 1294,
+ "trimY": 931,
"width": 106,
"height": 126,
"rawWidth": 128,
@@ -4894,8 +5124,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 548,
- "trimY": 1249,
+ "trimX": 866,
+ "trimY": 1418,
"width": 128,
"height": 98,
"rawWidth": 128,
@@ -4937,11 +5167,11 @@
"name": "Label_Bubble",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1761,
- "trimY": 252,
+ "trimX": 1094,
+ "trimY": 1170,
"width": 61,
"height": 39,
"rawWidth": 61,
@@ -4986,8 +5216,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1747,
- "trimY": 975,
+ "trimX": 1866,
+ "trimY": 592,
"width": 52,
"height": 75,
"rawWidth": 52,
@@ -5032,8 +5262,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1780,
- "trimY": 1228,
+ "trimX": 1868,
+ "trimY": 825,
"width": 52,
"height": 75,
"rawWidth": 52,
@@ -5078,8 +5308,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1799,
- "trimY": 884,
+ "trimX": 1984,
+ "trimY": 794,
"width": 52,
"height": 75,
"rawWidth": 52,
@@ -5124,8 +5354,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1801,
- "trimY": 961,
+ "trimX": 1984,
+ "trimY": 871,
"width": 52,
"height": 75,
"rawWidth": 52,
@@ -5170,8 +5400,8 @@
"rotated": false,
"offsetX": -2,
"offsetY": 1,
- "trimX": 884,
- "trimY": 481,
+ "trimX": 1492,
+ "trimY": 367,
"width": 142,
"height": 144,
"rawWidth": 146,
@@ -5216,8 +5446,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 708,
- "trimY": 675,
+ "trimX": 739,
+ "trimY": 1209,
"width": 144,
"height": 142,
"rawWidth": 146,
@@ -5262,8 +5492,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 854,
- "trimY": 690,
+ "trimX": 922,
+ "trimY": 921,
"width": 144,
"height": 142,
"rawWidth": 146,
@@ -5308,8 +5538,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": -1,
- "trimX": 596,
- "trimY": 1107,
+ "trimX": 1818,
+ "trimY": 81,
"width": 144,
"height": 140,
"rawWidth": 146,
@@ -5351,11 +5581,11 @@
"name": "Loading_Circle_2",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -2,
"offsetY": 1,
- "trimX": 1196,
- "trimY": 445,
+ "trimX": 885,
+ "trimY": 1212,
"width": 142,
"height": 144,
"rawWidth": 146,
@@ -5400,8 +5630,8 @@
"rotated": false,
"offsetX": -2,
"offsetY": 2,
- "trimX": 784,
- "trimY": 834,
+ "trimX": 1492,
+ "trimY": 513,
"width": 142,
"height": 142,
"rawWidth": 146,
@@ -5446,8 +5676,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 2,
- "trimX": 302,
- "trimY": 1060,
+ "trimX": 774,
+ "trimY": 921,
"width": 146,
"height": 142,
"rawWidth": 146,
@@ -5492,8 +5722,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 2,
- "trimX": 483,
- "trimY": 931,
+ "trimX": 741,
+ "trimY": 1065,
"width": 144,
"height": 142,
"rawWidth": 146,
@@ -5538,8 +5768,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 2,
- "trimX": 450,
- "trimY": 1075,
+ "trimX": 593,
+ "trimY": 1207,
"width": 144,
"height": 142,
"rawWidth": 146,
@@ -5581,11 +5811,11 @@
"name": "Loading_Circle_7",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 278,
- "trimY": 1204,
+ "trimX": 593,
+ "trimY": 1063,
"width": 142,
"height": 146,
"rawWidth": 146,
@@ -5627,11 +5857,11 @@
"name": "Loading_Circle_8",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 638,
- "trimY": 819,
+ "trimX": 950,
+ "trimY": 1065,
"width": 142,
"height": 144,
"rawWidth": 146,
@@ -5673,11 +5903,11 @@
"name": "Loading_Circle_9",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 629,
- "trimY": 963,
+ "trimX": 1029,
+ "trimY": 1211,
"width": 142,
"height": 144,
"rawWidth": 146,
@@ -5719,11 +5949,11 @@
"name": "Popup01_Basic_White_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1725,
- "trimY": 830,
+ "trimX": 1741,
+ "trimY": 1140,
"width": 54,
"height": 61,
"rawWidth": 54,
@@ -5768,8 +5998,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1326,
+ "trimX": 1922,
+ "trimY": 928,
"width": 50,
"height": 24,
"rawWidth": 50,
@@ -5811,11 +6041,11 @@
"name": "Popup02~09_Topber_White_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1725,
- "trimY": 830,
+ "trimX": 1741,
+ "trimY": 1140,
"width": 54,
"height": 61,
"rawWidth": 54,
@@ -5857,11 +6087,11 @@
"name": "Popup02~09_Topber_White_BgTop",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1973,
- "trimY": 51,
+ "trimX": 914,
+ "trimY": 676,
"width": 48,
"height": 26,
"rawWidth": 48,
@@ -5906,8 +6136,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1326,
+ "trimX": 1922,
+ "trimY": 928,
"width": 50,
"height": 24,
"rawWidth": 50,
@@ -5952,8 +6182,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1196,
- "trimY": 389,
+ "trimX": 1497,
+ "trimY": 311,
"width": 54,
"height": 174,
"rawWidth": 54,
@@ -5998,8 +6228,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1429,
- "trimY": 347,
+ "trimX": 219,
+ "trimY": 1221,
"width": 54,
"height": 174,
"rawWidth": 54,
@@ -6044,8 +6274,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1180,
+ "trimX": 628,
+ "trimY": 634,
"width": 59,
"height": 275,
"rawWidth": 59,
@@ -6133,11 +6363,11 @@
"name": "SkillFrame_01_Bg",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1892,
- "trimY": 575,
+ "trimX": 1735,
+ "trimY": 1265,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6182,8 +6412,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1888,
- "trimY": 693,
+ "trimX": 1732,
+ "trimY": 1323,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6225,11 +6455,11 @@
"name": "SkillFrame_01_Border_Green",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1948,
- "trimY": 705,
+ "trimX": 1730,
+ "trimY": 1381,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6274,8 +6504,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1847,
- "trimY": 756,
+ "trimX": 1730,
+ "trimY": 1441,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6320,8 +6550,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1947,
- "trimY": 763,
+ "trimX": 1762,
+ "trimY": 1042,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6366,8 +6596,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1847,
- "trimY": 816,
+ "trimX": 1797,
+ "trimY": 1140,
"width": 56,
"height": 58,
"rawWidth": 56,
@@ -6412,8 +6642,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 928,
- "trimY": 834,
+ "trimX": 1953,
+ "trimY": 223,
"width": 140,
"height": 83,
"rawWidth": 140,
@@ -6458,8 +6688,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 742,
- "trimY": 1107,
+ "trimX": 1656,
+ "trimY": 367,
"width": 150,
"height": 28,
"rawWidth": 150,
@@ -6547,11 +6777,11 @@
"name": "Slider_Border_Tapered_02_Fill_Red",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1614,
- "trimY": 162,
+ "trimX": 1259,
+ "trimY": 673,
"width": 150,
"height": 28,
"rawWidth": 150,
@@ -6593,11 +6823,11 @@
"name": "Slider_Border_Tapered_02_OffWhite",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 772,
- "trimY": 1107,
+ "trimX": 1068,
+ "trimY": 676,
"width": 150,
"height": 28,
"rawWidth": 150,
@@ -6642,8 +6872,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1525,
- "trimY": 1245,
+ "trimX": 807,
+ "trimY": 1413,
"width": 105,
"height": 57,
"rawWidth": 105,
@@ -6688,8 +6918,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1167,
- "trimY": 545,
+ "trimX": 1220,
+ "trimY": 676,
"width": 25,
"height": 25,
"rawWidth": 25,
@@ -6734,8 +6964,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1031,
- "trimY": 665,
+ "trimX": 1068,
+ "trimY": 1040,
"width": 23,
"height": 24,
"rawWidth": 23,
@@ -6823,11 +7053,11 @@
"name": "Slider_Play_01_Fill_Red",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 483,
- "trimY": 918,
+ "trimX": 1866,
+ "trimY": 669,
"width": 4,
"height": 18,
"rawWidth": 4,
@@ -6869,11 +7099,11 @@
"name": "Slider_Play_02_Border",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1745,
- "trimY": 886,
+ "trimX": 1656,
+ "trimY": 532,
"width": 87,
"height": 52,
"rawWidth": 87,
@@ -6915,11 +7145,11 @@
"name": "Slider_Play_02_Fill_Red",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1306,
+ "trimX": 1636,
+ "trimY": 367,
"width": 194,
"height": 18,
"rawWidth": 194,
@@ -6964,8 +7194,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1421,
- "trimY": 1255,
+ "trimX": 1,
+ "trimY": 1436,
"width": 102,
"height": 82,
"rawWidth": 102,
@@ -7007,11 +7237,11 @@
"name": "Title_01_NoDeco_LightGray",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1000,
- "trimY": 690,
+ "trimX": 593,
+ "trimY": 1351,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7053,11 +7283,11 @@
"name": "Title_01_NoDeco_LightGreen",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1013,
- "trimY": 829,
+ "trimX": 732,
+ "trimY": 1353,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7102,8 +7332,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1028,
- "trimY": 545,
+ "trimX": 871,
+ "trimY": 1358,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7145,11 +7375,11 @@
"name": "Title_01_NoDeco_Sky",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1031,
- "trimY": 605,
+ "trimX": 1686,
+ "trimY": 311,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7191,11 +7421,11 @@
"name": "Title_01_NoDeco_White",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1170,
- "trimY": 589,
+ "trimX": 1746,
+ "trimY": 317,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7237,11 +7467,11 @@
"name": "Title_01_NoDeco_Yellow",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1750,
- "trimY": 65,
+ "trimX": 1496,
+ "trimY": 657,
"width": 137,
"height": 58,
"rawWidth": 137,
@@ -7286,8 +7516,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 320,
- "trimY": 490,
+ "trimX": 628,
+ "trimY": 431,
"width": 377,
"height": 201,
"rawWidth": 377,
@@ -7329,11 +7559,11 @@
"name": "ToastMessage_Light2",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 320,
- "trimY": 796,
+ "trimX": 471,
+ "trimY": 976,
"width": 181,
"height": 120,
"rawWidth": 181,
@@ -7378,8 +7608,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1937,
- "trimY": 1015,
+ "trimX": 1876,
+ "trimY": 1346,
"width": 40,
"height": 40,
"rawWidth": 40,
@@ -7424,8 +7654,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1979,
- "trimY": 1027,
+ "trimX": 1868,
+ "trimY": 1464,
"width": 40,
"height": 40,
"rawWidth": 40,
@@ -7467,11 +7697,11 @@
"name": "Toggle_Check_02_Off",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 638,
- "trimY": 755,
+ "trimX": 1922,
+ "trimY": 794,
"width": 68,
"height": 60,
"rawWidth": 68,
@@ -7516,8 +7746,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1844,
- "trimY": 453,
+ "trimX": 1653,
+ "trimY": 1202,
"width": 80,
"height": 76,
"rawWidth": 80,
@@ -7562,8 +7792,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1830,
- "trimY": 598,
+ "trimX": 1735,
+ "trimY": 1203,
"width": 60,
"height": 60,
"rawWidth": 60,
@@ -7608,8 +7838,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1826,
- "trimY": 660,
+ "trimX": 1932,
+ "trimY": 954,
"width": 60,
"height": 60,
"rawWidth": 60,
@@ -7654,8 +7884,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 197,
- "trimY": 1306,
+ "trimX": 1855,
+ "trimY": 1188,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -7700,8 +7930,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1853,
- "trimY": 876,
+ "trimX": 1944,
+ "trimY": 1077,
"width": 44,
"height": 44,
"rawWidth": 44,
@@ -7746,8 +7976,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1725,
- "trimY": 756,
+ "trimX": 1964,
+ "trimY": 81,
"width": 72,
"height": 72,
"rawWidth": 72,
@@ -7792,8 +8022,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1668,
- "trimY": 1228,
+ "trimX": 205,
+ "trimY": 1407,
"width": 111,
"height": 110,
"rawWidth": 111,
@@ -7838,8 +8068,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1927,
- "trimY": 327,
+ "trimX": 1426,
+ "trimY": 717,
"width": 102,
"height": 110,
"rawWidth": 128,
@@ -7884,8 +8114,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1732,
- "trimY": 430,
+ "trimX": 1538,
+ "trimY": 717,
"width": 102,
"height": 110,
"rawWidth": 128,
@@ -7930,8 +8160,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1722,
- "trimY": 644,
+ "trimX": 1762,
+ "trimY": 930,
"width": 102,
"height": 110,
"rawWidth": 128,
@@ -7973,11 +8203,11 @@
"name": "UI_Rewards_Trophy_01_Bronze",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 802,
- "trimY": 1102,
+ "trimX": 1064,
+ "trimY": 820,
"width": 118,
"height": 88,
"rawWidth": 128,
@@ -8019,11 +8249,11 @@
"name": "UI_Rewards_Trophy_01_Gold",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 1404,
- "trimY": 647,
+ "trimX": 1184,
+ "trimY": 820,
"width": 118,
"height": 88,
"rawWidth": 128,
@@ -8065,11 +8295,11 @@
"name": "UI_Rewards_Trophy_01_Silver",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -2,
- "trimX": 1301,
- "trimY": 1257,
+ "trimX": 1936,
+ "trimY": 365,
"width": 118,
"height": 88,
"rawWidth": 128,
@@ -8111,11 +8341,11 @@
"name": "bg6",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 320,
- "trimY": 431,
+ "trimX": 1,
+ "trimY": 879,
"width": 555,
"height": 57,
"rawWidth": 555,
@@ -8157,11 +8387,11 @@
"name": "bg_ar",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1608,
- "trimY": 432,
+ "trimX": 105,
+ "trimY": 1421,
"width": 96,
"height": 98,
"rawWidth": 96,
@@ -8203,11 +8433,11 @@
"name": "bg_line",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1241,
+ "trimX": 1753,
+ "trimY": 65,
"width": 250,
"height": 63,
"rawWidth": 250,
@@ -8295,11 +8525,11 @@
"name": "bosstext",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 884,
- "trimY": 627,
+ "trimX": 887,
+ "trimY": 1065,
"width": 145,
"height": 61,
"rawWidth": 145,
@@ -8341,11 +8571,11 @@
"name": "function_icon_abstract",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 243,
- "trimY": 1306,
+ "trimX": 1855,
+ "trimY": 1234,
"width": 44,
"height": 32,
"rawWidth": 64,
@@ -8390,8 +8620,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1963,
- "trimY": 1069,
+ "trimX": 1885,
+ "trimY": 1268,
"width": 36,
"height": 36,
"rawWidth": 64,
@@ -8436,8 +8666,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1905,
- "trimY": 843,
+ "trimX": 1883,
+ "trimY": 1306,
"width": 40,
"height": 38,
"rawWidth": 64,
@@ -8482,8 +8712,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1899,
- "trimY": 883,
+ "trimX": 1990,
+ "trimY": 1078,
"width": 36,
"height": 44,
"rawWidth": 64,
@@ -8528,8 +8758,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1897,
- "trimY": 1008,
+ "trimX": 1990,
+ "trimY": 1116,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -8574,8 +8804,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1945,
- "trimY": 895,
+ "trimX": 1797,
+ "trimY": 1258,
"width": 42,
"height": 34,
"rawWidth": 64,
@@ -8620,8 +8850,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1947,
- "trimY": 821,
+ "trimX": 1158,
+ "trimY": 1358,
"width": 44,
"height": 40,
"rawWidth": 64,
@@ -8663,11 +8893,11 @@
"name": "function_icon_boot_fly",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1028,
- "trimY": 481,
+ "trimX": 1108,
+ "trimY": 1357,
"width": 48,
"height": 38,
"rawWidth": 64,
@@ -8712,8 +8942,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1965,
- "trimY": 1107,
+ "trimX": 1905,
+ "trimY": 1176,
"width": 36,
"height": 36,
"rawWidth": 64,
@@ -8758,8 +8988,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1877,
- "trimY": 1048,
+ "trimX": 1988,
+ "trimY": 1156,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -8804,8 +9034,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1753,
- "trimY": 1188,
+ "trimX": 1994,
+ "trimY": 1038,
"width": 42,
"height": 38,
"rawWidth": 64,
@@ -8850,8 +9080,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1885,
- "trimY": 1088,
+ "trimX": 1901,
+ "trimY": 1214,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -8893,11 +9123,11 @@
"name": "function_icon_death",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2004,
- "trimY": 431,
+ "trimX": 1758,
+ "trimY": 1100,
"width": 48,
"height": 38,
"rawWidth": 64,
@@ -8939,11 +9169,11 @@
"name": "function_icon_dice",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1900,
- "trimY": 1168,
+ "trimX": 1983,
+ "trimY": 1196,
"width": 36,
"height": 38,
"rawWidth": 64,
@@ -8988,8 +9218,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2007,
- "trimY": 797,
+ "trimX": 1999,
+ "trimY": 1306,
"width": 36,
"height": 34,
"rawWidth": 64,
@@ -9034,8 +9264,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1947,
- "trimY": 863,
+ "trimX": 1944,
+ "trimY": 1162,
"width": 30,
"height": 42,
"rawWidth": 64,
@@ -9080,8 +9310,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1885,
- "trimY": 1128,
+ "trimX": 1941,
+ "trimY": 1228,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -9126,8 +9356,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1993,
- "trimY": 835,
+ "trimX": 1792,
+ "trimY": 1368,
"width": 42,
"height": 34,
"rawWidth": 64,
@@ -9172,8 +9402,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1900,
- "trimY": 1208,
+ "trimX": 1981,
+ "trimY": 1234,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -9215,11 +9445,11 @@
"name": "function_icon_hat",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1750,
- "trimY": 204,
+ "trimX": 955,
+ "trimY": 634,
"width": 46,
"height": 40,
"rawWidth": 64,
@@ -9264,8 +9494,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2008,
- "trimY": 705,
+ "trimX": 1908,
+ "trimY": 1084,
"width": 46,
"height": 34,
"rawWidth": 64,
@@ -9307,11 +9537,11 @@
"name": "function_icon_helmet_1",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1888,
- "trimY": 1309,
+ "trimX": 1876,
+ "trimY": 1388,
"width": 34,
"height": 40,
"rawWidth": 64,
@@ -9353,11 +9583,11 @@
"name": "function_icon_helmet_2",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1892,
- "trimY": 531,
+ "trimX": 1795,
+ "trimY": 1294,
"width": 32,
"height": 42,
"rawWidth": 64,
@@ -9402,8 +9632,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2000,
- "trimY": 615,
+ "trimX": 1994,
+ "trimY": 948,
"width": 42,
"height": 44,
"rawWidth": 64,
@@ -9448,8 +9678,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1900,
- "trimY": 1248,
+ "trimX": 1925,
+ "trimY": 1306,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -9494,8 +9724,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1991,
- "trimY": 871,
+ "trimX": 1841,
+ "trimY": 1268,
"width": 42,
"height": 34,
"rawWidth": 64,
@@ -9540,8 +9770,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1989,
- "trimY": 907,
+ "trimX": 1839,
+ "trimY": 1304,
"width": 42,
"height": 34,
"rawWidth": 64,
@@ -9583,11 +9813,11 @@
"name": "function_icon_magic",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2004,
- "trimY": 527,
+ "trimX": 1792,
+ "trimY": 1328,
"width": 38,
"height": 42,
"rawWidth": 64,
@@ -9629,11 +9859,11 @@
"name": "function_icon_moneybag_dollar",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1925,
- "trimY": 1088,
+ "trimX": 1923,
+ "trimY": 1268,
"width": 36,
"height": 38,
"rawWidth": 64,
@@ -9675,11 +9905,11 @@
"name": "function_icon_paw",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1897,
- "trimY": 966,
+ "trimX": 1872,
+ "trimY": 1424,
"width": 38,
"height": 40,
"rawWidth": 64,
@@ -9721,11 +9951,11 @@
"name": "function_icon_powerup",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1832,
- "trimY": 1309,
+ "trimX": 1450,
+ "trimY": 593,
"width": 54,
"height": 40,
"rawWidth": 64,
@@ -9767,11 +9997,11 @@
"name": "function_icon_revive_1",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1855,
- "trimY": 961,
+ "trimX": 1060,
+ "trimY": 1358,
"width": 46,
"height": 40,
"rawWidth": 64,
@@ -9816,8 +10046,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1972,
- "trimY": 1145,
+ "trimX": 1954,
+ "trimY": 1426,
"width": 36,
"height": 36,
"rawWidth": 64,
@@ -9862,8 +10092,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1925,
- "trimY": 1128,
+ "trimX": 1918,
+ "trimY": 1346,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -9908,8 +10138,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1940,
- "trimY": 1208,
+ "trimX": 1918,
+ "trimY": 1386,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -9951,11 +10181,11 @@
"name": "function_icon_skull",
"userData": {
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1897,
- "trimY": 922,
+ "trimX": 1822,
+ "trimY": 1042,
"width": 42,
"height": 38,
"rawWidth": 64,
@@ -10000,8 +10230,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1937,
- "trimY": 931,
+ "trimX": 1246,
+ "trimY": 1358,
"width": 40,
"height": 40,
"rawWidth": 64,
@@ -10046,8 +10276,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2008,
- "trimY": 753,
+ "trimX": 1908,
+ "trimY": 1132,
"width": 34,
"height": 42,
"rawWidth": 64,
@@ -10092,8 +10322,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 2000,
- "trimY": 661,
+ "trimX": 1994,
+ "trimY": 994,
"width": 42,
"height": 42,
"rawWidth": 64,
@@ -10138,8 +10368,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1940,
- "trimY": 1248,
+ "trimX": 1914,
+ "trimY": 1426,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -10184,8 +10414,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1937,
- "trimY": 973,
+ "trimX": 1788,
+ "trimY": 1404,
"width": 40,
"height": 40,
"rawWidth": 64,
@@ -10230,8 +10460,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1979,
- "trimY": 943,
+ "trimX": 1788,
+ "trimY": 1446,
"width": 40,
"height": 40,
"rawWidth": 64,
@@ -10273,11 +10503,11 @@
"name": "function_icon_thunder",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 606,
- "trimY": 755,
+ "trimX": 1788,
+ "trimY": 1488,
"width": 30,
"height": 38,
"rawWidth": 64,
@@ -10322,8 +10552,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 548,
- "trimY": 1219,
+ "trimX": 1973,
+ "trimY": 51,
"width": 28,
"height": 38,
"rawWidth": 64,
@@ -10368,8 +10598,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1924,
- "trimY": 1288,
+ "trimX": 1910,
+ "trimY": 1466,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -10414,8 +10644,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1964,
- "trimY": 1288,
+ "trimX": 1958,
+ "trimY": 1346,
"width": 38,
"height": 38,
"rawWidth": 64,
@@ -10460,8 +10690,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 2004,
- "trimY": 1069,
+ "trimX": 1828,
+ "trimY": 1488,
"width": 30,
"height": 38,
"rawWidth": 64,
@@ -10503,11 +10733,11 @@
"name": "function_icon_wizard",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 2004,
- "trimY": 481,
+ "trimX": 1808,
+ "trimY": 1100,
"width": 38,
"height": 44,
"rawWidth": 64,
@@ -10552,8 +10782,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1012,
- "trimY": 1222,
+ "trimX": 1869,
+ "trimY": 462,
"width": 128,
"height": 56,
"rawWidth": 128,
@@ -10595,11 +10825,11 @@
"name": "prg",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1196,
- "trimY": 122,
+ "trimX": 117,
+ "trimY": 879,
"width": 423,
"height": 38,
"rawWidth": 423,
@@ -10644,8 +10874,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 320,
- "trimY": 755,
+ "trimX": 628,
+ "trimY": 695,
"width": 284,
"height": 39,
"rawWidth": 284,
@@ -10690,8 +10920,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 302,
- "trimY": 918,
+ "trimX": 593,
+ "trimY": 921,
"width": 179,
"height": 140,
"rawWidth": 179,
@@ -10733,11 +10963,11 @@
"name": "userinfo_icon_crown",
"userData": {
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1014,
- "trimY": 1106,
+ "trimX": 1932,
+ "trimY": 1016,
"width": 59,
"height": 60,
"rawWidth": 59,
diff --git a/assets/resources/gui/ui3.png b/assets/resources/gui/ui3.png
index 67d85305..edd48645 100644
Binary files a/assets/resources/gui/ui3.png and b/assets/resources/gui/ui3.png differ
diff --git a/assets/script/game/common/config/GameSet.ts b/assets/script/game/common/config/GameSet.ts
index 8c8614a6..924e23a7 100644
--- a/assets/script/game/common/config/GameSet.ts
+++ b/assets/script/game/common/config/GameSet.ts
@@ -32,6 +32,8 @@ export enum FightSet {
HERO_MAX_NUM = 3,//英雄最大数量
/** 英雄可升级到的最高等级（通过升级卡提升） */
HERO_MAX_LV = 6,
+ /** 英雄技能等级上限（无限升级下技能 5 级封顶，超出等级只长属性） */
+ HERO_SKILL_MAX_LV = 5,
/** 英雄属性随等级成长的倍率（ap/hp = base * MULTIPLIER^(lv-1)） */
HERO_LV_MULTIPLIER = 2,
// BACK_RANG=30,//后退范围
diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts
index 9fc71861..a67a1244 100644
--- a/assets/script/game/common/config/HeroSkillDesc.ts
+++ b/assets/script/game/common/config/HeroSkillDesc.ts
@@ -1,4 +1,4 @@
-/**
+/**
* @file HeroSkillDesc.ts
* @description 英雄技能/能力描述的【唯一文字表达标准层】
*
@@ -28,7 +28,7 @@
* - SkillDescSet:结构化描述模板
* - FieldSkillSet（驻场技能）、BuffList（计时 buff 默认值兜底）、Attrs（属性枚举）
*/
-import { SkillTriggerName, SkillTriggerType, TriggerGrouped, LvTriggerEntry, LvFieldEntry, LvReviveEntry, LvBonusEntry, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv, getTriggerSkillName } from "./heroSet";
+import { SkillTriggerName, SkillTriggerType, TriggerGrouped, LvTriggerEntry, LvFieldEntry, LvReviveEntry, LvBonusEntry, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv, getTriggerSkillName, HGrowType, calcGrowBonus } from "./heroSet";
import { FieldSkillSet, mergeSkillParams, SkillConfig, SkillKind, SkillOverrides, SkillSet, TGroup } from "./SkillSet";
import { FieldDescSet, FieldValueFmt, SkillDescSet } from "./SkillDescSet";
import { BuffList } from "./BuffSet";
@@ -53,6 +53,14 @@ export interface ISkillDescSource {
/** 额外攻击/生命加成（按 lv 累加，用于成长文案） */
ap_bonus?: LvBonusEntry[];
hp_bonus?: LvBonusEntry[];
+ /** 成长类型（决定每级 hp/ap 标准递增增量） */
+ grow_type?: HGrowType;
+ /** 基础攻击/生命（成长基数，线性公式 = 基础 × 系数 × (lv-1)） */
+ ap?: number;
+ hp?: number;
+ /** 原始基础攻击/生命（HeroAttrsComp 场景优先用作成长基数，避免运行时 hp/ap 重复计成长） */
+ base_ap?: number;
+ base_hp?: number;
}
/**
@@ -315,11 +323,16 @@ function buildReviveLines(source: ISkillDescSource, showName: boolean = true, sh
return lines;
}
-/** 额外属性加成（ap/hp）累计结构化行：高亮累计数值 */
+/** 额外属性加成（ap/hp）累计结构化行：成长递增 + 一次性奖励，高亮累计数值 */
function buildEvolveBonusLines(source: ISkillDescSource): ISkillLine[] {
const lv = Math.max(1, source.lv ?? 1);
- let apTotal = 0;
- let hpTotal = 0;
+ // 成长线性增量：优先用原始基础值（base_*，HeroAttrsComp 场景），否则用配置 hp/ap；
+ // 缺基础值时按 0 处理（如纯触发技能描述场景），避免运行时 hp/ap 重复计成长
+ const baseHp = source.base_hp ?? source.hp ?? 0;
+ const baseAp = source.base_ap ?? source.ap ?? 0;
+ const grow = calcGrowBonus({ hp: baseHp, ap: baseAp, grow_type: source.grow_type }, lv);
+ let apTotal = grow.ap;
+ let hpTotal = grow.hp;
if (source.ap_bonus) {
for (const e of source.ap_bonus) { if (e.lv <= lv) apTotal += e.value; }
}
@@ -327,8 +340,8 @@ function buildEvolveBonusLines(source: ISkillDescSource): ISkillLine[] {
for (const e of source.hp_bonus) { if (e.lv <= lv) hpTotal += e.value; }
}
const lines: ISkillLine[] = [];
- if (apTotal !== 0) lines.push({ prefix: "成长:额外", value: `+${apTotal}`, suffix: ATTR_NAME[Attrs.ap] ?? "攻击力" });
- if (hpTotal !== 0) lines.push({ prefix: "成长:额外", value: `+${hpTotal}`, suffix: ATTR_NAME[Attrs.hp_max] ?? "最大生命" });
+ if (apTotal !== 0) lines.push({ prefix: "成长:", value: `+${apTotal}`, suffix: ATTR_NAME[Attrs.ap] ?? "攻击力" });
+ if (hpTotal !== 0) lines.push({ prefix: "成长:", value: `+${hpTotal}`, suffix: ATTR_NAME[Attrs.hp_max] ?? "最大生命" });
return lines;
}
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 5a89ad4f..2fcd56f9 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -107,6 +107,45 @@ export enum MonStart {
START_I = 90, //x轴间隔
}
+/**
+ * 英雄成长类型（决定每级 hp/ap 标准增量系数）。
+ * Why: 不同定位英雄的成长曲线差异化，避免"一刀切"导致坦克/刺客同强度。
+ */
+export enum HGrowType {
+ Tank = 0, // 坦克：高 hp 低 ap
+ Warrior = 1, // 战士：均衡
+ Assassin = 2, // 刺客：低 hp 高 ap
+ Mage = 3, // 法师：中 hp 高 ap
+ Support = 4, // 辅助：中 hp 低 ap
+}
+
+/** 成长类型系数表（每级增量 = 英雄基础属性 × 对应系数） */
+export const HERO_GROW_COEF: Record = {
+ [HGrowType.Tank]: { hp: 1.5, ap: 0.6 },
+ [HGrowType.Warrior]: { hp: 1.0, ap: 1.0 },
+ [HGrowType.Assassin]: { hp: 0.7, ap: 1.4 },
+ [HGrowType.Mage]: { hp: 0.9, ap: 1.3 },
+ [HGrowType.Support]: { hp: 1.1, ap: 0.7 },
+};
+
+/**
+ * 计算英雄在目标等级下的累计属性成长增量（线性：每级加一份"基础属性×系数"）。
+ * 公式：累计 = 基础属性 × 类型系数 × (lv - 1)。
+ * Why: 以英雄自身基础值为基数，自动适配低/高费卡的成长占比，避免全局固定值失衡；
+ * 线性曲线在无限升级下不会指数爆炸，强度平滑可控。
+ * @param hero 英雄配置（取 hp/ap 基础值与 grow_type）
+ * @param targetLv 目标等级（≥1）
+ * @returns 累计 hp/ap 增量（已取整）
+ */
+export function calcGrowBonus(hero: Pick, targetLv: number): { hp: number; ap: number } {
+ const coef = HERO_GROW_COEF[hero.grow_type ?? HGrowType.Warrior];
+ const steps = Math.max(0, Math.floor(targetLv) - 1);
+ return {
+ hp: Math.floor(hero.hp * coef.hp * steps),
+ ap: Math.floor(hero.ap * coef.ap * steps),
+ };
+}
+
/**
@@ -248,6 +287,7 @@ export interface heroInfo {
lv: number; // 英雄等级
card_lv?: number; // 卡牌等级（驱动 bg_node 颜色：1=green 2=blue 3=purple 4=red 5=yellow）
type: HType; // 攻击定位（近战/中程/远程）
+ grow_type?: HGrowType; // 成长类型（决定每级 hp/ap 标准增量，默认 Warrior）
monType?: MonType; // 怪物专属类型
hp: number; // 生命值上限
ap: number; // 攻击力
@@ -340,19 +380,18 @@ export interface LvBonusEntry {
export const HeroInfo: Record = {
// ========== atked 类（战士 · 自身强化） ==========
5011: {
- uuid: 5011, name: "小铁卫", path: "hk1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Melee, hp: 300, ap: 28,
+ uuid: 5011, name: "铁壁", path: "hk1", fac: FacSet.HERO, card_lv: 1, lv: 1, type: HType.Melee, grow_type: HGrowType.Tank, hp: 300, ap: 28,
skills: { 6001: { uuid: 6001, lv: 1, cd: AtkSpeedSet[AtkSpeedLv.Slow3].cd, ccd: 0 } },
- // 成长主线：护盾层数 4→5→6（等效减伤 57%→67%）
+ // 成长主线：受击5次凝聚护盾，层数 2→3→4→5；每级按 Tank 成长类型递增 hp/ap
atked: {
6301: [
- { lv: 1, s_lv: SkillLv.Lv1, t_num: 3, overrides: { TGroup: TGroup.Self, ap: 4 } },
- { lv: 2, s_lv: SkillLv.Lv2, t_num: 3, overrides: { TGroup: TGroup.Self, ap: 5 } },
- { lv: 4, s_lv: SkillLv.Lv3, t_num: 3, overrides: { TGroup: TGroup.Self, ap: 6 } },
+ { lv: 1, s_lv: SkillLv.Lv1, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 2 } },
+ { lv: 3, s_lv: SkillLv.Lv2, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 3 } },
+ { lv: 5, s_lv: SkillLv.Lv3, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 4 } },
+ { lv: 6, s_lv: SkillLv.Lv4, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 5 } },
],
},
- hp_bonus: [{ lv: 3, value: 150 }, { lv: 5, value: 150 }],
- ap_bonus: [{ lv: 5, value: 10 }],
- info: "✧受伤获得护盾",
+ info: "✧受击5次凝聚护盾",
},
5012: {
uuid: 5012, name: "不死小强", path: "hk2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Melee, hp: 600, ap: 57,
@@ -368,7 +407,6 @@ export const HeroInfo: Record = {
{ lv: 1, s_lv: SkillLv.Lv1, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 2 } },
],
},
- hp_bonus: [{ lv: 3, value: 150 }],
info: "✧受伤恢复生命",
},
5013: {
@@ -385,7 +423,6 @@ export const HeroInfo: Record = {
{ lv: 1, s_lv: SkillLv.Lv1, t_num: 5, overrides: { TGroup: TGroup.Self, ap: 2 } },
],
},
- hp_bonus: [{ lv: 3, value: 150 }],
info: "✧受伤获得护盾与生命",
},
5014: {
@@ -402,7 +439,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv3, t_num: 5, overrides: { TGroup: TGroup.Self, timed_buff_id: 7012, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 150 }],
info: "✧受伤提升攻击与暴击",
},
5015: {
@@ -421,7 +457,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv3, t_num: 5, overrides: { TGroup: TGroup.Self, timed_buff_id: 7020, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 200 }],
info: "✧受伤获得护盾与暴伤",
},
5016: {
@@ -438,8 +473,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv3, t_num: 5, overrides: { TGroup: TGroup.Self, timed_buff_id: 7017, buff_value: 10, buff_duration: 6 } },
],
},
- ap_bonus: [{ lv: 3, value: 20 }],
- hp_bonus: [{ lv: 3, value: 150 }],
info: "✧受伤提升攻击与击晕",
},
// 以下英雄暂时注释，保留待后续扩展
@@ -481,8 +514,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv2, t_num: 4, overrides: { TGroup: TGroup.Self, ap: 1 } },
],
},
- ap_bonus: [{ lv: 3, value: 20 }],
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧攻击永久提升攻击",
},
5022: {
@@ -499,8 +530,6 @@ export const HeroInfo: Record = {
{ lv: 1, s_lv: SkillLv.Lv1, t_num: 7, overrides: { TGroup: TGroup.Self, ap: 1 } },
],
},
- ap_bonus: [{ lv: 3, value: 20 }],
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧攻击限时提升暴击",
},
5023: {
@@ -517,7 +546,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv3, t_num: 5, overrides: { TGroup: TGroup.Self, timed_buff_id: 7012, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 100 }],
info: "✧攻击提升攻击与暴击",
},
// 5022: {
@@ -550,7 +578,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv2, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 2, ap: 1 } },
],
},
- hp_bonus: [{ lv: 3, value: 60 }],
info: "✧攻击提升队友攻击",
},
5032: {
@@ -568,7 +595,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv2, t_num: 7, overrides: { TGroup: TGroup.Team, hit_count: 4, ap: 1 } },
],
},
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧攻击限时提升队友暴击",
},
// 5032: {
@@ -592,7 +618,6 @@ export const HeroInfo: Record = {
{ lv: 4, s_lv: SkillLv.Lv3, t_num: 7, overrides: { TGroup: TGroup.Team, hit_count: 4, timed_buff_id: 7020, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 100 }],
info: "✧攻击提升队友攻击与暴伤",
},
// 5033: {
@@ -659,7 +684,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv4, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 100 }],
info: "✧死亡全队获得护盾",
},
5042: {
@@ -697,7 +721,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv3, t_num: 1, overrides: { TGroup: TGroup.Team, timed_buff_id: 7012, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 100 }],
info: "✧死亡全队击晕与暴击",
},
5044: {
@@ -715,7 +738,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv3, t_num: 1, overrides: { TGroup: TGroup.Team, timed_buff_id: 7020, buff_value: 10, buff_duration: 6 } },
],
},
- hp_bonus: [{ lv: 3, value: 150 }],
info: "✧死亡全队暴击与暴伤",
},
@@ -759,7 +781,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv3, t_num: 1, overrides: { TGroup: TGroup.Team, timed_buff_id: 7111, buff_value: 90, buff_duration: 10 } },
],
},
- hp_bonus: [{ lv: 2, value: 80 }, { lv: 4, value: 80 }],
info: "✧回合开始全队提升攻击",
},
5052: {
@@ -776,7 +797,6 @@ export const HeroInfo: Record = {
{ lv: 1, s_lv: SkillLv.Lv1, t_num: 1, overrides: { TGroup: TGroup.Team, ap: 2 } },
],
},
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧回合开始全队获得护盾",
},
// 5052: {
@@ -832,7 +852,6 @@ export const HeroInfo: Record = {
{ lv: 2, uuids: [7202, 7006] },
{ lv: 4, uuids: [7202, 7206] },
],
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧光环全队提升攻击\n✦追加提升攻速",
},
@@ -849,7 +868,6 @@ export const HeroInfo: Record = {
{ lv: 5, s_lv: SkillLv.Lv4, t_num: 5, overrides: { TGroup: TGroup.Team, hit_count: 2, ap: 300 } },
],
},
- hp_bonus: [{ lv: 3, value: 80 }],
info: "✧攻击治疗低血队友",
},
// 5072: {
@@ -1058,11 +1076,13 @@ export function resolveReviveByLv(revive: LvReviveEntry[] | undefined, lv: numbe
return pick ? { s_uuid: pick.s_uuid, r_num: pick.r_num, upr: pick.upr } : undefined;
}
-/** 计算目标等级下额外属性加成（hp_bonus/ap_bonus 按 lv 累加） */
+/** 计算目标等级下额外属性加成（hp_bonus/ap_bonus 一次性奖励 + 成长类型每级递增） */
function getEvolveBonuses(hero: heroInfo, targetLv: number): { hp: number, ap: number } {
- let hp = 0;
- let ap = 0;
const lv = Math.max(1, targetLv);
+ // 成长类型线性增量（仅英雄生效，怪物无 grow_type 时走 Warrior 基准但不影响平衡，因怪物通常不填）
+ const grow = hero.fac === FacSet.HERO ? calcGrowBonus(hero, lv) : { hp: 0, ap: 0 };
+ let hp = grow.hp;
+ let ap = grow.ap;
if (hero.hp_bonus) {
for (const e of hero.hp_bonus) {
if (e.lv <= lv) hp += e.value;
@@ -1076,14 +1096,12 @@ function getEvolveBonuses(hero: heroInfo, targetLv: number): { hp: number, ap: n
return { hp, ap };
}
-/** 计算目标等级下的有效 HP/AP（含等级倍率与额外加成） */
+/** 计算目标等级下的有效 HP/AP（固定基础值 + 成长递增与一次性加成） */
function getEffectiveStats(hero: heroInfo, targetLv: number): { hp: number, ap: number } {
const bonuses = getEvolveBonuses(hero, targetLv);
- const lv = Math.max(1, targetLv);
- const multiplier = Math.pow(FightSet.HERO_LV_MULTIPLIER, lv - 1);
return {
- hp: (hero.hp + bonuses.hp) * multiplier,
- ap: (hero.ap + bonuses.ap) * multiplier,
+ hp: hero.hp + bonuses.hp,
+ ap: hero.ap + bonuses.ap,
};
}
diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts
index 14106cf4..f942ccf3 100644
--- a/assets/script/game/hero/Hero.ts
+++ b/assets/script/game/hero/Hero.ts
@@ -5,7 +5,7 @@ import { smc } from "../common/SingletonModuleComp";
import { HeroAttrsComp } from "./HeroAttrsComp";
import { HeroViewComp } from "./HeroViewComp";
import { BoxSet, FacSet, FightSet, IndexSet } from "../common/config/GameSet";
-import { HeroInfo, HeroPos, resolveFormationTargetX, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv } from "../common/config/heroSet";
+import { HeroInfo, HeroPos, resolveFormationTargetX, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv, calcGrowBonus } from "../common/config/heroSet";
import { GameEvent } from "../common/config/GameEvent";
import { SkillTriggerType } from "../common/config/heroSet";
import { SkillTriggerHelper } from "./SkillTriggerHelper";
@@ -119,6 +119,7 @@ export class Hero extends ecs.Entity {
model.card_lv = card_lv;
model.base_card_lv = hero.card_lv ?? 1;
model.type = hero.type;
+ model.grow_type = hero.grow_type;
model.fac = FacSet.HERO;
model.dis = hero.dis ?? 720;
model.posIndex = posIndex;
@@ -138,10 +139,9 @@ export class Hero extends ecs.Entity {
model.ap_bonus = hero.ap_bonus;
model.hp_bonus = hero.hp_bonus;
- // 基础属性按等级倍率初始化
- // 使用指数增长公式：等级 2 时为原来的 HERO_LV_MULTIPLIER 倍，等级 3 时为 HERO_LV_MULTIPLIER^2 倍
- let base_ap = hero.ap * Math.pow(FightSet.HERO_LV_MULTIPLIER, model.lv - 1);
- let base_hp = hero.hp * Math.pow(FightSet.HERO_LV_MULTIPLIER, model.lv - 1);
+ // 基础属性：固定基础值，成长完全由 grow_type 指数递增提供（替代旧 ×2^(lv-1) 翻倍）
+ let base_ap = hero.ap;
+ let base_hp = hero.hp;
model.base_ap = base_ap;
model.base_hp = base_hp;
@@ -162,8 +162,8 @@ export class Hero extends ecs.Entity {
for (const key in hero.skills) {
const skill = hero.skills[key];
if (!skill) continue;
- // 最终技能等级 = 初始技能等级 + 英雄等级增量，且下限为 0
- model.skills[skill.uuid] = { ...skill, lv: Math.max(0, skill.lv + hero_lv - 2), ccd: 0 };
+ // 最终技能等级 = 初始技能等级 + 英雄等级增量，下限 0、上限封顶（无限升级下技能不涨过上限）
+ model.skills[skill.uuid] = { ...skill, lv: Math.min(FightSet.HERO_SKILL_MAX_LV, Math.max(0, skill.lv + hero_lv - 2)), ccd: 0 };
}
// 按当前英雄等级 resolve 触发技能/光环/复活到运行时缓存，供 SkillTriggerHelper 消费
@@ -176,7 +176,11 @@ export class Hero extends ecs.Entity {
model.runtime_field = resolveFieldByLv(model.field, hero_lv);
model.runtime_revive = resolveReviveByLv(model.revive, hero_lv);
- // 应用额外属性加成（hp_bonus/ap_bonus 按 ≤英雄等级 累加）
+ // 应用额外属性加成（成长类型每级递增 + hp_bonus/ap_bonus 一次性奖励累加）
+ // 成长增量：仅英雄生效（model.fac 已为 HERO），按 grow_type 递增曲线累计
+ const grow = calcGrowBonus(hero, hero_lv);
+ model.hp += grow.hp; model.hp_max += grow.hp;
+ model.ap += grow.ap;
if (model.hp_bonus) {
let hpExtra = 0;
for (const e of model.hp_bonus) { if (e.lv <= hero_lv) hpExtra += e.value; }
diff --git a/assets/script/game/hero/HeroAttrsComp.ts b/assets/script/game/hero/HeroAttrsComp.ts
index 280973f6..22a64b42 100644
--- a/assets/script/game/hero/HeroAttrsComp.ts
+++ b/assets/script/game/hero/HeroAttrsComp.ts
@@ -28,6 +28,7 @@ export class HeroAttrsComp extends ecs.Comp {
base_card_lv: number = 1;
type: number = 0; // 0近战 1远程 2辅助
fac: number = 0; // 0:hero 1:monster
+ grow_type?: number; // 成长类型（HGrowType），驱动每级 hp/ap 线性成长
// ==================== 基础属性（有初始值） ====================
base_ap: number = 0; // 原始基础攻击（无任何加成）
base_hp: number = 0; // 原始基础血量（无任何加成）
diff --git a/assets/script/game/map/CHeroComp.ts b/assets/script/game/map/CHeroComp.ts
index 3e3e668f..2eb15f39 100644
--- a/assets/script/game/map/CHeroComp.ts
+++ b/assets/script/game/map/CHeroComp.ts
@@ -483,6 +483,9 @@ export class CHeroComp extends CCComp {
atked: hero.atked,
field: hero.field,
revive: hero.revive,
+ grow_type: hero.grow_type,
+ ap: hero.ap,
+ hp: hero.hp,
};
}
diff --git a/assets/script/game/map/HeroBoxComp.ts b/assets/script/game/map/HeroBoxComp.ts
index dff5e828..0f55145d 100644
--- a/assets/script/game/map/HeroBoxComp.ts
+++ b/assets/script/game/map/HeroBoxComp.ts
@@ -18,7 +18,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
import { oops } from "db://oops-framework/core/Oops";
import { GameEvent } from "../common/config/GameEvent";
-import { HeroInfo } from "../common/config/heroSet";
+import { HeroInfo, calcGrowBonus } from "../common/config/heroSet";
import { HeroAttrsComp } from "../hero/HeroAttrsComp";
import { Hero } from "../hero/Hero";
import { FacSet, FightSet, getLvColor, NumberFormatter } from "../common/config/GameSet";
@@ -165,11 +165,7 @@ export class HeroBoxComp extends CCComp {
private onUpgradeHeroClick() {
if (!this.eid || !this.model) return;
const heroLv = Math.max(1, Math.floor(this.model.lv ?? 1));
- // 已满级：气泡提示，复用英雄栏 smalltip 挂载点
- if (heroLv >= FightSet.HERO_MAX_LV) {
- oops.message.dispatchEvent(GameEvent.ShowSmallTip, { type: "hero_full", text: "已达最高等级" });
- return;
- }
+ // 无限升级：不再拦截满级
oops.audio.playEffect("music/button");
const nextLv = heroLv + 1;
@@ -226,13 +222,16 @@ export class HeroBoxComp extends CCComp {
atked: hero.atked,
field: hero.field,
revive: hero.revive,
+ grow_type: hero.grow_type,
+ ap: hero.ap,
+ hp: hero.hp,
});
- // ---- 属性成长（按 HERO_LV_MULTIPLIER 幂成长 + 等级额外加成） ----
+ // ---- 属性成长（固定基础值 + 成长类型指数递增 + 一次性加成） ----
const attrLine = (lv: number): string => {
- const mult = Math.pow(FightSet.HERO_LV_MULTIPLIER, lv - 1);
- const ap = Math.floor(hero.ap * mult + HeroBoxComp.sumBonus(hero.ap_bonus, lv));
- const hp = Math.floor(hero.hp * mult + HeroBoxComp.sumBonus(hero.hp_bonus, lv));
+ const grow = calcGrowBonus(hero, lv);
+ const ap = Math.floor(hero.ap + grow.ap + HeroBoxComp.sumBonus(hero.ap_bonus, lv));
+ const hp = Math.floor(hero.hp + grow.hp + HeroBoxComp.sumBonus(hero.hp_bonus, lv));
return `攻击 ${ap} 生命 ${hp}`;
};
@@ -548,17 +547,13 @@ export class HeroBoxComp extends CCComp {
this.sell_price_label.string = `${MissionEconomy.getSellGold(lv)}`;
}
- // ---- 升级费用（满级隐藏；金币不足时标红提示） ----
+ // ---- 升级费用（无限升级：始终显示；金币不足时标红提示） ----
if (this.upgrade_price_label && this.upgrade_price_label.isValid) {
const lv = Math.max(1, Math.floor(this.model.lv ?? 1));
- if (lv >= FightSet.HERO_MAX_LV) {
- this.upgrade_price_label.string = "";
- } else {
- const cost = MissionEconomy.getUpgradeCost(lv);
- this.upgrade_price_label.string = `${cost}`;
- // 金币不足标红，足够恢复默认色，给玩家直观的可升级反馈
- this.upgrade_price_label.color = MissionEconomy.getCoin() >= cost ? Color.WHITE : HeroBoxComp.INSUFFICIENT_COLOR;
- }
+ const cost = MissionEconomy.getUpgradeCost(lv);
+ this.upgrade_price_label.string = `${cost}`;
+ // 金币不足标红，足够恢复默认色，给玩家直观的可升级反馈
+ this.upgrade_price_label.color = MissionEconomy.getCoin() >= cost ? Color.WHITE : HeroBoxComp.INSUFFICIENT_COLOR;
}
// ---- AP / HP ----
diff --git a/assets/script/game/map/MissionCardComp.ts b/assets/script/game/map/MissionCardComp.ts
index f21a545c..629b90f1 100644
--- a/assets/script/game/map/MissionCardComp.ts
+++ b/assets/script/game/map/MissionCardComp.ts
@@ -52,7 +52,7 @@ import { MissSkillsComp } from "./MissSkillsComp";
import { oops } from "db://oops-framework/core/Oops";
import { HeroAttrsComp } from "../hero/HeroAttrsComp";
import { smc } from "../common/SingletonModuleComp";
-import { HeroInfo, HType, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv } from "../common/config/heroSet";
+import { HeroInfo, HType, resolveTriggerByLv, resolveFieldByLv, resolveReviveByLv, calcGrowBonus } from "../common/config/heroSet";
import { HeroViewComp } from "../hero/HeroViewComp";
import { FacSet, FightSet } from "../common/config/GameSet";
import { MissionEconomy } from "./MissionEconomy";
@@ -771,10 +771,7 @@ export class MissionCardComp extends CCComp {
if (!eid) return;
const actor = this.queryAliveHeroActors().find(item => item.eid === eid);
if (!actor) return;
- if (actor.model.lv >= FightSet.HERO_MAX_LV) {
- oops.gui.toast(`已达最高等级`);
- return;
- }
+ // 无限升级：不再拦截满级，仅校验金币
// 统一经济管理入口：按当前等级扣费
if (!MissionEconomy.executeUpgradeCost(actor.model.lv)) {
oops.gui.toast(`金币不足`);
@@ -2192,8 +2189,7 @@ export class MissionCardComp extends CCComp {
if (!heroEid) return false;
const actor = this.queryAliveHeroActors().find(item => item.eid === heroEid);
if (!actor) return false;
- if (actor.model.lv >= FightSet.HERO_MAX_LV) return false;
- const nextLv = Math.min(FightSet.HERO_MAX_LV, actor.model.lv + 1);
+ const nextLv = actor.model.lv + 1;
this.applyHeroLevel(actor.model, nextLv);
if (actor.view) {
actor.view.playBuff("buff_lvup");
@@ -2202,8 +2198,8 @@ export class MissionCardComp extends CCComp {
}
/**
- * 应用英雄等级变化（属性按 HERO_LV_MULTIPLIER 重新计算）。
- * 沿用旧版本 SkillLvUp 的技能等级映射规则。
+ * 应用英雄等级变化（属性 = 固定基础值 + grow_type 指数递增重新计算）。
+ * 沿用旧版本 SkillLvUp 的技能等级映射规则（技能按 HERO_SKILL_MAX_LV 封顶）。
*
* 与 Hero.load 保持一致：
* 1. 同步刷新 base_ap/base_hp 快照，下游 UI/复活读到当前 lv 的基础值
@@ -2214,13 +2210,13 @@ export class MissionCardComp extends CCComp {
public applyHeroLevel(model: HeroAttrsComp, targetLv: number) {
const hero = HeroInfo[model.hero_uuid];
if (!hero) return;
- const nextLv = Math.max(1, Math.min(FightSet.HERO_MAX_LV, Math.floor(targetLv)));
+ const nextLv = Math.max(1, Math.floor(targetLv));
const hpRate = model.hp_max > 0 ? model.hp / model.hp_max : 1;
model.lv = nextLv;
- // 同步 base 快照（与 Hero.load 同公式），保证 UI/复活等下游读到当前 lv 的基础值
- const base_ap = hero.ap * Math.pow(FightSet.HERO_LV_MULTIPLIER, nextLv - 1);
- const base_hp = hero.hp * Math.pow(FightSet.HERO_LV_MULTIPLIER, nextLv - 1);
+ // 同步 base 快照（与 Hero.load 同公式：固定基础值，成长由 grow_type 指数递增提供）
+ const base_ap = hero.ap;
+ const base_hp = hero.hp;
model.base_ap = base_ap;
model.base_hp = base_hp;
@@ -2233,7 +2229,10 @@ export class MissionCardComp extends CCComp {
model.hp_max = base_hp;
}
- // 按 ≤nextLv 累加 hp_bonus/ap_bonus（沿用 Hero.load 的加法区规则）
+ // 按 ≤nextLv 累加：成长类型每级递增 + hp_bonus/ap_bonus 一次性奖励（沿用 Hero.load 的加法区规则）
+ const grow = calcGrowBonus(hero, nextLv);
+ model.hp_max += grow.hp;
+ model.ap += grow.ap;
if (model.hp_bonus) {
let hpExtra = 0;
for (const e of model.hp_bonus) { if (e.lv <= nextLv) hpExtra += e.value; }
@@ -2262,7 +2261,7 @@ export class MissionCardComp extends CCComp {
for (const key in hero.skills) {
const skill = hero.skills[key];
if (!skill) continue;
- model.skills[skill.uuid] = { ...skill, lv: Math.max(0, skill.lv + nextLv - 2), ccd: 0 };
+ model.skills[skill.uuid] = { ...skill, lv: Math.min(FightSet.HERO_SKILL_MAX_LV, Math.max(0, skill.lv + nextLv - 2)), ccd: 0 };
}
model.updateSkillDistanceCache();
model.dirty_hp = true;
diff --git a/assets/script/game/map/MissionEconomy.ts b/assets/script/game/map/MissionEconomy.ts
index 643c674b..9e410ad4 100644
--- a/assets/script/game/map/MissionEconomy.ts
+++ b/assets/script/game/map/MissionEconomy.ts
@@ -110,12 +110,12 @@ export class MissionEconomy {
}
/**
- * 计算英雄升级金币消耗（按当前等级线性缩放：Lv×5）
+ * 计算英雄升级金币消耗（指数递增：5×2^(lv-1)，无限升级下指数控速）
* @param heroLevel 当前英雄等级（升级前）
*/
static getUpgradeCost(heroLevel: number = 1): number {
const lv = Math.max(1, Math.floor(heroLevel));
- return lv * 5;
+ return Math.floor(5 * Math.pow(2, lv - 1));
}
/**
@@ -128,11 +128,14 @@ export class MissionEconomy {
}
/**
- * 计算英雄出售金币（按英雄等级缩放）
+ * 计算英雄出售金币（按累计升级投入的 50% 折算，无限升级自动缩放）。
+ * 累计投入 = 等比数列求和 Σ5×2^(i-1)（i=1..lv-1）= 5×(2^(lv-1) - 1)。
*/
static getSellGold(heroLevel: number = 1): number {
- const sellByLevel: Record = { 1: 3, 2: 10, 3: 25 };
- const baseSellGold = sellByLevel[heroLevel] || 3;
+ const lv = Math.max(1, Math.floor(heroLevel));
+ // 基础出售价 3（保底招募残值）+ 累计升级投入的 50%
+ const investTotal = 5 * (Math.pow(2, lv - 1) - 1);
+ const baseSellGold = 3 + Math.floor(investTotal * 0.5);
// 驻场英雄带来的"出售金币"加成（包含原 SellBonus 语义，统一在 SellGold 中）
const goldBoost = FieldSkillHelper.getFieldSkillTotalValue(FieldSkillType.SellGold);
const totalSellGold = baseSellGold + goldBoost;