diff --git a/assets/resources/gui/auie/popup.prefab b/assets/resources/gui/auie/popup.prefab index f22cce43..d1da2378 100644 --- a/assets/resources/gui/auie/popup.prefab +++ b/assets/resources/gui/auie/popup.prefab @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 710, - "height": 55 + "width": 720, + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -311,8 +311,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1420, - "height": 110 + "width": 1440, + "height": 2560 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -348,7 +348,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@7e6bd", + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910@2ddbe", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -363,7 +363,10 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": null, + "_atlas": { + "__uuid__": "dd7e2f04-f9b9-489b-8d38-b4971ad81910", + "__expectedType__": "cc.SpriteAtlas" + }, "_id": "" }, { @@ -486,8 +489,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1388, - "height": 78 + "width": 1408, + "height": 2528 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -608,8 +611,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 710, - "height": 55 + "width": 720, + "height": 1280 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -667,6 +670,7 @@ "__id__": 0 }, "fileId": "50T0YGiGBH7qZZFeATiEP+", + "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/gui/element/cEquip.prefab b/assets/resources/gui/element/cEquip.prefab index 4574e831..c6191abd 100644 --- a/assets/resources/gui/element/cEquip.prefab +++ b/assets/resources/gui/element/cEquip.prefab @@ -28,26 +28,26 @@ "__id__": 40 }, { - "__id__": 92 + "__id__": 87 }, { - "__id__": 124 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 148 }, { - "__id__": 155 + "__id__": 150 }, { - "__id__": 157 + "__id__": 152 } ], "_prefab": { - "__id__": 253 + "__id__": 308 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,9 +295,9 @@ ], "value": { "__type__": "cc.Color", - "r": 218, - "g": 0, - "b": 9, + "r": 255, + "g": 246, + "b": 139, "a": 255 } }, @@ -858,63 +858,54 @@ "__id__": 54 }, { - "__id__": 55 + "__id__": 56 }, { - "__id__": 57 + "__id__": 58 }, { - "__id__": 59 + "__id__": 60 }, { - "__id__": 61 + "__id__": 62 }, { - "__id__": 63 + "__id__": 64 }, { - "__id__": 65 + "__id__": 66 }, { - "__id__": 67 + "__id__": 68 }, { - "__id__": 69 + "__id__": 70 }, { - "__id__": 71 + "__id__": 72 }, { - "__id__": 73 + "__id__": 74 }, { - "__id__": 75 + "__id__": 76 }, { - "__id__": 77 + "__id__": 78 }, { - "__id__": 79 + "__id__": 80 }, { - "__id__": 81 + "__id__": 82 }, { - "__id__": 83 - }, - { - "__id__": 85 - }, - { - "__id__": 87 - }, - { - "__id__": 89 + "__id__": 84 } ], "removedComponents": [ { - "__id__": 91 + "__id__": 86 } ] }, @@ -1042,38 +1033,6 @@ "targetInfo": { "__id__": 53 }, - "propertyPath": [ - "_spriteFrame" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", - "__expectedType__": "cc.SpriteFrame" - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "075wC9BqZNpKBHWkkHGa0w" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 - }, - "propertyPath": [ - "_atlas" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", - "__expectedType__": "cc.SpriteAtlas" - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 56 - }, "propertyPath": [ "_contentSize" ], @@ -1092,7 +1051,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 55 }, "propertyPath": [ "_contentSize" @@ -1112,7 +1071,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 57 }, "propertyPath": [ "_contentSize" @@ -1132,7 +1091,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 59 }, "propertyPath": [ "_contentSize" @@ -1152,7 +1111,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 61 }, "propertyPath": [ "_contentSize" @@ -1172,7 +1131,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 63 }, "propertyPath": [ "_contentSize" @@ -1192,7 +1151,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 65 }, "propertyPath": [ "_contentSize" @@ -1212,7 +1171,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 67 }, "propertyPath": [ "_contentSize" @@ -1232,7 +1191,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 72 + "__id__": 69 }, "propertyPath": [ "_contentSize" @@ -1252,7 +1211,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 71 }, "propertyPath": [ "_contentSize" @@ -1272,15 +1231,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 76 + "__id__": 73 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 370, - "height": 370 + "width": 450, + "height": 450 } }, { @@ -1292,15 +1251,15 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 78 + "__id__": 75 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 193, - "height": 193 + "width": 233, + "height": 233 } }, { @@ -1312,48 +1271,12 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0elb3r0slJwbY2BNC1zTKn" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 82 + "__id__": 77 }, "propertyPath": [ "_active" ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 84 - }, - "propertyPath": [ - "_active" - ], - "value": false + "value": true }, { "__type__": "cc.TargetInfo", @@ -1364,7 +1287,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 86 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1380,7 +1303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1396,7 +1319,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 83 }, "propertyPath": [ "_active" @@ -1409,6 +1332,22 @@ "93fFoXu3BBYqu4RLG2YPon" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 85 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "51ns/anqVO87NRv6DMzJKj" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -1425,29 +1364,29 @@ }, "_children": [ { - "__id__": 93 + "__id__": 88 }, { - "__id__": 101 + "__id__": 96 }, { - "__id__": 109 + "__id__": 104 } ], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 112 }, { - "__id__": 119 + "__id__": 114 }, { - "__id__": 121 + "__id__": 116 } ], "_prefab": { - "__id__": 123 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -1484,23 +1423,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 94 + "__id__": 89 }, { - "__id__": 96 + "__id__": 91 }, { - "__id__": 98 + "__id__": 93 } ], "_prefab": { - "__id__": 100 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -1537,11 +1476,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 90 }, "_contentSize": { "__type__": "cc.Size", @@ -1565,11 +1504,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 92 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1633,11 +1572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 94 }, "_alignFlags": 40, "_target": null, @@ -1682,23 +1621,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 102 + "__id__": 97 }, { - "__id__": 104 + "__id__": 99 }, { - "__id__": 106 + "__id__": 101 } ], "_prefab": { - "__id__": 108 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -1735,11 +1674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -1763,11 +1702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1831,11 +1770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 102 }, "_alignFlags": 40, "_target": null, @@ -1880,23 +1819,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 105 }, { - "__id__": 112 + "__id__": 107 }, { - "__id__": 114 + "__id__": 109 } ], "_prefab": { - "__id__": 116 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1933,11 +1872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 106 }, "_contentSize": { "__type__": "cc.Size", @@ -1961,11 +1900,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 108 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2029,11 +1968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 110 }, "_alignFlags": 40, "_target": null, @@ -2078,11 +2017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2106,11 +2045,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 115 }, "_alignFlags": 45, "_target": null, @@ -2142,11 +2081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 117 }, "_resizeMode": 1, "_layoutType": 2, @@ -2194,14 +2133,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 125 + "__id__": 120 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 124 + "__id__": 119 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2209,7 +2148,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 126 + "__id__": 121 }, "targetOverrides": null }, @@ -2222,29 +2161,38 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 122 + }, + { + "__id__": 124 + }, + { + "__id__": 125 + }, + { + "__id__": 126 + }, { "__id__": 127 }, { "__id__": 129 }, - { - "__id__": 130 - }, { "__id__": 131 }, { - "__id__": 132 + "__id__": 133 }, { - "__id__": 134 + "__id__": 135 }, { - "__id__": 136 + "__id__": 137 }, { - "__id__": 138 + "__id__": 139 }, { "__id__": 140 @@ -2256,16 +2204,7 @@ "__id__": 144 }, { - "__id__": 145 - }, - { - "__id__": 147 - }, - { - "__id__": 149 - }, - { - "__id__": 151 + "__id__": 146 } ], "removedComponents": [] @@ -2273,7 +2212,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 123 }, "propertyPath": [ "_name" @@ -2289,7 +2228,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 123 }, "propertyPath": [ "_lpos" @@ -2304,7 +2243,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 123 }, "propertyPath": [ "_lrot" @@ -2320,7 +2259,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 123 }, "propertyPath": [ "_euler" @@ -2335,7 +2274,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 133 + "__id__": 128 }, "propertyPath": [ "_contentSize" @@ -2355,7 +2294,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 130 }, "propertyPath": [ "_contentSize" @@ -2375,7 +2314,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 137 + "__id__": 132 }, "propertyPath": [ "_contentSize" @@ -2395,7 +2334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 134 }, "propertyPath": [ "_lpos" @@ -2416,7 +2355,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 136 }, "propertyPath": [ "_contentSize" @@ -2436,7 +2375,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 138 }, "propertyPath": [ "_top" @@ -2452,7 +2391,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 138 }, "propertyPath": [ "_bottom" @@ -2462,7 +2401,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 146 + "__id__": 141 }, "propertyPath": [ "_active" @@ -2478,7 +2417,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 143 }, "propertyPath": [ "_lpos" @@ -2499,7 +2438,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 145 }, "propertyPath": [ "_color" @@ -2521,7 +2460,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 152 + "__id__": 147 }, "propertyPath": [ "_color" @@ -2550,7 +2489,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -2578,7 +2517,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 151 }, "_alignFlags": 40, "_target": null, @@ -2614,31 +2553,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 153 }, "icon_node": { - "__id__": 159 + "__id__": 154 }, "bg_node": { - "__id__": 167 + "__id__": 194 }, "name_label": { "__id__": 24 }, "fied1": { - "__id__": 96 + "__id__": 91 }, "fied2": { - "__id__": 104 + "__id__": 99 }, "fied3": { - "__id__": 112 + "__id__": 107 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 124 + "__id__": 119 }, "_id": "" }, @@ -2652,23 +2591,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 155 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 160 + "__id__": 189 }, { - "__id__": 162 - }, - { - "__id__": 164 + "__id__": 191 } ], "_prefab": { - "__id__": 166 + "__id__": 193 }, "_lpos": { "__type__": "cc.Vec3", @@ -2685,8 +2621,130 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, + "x": 0.9, + "y": 0.9, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 40 + }, + "_children": [ + { + "__id__": 156 + }, + { + "__id__": 154 + }, + { + "__id__": 162 + }, + { + "__id__": 168 + }, + { + "__id__": 174 + } + ], + "_active": true, + "_components": [ + { + "__id__": 180 + }, + { + "__id__": 182 + }, + { + "__id__": 184 + }, + { + "__id__": 186 + } + ], + "_prefab": { + "__id__": 188 + }, + "_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": "ItemFrame00~03_BgGlow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 155 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 157 + }, + { + "__id__": 159 + } + ], + "_prefab": { + "__id__": 161 + }, + "_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": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -2705,16 +2763,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 133, + "height": 133 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2725,7 +2783,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0elb3r0slJwbY2BNC1zTKn" + "fileId": "104MEwfepJOojH2VuLhJOd" }, { "__type__": "cc.Sprite", @@ -2733,11 +2791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2750,11 +2808,147 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e217d", "__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": "8eUcY/ZzxGerlWs7mB2pN3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1aXiaxY2xGibmv+6AL2LT7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 155 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 163 + }, + { + "__id__": 165 + } + ], + "_prefab": { + "__id__": 167 + }, + "_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": 0.9, + "y": 0.9, + "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__": 162 + }, + "_enabled": true, + "__prefab": { + "__id__": 164 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acwGVgSsdCUIEmlLZVMZbN" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 162 + }, + "_enabled": true, + "__prefab": { + "__id__": 166 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -2766,50 +2960,14 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "075wC9BqZNpKBHWkkHGa0w" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 159 - }, - "_enabled": true, - "__prefab": { - "__id__": 165 - }, - "_alignFlags": 45, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 15, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 78, - "_originalHeight": 78, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "979E8VFL1G3qbMjoTp5l0c" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -2819,7 +2977,519 @@ "asset": { "__id__": 0 }, - "fileId": "a33ReyWcpAoZY5ieotS6Ir", + "fileId": "146QBwBOlH6LhCFATSJzVj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "equip", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 155 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 169 + }, + { + "__id__": 171 + } + ], + "_prefab": { + "__id__": 173 + }, + "_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": 0.9, + "y": 0.9, + "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__": 168 + }, + "_enabled": true, + "__prefab": { + "__id__": 170 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23LtSLPpxPLbmAJs09fdIw" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 168 + }, + "_enabled": true, + "__prefab": { + "__id__": 172 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dzgwgV3tNZJEoewp8KY38" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 155 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 175 + }, + { + "__id__": 177 + } + ], + "_prefab": { + "__id__": 179 + }, + "_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": 0.9, + "y": 0.9, + "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__": 174 + }, + "_enabled": true, + "__prefab": { + "__id__": 176 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8GRaxM2BNv76iifo8Ck5A" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 174 + }, + "_enabled": true, + "__prefab": { + "__id__": 178 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13FTxdrcpMHrkutB9UhlCj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ebx0efAj5OQo5tDYo7CJ1Y", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 155 + }, + "_enabled": true, + "__prefab": { + "__id__": 181 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03nWLvwvFC5YKsJgnNXuKJ" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 155 + }, + "_enabled": true, + "__prefab": { + "__id__": 183 + }, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08gc0G6tZOap5VMXyIUk96" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 155 + }, + "_enabled": true, + "__prefab": { + "__id__": 185 + }, + "_alignFlags": 45, + "_target": null, + "_left": 5, + "_right": 5, + "_top": 5, + "_bottom": 5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4aJp4RicZF+KFW5/t1OofP" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 155 + }, + "_enabled": true, + "__prefab": { + "__id__": 187 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c4keB0pt9LtbZHrkWB7R0n" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c7ymg5OshHabafeZJICJug", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 154 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fdak7SgstFMLwEvzn6+Pbp" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 154 + }, + "_enabled": true, + "__prefab": { + "__id__": 192 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7ekr/R70BLWL/gB7w5hxpx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93wpdyvytKPqGrBBUDf293", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2834,32 +3504,35 @@ }, "_children": [ { - "__id__": 168 + "__id__": 195 }, { - "__id__": 184 + "__id__": 211 }, { - "__id__": 200 + "__id__": 227 }, { - "__id__": 216 + "__id__": 243 }, { - "__id__": 232 + "__id__": 259 + }, + { + "__id__": 275 } ], "_active": true, "_components": [ { - "__id__": 248 + "__id__": 303 }, { - "__id__": 250 + "__id__": 305 } ], "_prefab": { - "__id__": 252 + "__id__": 307 }, "_lpos": { "__type__": "cc.Vec3", @@ -2896,27 +3569,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 194 }, "_children": [ { - "__id__": 169 + "__id__": 196 } ], "_active": false, "_components": [ { - "__id__": 177 + "__id__": 204 }, { - "__id__": 179 + "__id__": 206 }, { - "__id__": 181 + "__id__": 208 } ], "_prefab": { - "__id__": 183 + "__id__": 210 }, "_lpos": { "__type__": "cc.Vec3", @@ -2953,23 +3626,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 195 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 197 }, { - "__id__": 172 + "__id__": 199 }, { - "__id__": 174 + "__id__": 201 } ], "_prefab": { - "__id__": 176 + "__id__": 203 }, "_lpos": { "__type__": "cc.Vec3", @@ -3006,16 +3679,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 198 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3034,11 +3707,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3082,11 +3755,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 202 }, "_alignFlags": 45, "_target": null, @@ -3131,16 +3804,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 205 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3159,11 +3832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 207 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3207,11 +3880,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 209 }, "_alignFlags": 45, "_target": null, @@ -3256,27 +3929,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 194 }, "_children": [ { - "__id__": 185 + "__id__": 212 } ], "_active": false, "_components": [ { - "__id__": 193 + "__id__": 220 }, { - "__id__": 195 + "__id__": 222 }, { - "__id__": 197 + "__id__": 224 } ], "_prefab": { - "__id__": 199 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -3313,23 +3986,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 213 }, { - "__id__": 188 + "__id__": 215 }, { - "__id__": 190 + "__id__": 217 } ], "_prefab": { - "__id__": 192 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -3366,16 +4039,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 214 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3394,11 +4067,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 216 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3439,11 +4112,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 218 }, "_alignFlags": 45, "_target": null, @@ -3488,16 +4161,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 221 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3516,11 +4189,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 223 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3564,11 +4237,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 225 }, "_alignFlags": 45, "_target": null, @@ -3613,27 +4286,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 194 }, "_children": [ { - "__id__": 201 + "__id__": 228 } ], "_active": false, "_components": [ { - "__id__": 209 + "__id__": 236 }, { - "__id__": 211 + "__id__": 238 }, { - "__id__": 213 + "__id__": 240 } ], "_prefab": { - "__id__": 215 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -3670,23 +4343,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 227 }, "_children": [], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 229 }, { - "__id__": 204 + "__id__": 231 }, { - "__id__": 206 + "__id__": 233 } ], "_prefab": { - "__id__": 208 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -3723,16 +4396,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3751,11 +4424,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3799,11 +4472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 234 }, "_alignFlags": 45, "_target": null, @@ -3848,16 +4521,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3876,11 +4549,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3924,11 +4597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 241 }, "_alignFlags": 45, "_target": null, @@ -3973,27 +4646,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 194 }, "_children": [ { - "__id__": 217 + "__id__": 244 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 225 + "__id__": 252 }, { - "__id__": 227 + "__id__": 254 }, { - "__id__": 229 + "__id__": 256 } ], "_prefab": { - "__id__": 231 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -4030,23 +4703,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 216 + "__id__": 243 }, "_children": [], "_active": true, "_components": [ { - "__id__": 218 + "__id__": 245 }, { - "__id__": 220 + "__id__": 247 }, { - "__id__": 222 + "__id__": 249 } ], "_prefab": { - "__id__": 224 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -4083,11 +4756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 246 }, "_contentSize": { "__type__": "cc.Size", @@ -4111,11 +4784,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 248 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4159,11 +4832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 217 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 250 }, "_alignFlags": 45, "_target": null, @@ -4208,11 +4881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -4236,11 +4909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4284,11 +4957,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 216 + "__id__": 243 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 257 }, "_alignFlags": 45, "_target": null, @@ -4333,27 +5006,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 194 }, "_children": [ { - "__id__": 233 + "__id__": 260 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 241 + "__id__": 268 }, { - "__id__": 243 + "__id__": 270 }, { - "__id__": 245 + "__id__": 272 } ], "_prefab": { - "__id__": 247 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -4390,23 +5063,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 232 + "__id__": 259 }, "_children": [], "_active": true, "_components": [ { - "__id__": 234 + "__id__": 261 }, { - "__id__": 236 + "__id__": 263 }, { - "__id__": 238 + "__id__": 265 } ], "_prefab": { - "__id__": 240 + "__id__": 267 }, "_lpos": { "__type__": "cc.Vec3", @@ -4443,11 +5116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -4471,11 +5144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4519,11 +5192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 266 }, "_alignFlags": 45, "_target": null, @@ -4568,11 +5241,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -4596,11 +5269,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 271 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4644,11 +5317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 232 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 273 }, "_alignFlags": 45, "_target": null, @@ -4687,17 +5360,640 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 194 + }, + "_children": [ + { + "__id__": 276 + }, + { + "__id__": 284 + }, + { + "__id__": 292 + } + ], + "_active": false, + "_components": [ + { + "__id__": 300 + } + ], + "_prefab": { + "__id__": 302 + }, + "_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": "ItemFrame_Square_03_InnerBorder1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 275 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 277 + }, + { + "__id__": 279 + }, + { + "__id__": 281 + } + ], + "_prefab": { + "__id__": 283 + }, + "_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.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 278 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 280 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 126, + "b": 185, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdw29+nndGY4mHhULUKpcp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 282 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 48, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c29FKZj1dLY7MBfjR9CZ1j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deVarRuaFN1LhVMF8Wr72H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_InnerBorder2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 275 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 285 + }, + { + "__id__": 287 + }, + { + "__id__": 289 + } + ], + "_prefab": { + "__id__": 291 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 284 + }, + "_enabled": true, + "__prefab": { + "__id__": 286 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 88 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76Sa4mmOZMQrMumtAHxyo2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 284 + }, + "_enabled": true, + "__prefab": { + "__id__": 288 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 38, + "g": 61, + "b": 112, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 284 + }, + "_enabled": true, + "__prefab": { + "__id__": 290 + }, + "_alignFlags": 45, + "_target": null, + "_left": 6, + "_right": 6, + "_top": 6, + "_bottom": 6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea6Ym3niBBkZkK1S3FsMEf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "68ynJ6KthFHKvnm/9hhwDy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 275 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 293 + }, + { + "__id__": 295 + }, + { + "__id__": 297 + } + ], + "_prefab": { + "__id__": 299 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 292 + }, + "_enabled": true, + "__prefab": { + "__id__": 294 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19t10HqqxDEp2LKqJQnjiC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 292 + }, + "_enabled": true, + "__prefab": { + "__id__": 296 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 28, + "g": 23, + "b": 50, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80zToIZShG5JGX0MPHQLpU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 292 + }, + "_enabled": true, + "__prefab": { + "__id__": 298 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 52, + "_originalHeight": 52, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bep9e5Pp1IkL7MXt7p4y78" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oHa+DbJBxaNK0AtFNYj1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 275 + }, + "_enabled": true, + "__prefab": { + "__id__": 301 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13yEVDrg9IQLLM3+IGDJ2i" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "64e/C4RgNPCLJGkqpPb6fG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 194 + }, + "_enabled": true, + "__prefab": { + "__id__": 304 }, "_contentSize": { "__type__": "cc.Size", @@ -4721,11 +6017,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 306 }, "_alignFlags": 45, "_target": null, @@ -4776,15 +6072,15 @@ "instance": null, "targetOverrides": [ { - "__id__": 254 + "__id__": 309 }, { - "__id__": 256 + "__id__": 311 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 124 + "__id__": 119 }, { "__id__": 40 @@ -4797,7 +6093,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 157 + "__id__": 152 }, "sourceInfo": null, "propertyPath": [ @@ -4807,19 +6103,19 @@ "__id__": 40 }, "targetInfo": { - "__id__": 255 + "__id__": 310 } }, { "__type__": "cc.TargetInfo", "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" + "93wpdyvytKPqGrBBUDf293" ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 157 + "__id__": 152 }, "sourceInfo": null, "propertyPath": [ @@ -4829,7 +6125,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 257 + "__id__": 312 } }, { diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab index 1d7fd5e6..1222c64e 100644 --- a/assets/resources/gui/element/cHero.prefab +++ b/assets/resources/gui/element/cHero.prefab @@ -28,26 +28,26 @@ "__id__": 40 }, { - "__id__": 134 + "__id__": 126 }, { - "__id__": 166 + "__id__": 158 } ], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 187 }, { - "__id__": 197 + "__id__": 189 }, { - "__id__": 199 + "__id__": 191 } ], "_prefab": { - "__id__": 327 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,9 +295,9 @@ ], "value": { "__type__": "cc.Color", - "r": 85, - "g": 65, - "b": 65, + "r": 134, + "g": 106, + "b": 33, "a": 255 } }, @@ -933,10 +933,13 @@ "__id__": 107 }, { - "__id__": 109 + "__id__": 108 }, { - "__id__": 111 + "__id__": 110 + }, + { + "__id__": 112 }, { "__id__": 113 @@ -945,42 +948,27 @@ "__id__": 114 }, { - "__id__": 116 + "__id__": 115 }, { - "__id__": 118 + "__id__": 117 }, { - "__id__": 120 + "__id__": 119 }, { "__id__": 121 }, - { - "__id__": 122 - }, { "__id__": 123 }, { - "__id__": 125 - }, - { - "__id__": 127 - }, - { - "__id__": 129 - }, - { - "__id__": 131 - }, - { - "__id__": 132 + "__id__": 124 } ], "removedComponents": [ { - "__id__": 133 + "__id__": 125 } ] }, @@ -1126,44 +1114,6 @@ "targetInfo": { "__id__": 56 }, - "propertyPath": [ - "_spriteFrame" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", - "__expectedType__": "cc.SpriteFrame" - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "075wC9BqZNpKBHWkkHGa0w" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 58 - }, - "propertyPath": [ - "_atlas" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", - "__expectedType__": "cc.SpriteAtlas" - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "075wC9BqZNpKBHWkkHGa0w" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 60 - }, "propertyPath": [ "_contentSize" ], @@ -1182,7 +1132,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 58 }, "propertyPath": [ "_contentSize" @@ -1202,7 +1152,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 60 }, "propertyPath": [ "_contentSize" @@ -1222,7 +1172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 62 }, "propertyPath": [ "_contentSize" @@ -1242,7 +1192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 64 }, "propertyPath": [ "_contentSize" @@ -1262,7 +1212,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 66 }, "propertyPath": [ "_contentSize" @@ -1282,7 +1232,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 72 + "__id__": 68 }, "propertyPath": [ "_contentSize" @@ -1302,7 +1252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 70 }, "propertyPath": [ "_contentSize" @@ -1322,7 +1272,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 76 + "__id__": 72 }, "propertyPath": [ "_contentSize" @@ -1342,7 +1292,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 78 + "__id__": 74 }, "propertyPath": [ "_contentSize" @@ -1362,7 +1312,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 76 }, "propertyPath": [ "_contentSize" @@ -1382,7 +1332,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 82 + "__id__": 78 }, "propertyPath": [ "_contentSize" @@ -1402,27 +1352,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0elb3r0slJwbY2BNC1zTKn" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 86 + "__id__": 80 }, "propertyPath": [ "_active" @@ -1438,7 +1368,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 82 }, "propertyPath": [ "_contentSize" @@ -1458,7 +1388,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 84 }, "propertyPath": [ "_active" @@ -1474,7 +1404,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 92 + "__id__": 86 }, "propertyPath": [ "_active" @@ -1490,7 +1420,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 94 + "__id__": 88 }, "propertyPath": [ "_active" @@ -1506,7 +1436,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 90 }, "propertyPath": [ "_active" @@ -1522,7 +1452,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 92 }, "propertyPath": [ "_active" @@ -1538,7 +1468,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 94 }, "propertyPath": [ "_active" @@ -1551,6 +1481,59 @@ "93fFoXu3BBYqu4RLG2YPon" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 96 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c8GUMPCaFLxq7iBjkJgK3j" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 98 + }, + "propertyPath": [ + "_top" + ], + "value": 0 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "baf1d9tPZAd4fOS6WGAm8G" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 100 + }, + "propertyPath": [ + "_bottom" + ], + "value": 0 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "baf1d9tPZAd4fOS6WGAm8G" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -1569,7 +1552,7 @@ { "__type__": "cc.TargetInfo", "localID": [ - "c8GUMPCaFLxq7iBjkJgK3j" + "c8niXKCPZJkZO13m9+xJNN" ] }, { @@ -1585,7 +1568,7 @@ { "__type__": "cc.TargetInfo", "localID": [ - "baf1d9tPZAd4fOS6WGAm8G" + "18zuChgCtJMJcsGZMZXNa3" ] }, { @@ -1598,43 +1581,6 @@ ], "value": 0 }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "baf1d9tPZAd4fOS6WGAm8G" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 108 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c8niXKCPZJkZO13m9+xJNN" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 110 - }, - "propertyPath": [ - "_top" - ], - "value": 0 - }, { "__type__": "cc.TargetInfo", "localID": [ @@ -1644,23 +1590,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 112 - }, - "propertyPath": [ - "_bottom" - ], - "value": 0 - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "18zuChgCtJMJcsGZMZXNa3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 90 + "__id__": 84 }, "propertyPath": [ "_lscale" @@ -1675,7 +1605,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 115 + "__id__": 109 }, "propertyPath": [ "_lscale" @@ -1696,23 +1626,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 117 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 119 + "__id__": 111 }, "propertyPath": [ "_spriteFrame" @@ -1728,7 +1642,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 119 + "__id__": 111 }, "propertyPath": [ "_atlas" @@ -1738,7 +1652,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 119 + "__id__": 111 }, "propertyPath": [ "_type" @@ -1748,7 +1662,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 119 + "__id__": 111 }, "propertyPath": [ "_sizeMode" @@ -1758,7 +1672,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 116 }, "propertyPath": [ "_contentSize" @@ -1778,7 +1692,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 118 }, "propertyPath": [ "_color" @@ -1800,7 +1714,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 120 }, "propertyPath": [ "_color" @@ -1822,7 +1736,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 122 }, "propertyPath": [ "_color" @@ -1844,7 +1758,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 122 }, "propertyPath": [ "_useGrayscale" @@ -1854,7 +1768,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 118 }, "propertyPath": [ "_useGrayscale" @@ -1876,30 +1790,30 @@ "__id__": 1 }, "_children": [ + { + "__id__": 127 + }, { "__id__": 135 }, { "__id__": 143 - }, - { - "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 159 + "__id__": 151 }, { - "__id__": 161 + "__id__": 153 }, { - "__id__": 163 + "__id__": 155 } ], "_prefab": { - "__id__": 165 + "__id__": 157 }, "_lpos": { "__type__": "cc.Vec3", @@ -1936,23 +1850,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 126 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 128 }, { - "__id__": 138 + "__id__": 130 }, { - "__id__": 140 + "__id__": 132 } ], "_prefab": { - "__id__": 142 + "__id__": 134 }, "_lpos": { "__type__": "cc.Vec3", @@ -1989,11 +1903,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 129 }, "_contentSize": { "__type__": "cc.Size", @@ -2017,11 +1931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 131 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2085,11 +1999,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 133 }, "_alignFlags": 40, "_target": null, @@ -2134,23 +2048,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 126 }, "_children": [], "_active": true, "_components": [ { - "__id__": 144 + "__id__": 136 }, { - "__id__": 146 + "__id__": 138 }, { - "__id__": 148 + "__id__": 140 } ], "_prefab": { - "__id__": 150 + "__id__": 142 }, "_lpos": { "__type__": "cc.Vec3", @@ -2187,11 +2101,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", @@ -2215,11 +2129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 147 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2283,11 +2197,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 143 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 141 }, "_alignFlags": 40, "_target": null, @@ -2332,23 +2246,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 126 }, "_children": [], "_active": true, "_components": [ { - "__id__": 152 + "__id__": 144 }, { - "__id__": 154 + "__id__": 146 }, { - "__id__": 156 + "__id__": 148 } ], "_prefab": { - "__id__": 158 + "__id__": 150 }, "_lpos": { "__type__": "cc.Vec3", @@ -2385,11 +2299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -2413,11 +2327,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 155 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2481,11 +2395,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 157 + "__id__": 149 }, "_alignFlags": 40, "_target": null, @@ -2530,11 +2444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 152 }, "_contentSize": { "__type__": "cc.Size", @@ -2558,11 +2472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 154 }, "_alignFlags": 45, "_target": null, @@ -2594,11 +2508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 156 }, "_resizeMode": 1, "_layoutType": 2, @@ -2646,14 +2560,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 167 + "__id__": 159 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 166 + "__id__": 158 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2661,7 +2575,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 168 + "__id__": 160 }, "targetOverrides": null }, @@ -2675,17 +2589,29 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 169 + "__id__": 161 }, { - "__id__": 171 + "__id__": 163 + }, + { + "__id__": 164 + }, + { + "__id__": 165 + }, + { + "__id__": 166 + }, + { + "__id__": 168 + }, + { + "__id__": 170 }, { "__id__": 172 }, - { - "__id__": 173 - }, { "__id__": 174 }, @@ -2696,28 +2622,16 @@ "__id__": 178 }, { - "__id__": 180 + "__id__": 179 }, { - "__id__": 182 + "__id__": 181 }, { - "__id__": 184 + "__id__": 183 }, { - "__id__": 186 - }, - { - "__id__": 187 - }, - { - "__id__": 189 - }, - { - "__id__": 191 - }, - { - "__id__": 193 + "__id__": 185 } ], "removedComponents": [] @@ -2725,7 +2639,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 162 }, "propertyPath": [ "_name" @@ -2741,7 +2655,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 162 }, "propertyPath": [ "_lpos" @@ -2756,7 +2670,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 162 }, "propertyPath": [ "_lrot" @@ -2772,7 +2686,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 162 }, "propertyPath": [ "_euler" @@ -2787,7 +2701,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 175 + "__id__": 167 }, "propertyPath": [ "_contentSize" @@ -2807,7 +2721,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 177 + "__id__": 169 }, "propertyPath": [ "_contentSize" @@ -2827,7 +2741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 171 }, "propertyPath": [ "_contentSize" @@ -2847,7 +2761,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 181 + "__id__": 173 }, "propertyPath": [ "_lpos" @@ -2868,7 +2782,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 175 }, "propertyPath": [ "_contentSize" @@ -2888,7 +2802,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 185 + "__id__": 177 }, "propertyPath": [ "_top" @@ -2904,7 +2818,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 185 + "__id__": 177 }, "propertyPath": [ "_bottom" @@ -2914,7 +2828,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 188 + "__id__": 180 }, "propertyPath": [ "_active" @@ -2930,7 +2844,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 190 + "__id__": 182 }, "propertyPath": [ "_lpos" @@ -2951,7 +2865,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 192 + "__id__": 184 }, "propertyPath": [ "_color" @@ -2973,7 +2887,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 194 + "__id__": 186 }, "propertyPath": [ "_color" @@ -3002,7 +2916,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -3030,7 +2944,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 198 + "__id__": 190 }, "_alignFlags": 0, "_target": null, @@ -3066,31 +2980,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 192 }, "icon_node": { - "__id__": 201 + "__id__": 193 }, "bg_node": { - "__id__": 241 + "__id__": 233 }, "name_label": { "__id__": 24 }, "fied1": { - "__id__": 138 + "__id__": 130 }, "fied2": { - "__id__": 146 + "__id__": 138 }, "fied3": { - "__id__": 154 + "__id__": 146 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 166 + "__id__": 158 }, "_id": "" }, @@ -3104,20 +3018,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 236 + "__id__": 228 }, { - "__id__": 238 + "__id__": 230 } ], "_prefab": { - "__id__": 240 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -3158,38 +3072,38 @@ }, "_children": [ { - "__id__": 203 + "__id__": 195 + }, + { + "__id__": 193 }, { "__id__": 201 }, { - "__id__": 209 + "__id__": 207 }, { - "__id__": 215 - }, - { - "__id__": 221 + "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 227 + "__id__": 219 }, { - "__id__": 229 + "__id__": 221 }, { - "__id__": 231 + "__id__": 223 }, { - "__id__": 233 + "__id__": 225 } ], "_prefab": { - "__id__": 235 + "__id__": 227 }, "_lpos": { "__type__": "cc.Vec3", @@ -3226,20 +3140,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 204 + "__id__": 196 }, { - "__id__": 206 + "__id__": 198 } ], "_prefab": { - "__id__": 208 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -3276,11 +3190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -3304,11 +3218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3362,20 +3276,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 210 + "__id__": 202 }, { - "__id__": 212 + "__id__": 204 } ], "_prefab": { - "__id__": 214 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -3412,11 +3326,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -3440,11 +3354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 209 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3501,20 +3415,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 216 + "__id__": 208 }, { - "__id__": 218 + "__id__": 210 } ], "_prefab": { - "__id__": 220 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -3551,11 +3465,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -3579,11 +3493,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3640,20 +3554,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 222 + "__id__": 214 }, { - "__id__": 224 + "__id__": 216 } ], "_prefab": { - "__id__": 226 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -3690,11 +3604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -3718,11 +3632,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 221 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 225 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3779,11 +3693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 220 }, "_contentSize": { "__type__": "cc.Size", @@ -3807,11 +3721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 222 }, "_type": 0, "_inverted": false, @@ -3829,11 +3743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 224 }, "_alignFlags": 45, "_target": null, @@ -3865,11 +3779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3924,11 +3838,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 229 }, "_contentSize": { "__type__": "cc.Size", @@ -3952,11 +3866,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 239 + "__id__": 231 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4011,32 +3925,35 @@ }, "_children": [ { - "__id__": 242 + "__id__": 234 }, { - "__id__": 258 + "__id__": 250 }, { - "__id__": 274 + "__id__": 266 }, { - "__id__": 290 + "__id__": 282 }, { - "__id__": 306 + "__id__": 298 + }, + { + "__id__": 314 } ], "_active": true, "_components": [ { - "__id__": 322 + "__id__": 342 }, { - "__id__": 324 + "__id__": 344 } ], "_prefab": { - "__id__": 326 + "__id__": 346 }, "_lpos": { "__type__": "cc.Vec3", @@ -4073,27 +3990,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 241 + "__id__": 233 }, "_children": [ { - "__id__": 243 + "__id__": 235 } ], "_active": false, "_components": [ { - "__id__": 251 + "__id__": 243 }, { - "__id__": 253 + "__id__": 245 }, { - "__id__": 255 + "__id__": 247 } ], "_prefab": { - "__id__": 257 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -4130,23 +4047,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 242 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 244 + "__id__": 236 }, { - "__id__": 246 + "__id__": 238 }, { - "__id__": 248 + "__id__": 240 } ], "_prefab": { - "__id__": 250 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -4183,11 +4100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -4211,11 +4128,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4259,11 +4176,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 241 }, "_alignFlags": 45, "_target": null, @@ -4308,11 +4225,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -4336,11 +4253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4384,11 +4301,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 248 }, "_alignFlags": 45, "_target": null, @@ -4433,27 +4350,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 241 + "__id__": 233 }, "_children": [ { - "__id__": 259 + "__id__": 251 } ], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 259 }, { - "__id__": 269 + "__id__": 261 }, { - "__id__": 271 + "__id__": 263 } ], "_prefab": { - "__id__": 273 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -4490,23 +4407,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 258 + "__id__": 250 }, "_children": [], "_active": true, "_components": [ { - "__id__": 260 + "__id__": 252 }, { - "__id__": 262 + "__id__": 254 }, { - "__id__": 264 + "__id__": 256 } ], "_prefab": { - "__id__": 266 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -4543,11 +4460,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 259 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -4571,11 +4488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 259 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 255 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4616,11 +4533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 259 + "__id__": 251 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 257 }, "_alignFlags": 45, "_target": null, @@ -4665,11 +4582,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 268 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", @@ -4693,11 +4610,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 270 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4741,11 +4658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 258 + "__id__": 250 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 264 }, "_alignFlags": 45, "_target": null, @@ -4790,27 +4707,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 241 + "__id__": 233 }, "_children": [ { - "__id__": 275 + "__id__": 267 } ], "_active": false, "_components": [ { - "__id__": 283 + "__id__": 275 }, { - "__id__": 285 + "__id__": 277 }, { - "__id__": 287 + "__id__": 279 } ], "_prefab": { - "__id__": 289 + "__id__": 281 }, "_lpos": { "__type__": "cc.Vec3", @@ -4847,23 +4764,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 274 + "__id__": 266 }, "_children": [], "_active": true, "_components": [ { - "__id__": 276 + "__id__": 268 }, { - "__id__": 278 + "__id__": 270 }, { - "__id__": 280 + "__id__": 272 } ], "_prefab": { - "__id__": 282 + "__id__": 274 }, "_lpos": { "__type__": "cc.Vec3", @@ -4900,11 +4817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 269 }, "_contentSize": { "__type__": "cc.Size", @@ -4928,11 +4845,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 271 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4976,11 +4893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 275 + "__id__": 267 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 273 }, "_alignFlags": 45, "_target": null, @@ -5025,11 +4942,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 274 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 276 }, "_contentSize": { "__type__": "cc.Size", @@ -5053,11 +4970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 274 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 278 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5101,11 +5018,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 274 + "__id__": 266 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 280 }, "_alignFlags": 45, "_target": null, @@ -5150,27 +5067,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 241 + "__id__": 233 }, "_children": [ { - "__id__": 291 + "__id__": 283 } ], "_active": false, "_components": [ { - "__id__": 299 + "__id__": 291 }, { - "__id__": 301 + "__id__": 293 }, { - "__id__": 303 + "__id__": 295 } ], "_prefab": { - "__id__": 305 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -5207,23 +5124,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 290 + "__id__": 282 }, "_children": [], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 284 }, { - "__id__": 294 + "__id__": 286 }, { - "__id__": 296 + "__id__": 288 } ], "_prefab": { - "__id__": 298 + "__id__": 290 }, "_lpos": { "__type__": "cc.Vec3", @@ -5260,11 +5177,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 285 }, "_contentSize": { "__type__": "cc.Size", @@ -5288,11 +5205,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 295 + "__id__": 287 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5336,11 +5253,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 291 + "__id__": 283 }, "_enabled": true, "__prefab": { - "__id__": 297 + "__id__": 289 }, "_alignFlags": 45, "_target": null, @@ -5385,11 +5302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 292 }, "_contentSize": { "__type__": "cc.Size", @@ -5413,11 +5330,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 294 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5461,11 +5378,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 296 }, "_alignFlags": 45, "_target": null, @@ -5510,27 +5427,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 241 + "__id__": 233 }, "_children": [ { - "__id__": 307 + "__id__": 299 } ], "_active": false, "_components": [ { - "__id__": 315 + "__id__": 307 }, { - "__id__": 317 + "__id__": 309 }, { - "__id__": 319 + "__id__": 311 } ], "_prefab": { - "__id__": 321 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -5567,23 +5484,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 306 + "__id__": 298 }, "_children": [], "_active": true, "_components": [ { - "__id__": 308 + "__id__": 300 }, { - "__id__": 310 + "__id__": 302 }, { - "__id__": 312 + "__id__": 304 } ], "_prefab": { - "__id__": 314 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -5620,11 +5537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 301 }, "_contentSize": { "__type__": "cc.Size", @@ -5648,11 +5565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 303 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5696,11 +5613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 307 + "__id__": 299 }, "_enabled": true, "__prefab": { - "__id__": 313 + "__id__": 305 }, "_alignFlags": 45, "_target": null, @@ -5745,11 +5662,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -5773,11 +5690,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5821,11 +5738,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 306 + "__id__": 298 }, "_enabled": true, "__prefab": { - "__id__": 320 + "__id__": 312 }, "_alignFlags": 45, "_target": null, @@ -5864,18 +5781,641 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 233 + }, + "_children": [ + { + "__id__": 315 + }, + { + "__id__": 323 + }, + { + "__id__": 331 + } + ], + "_active": false, + "_components": [ + { + "__id__": 339 + } + ], + "_prefab": { + "__id__": 341 + }, + "_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": "ItemFrame_Square_03_InnerBorder1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 314 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 316 + }, + { + "__id__": 318 + }, + { + "__id__": 320 + } + ], + "_prefab": { + "__id__": 322 + }, + "_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.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 315 }, "_enabled": true, "__prefab": { + "__id__": 317 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 315 + }, + "_enabled": true, + "__prefab": { + "__id__": 319 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 126, + "b": 185, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdw29+nndGY4mHhULUKpcp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 315 + }, + "_enabled": true, + "__prefab": { + "__id__": 321 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 48, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c29FKZj1dLY7MBfjR9CZ1j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deVarRuaFN1LhVMF8Wr72H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_InnerBorder2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 314 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 324 + }, + { + "__id__": 326 + }, + { + "__id__": 328 + } + ], + "_prefab": { + "__id__": 330 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { "__id__": 323 }, + "_enabled": true, + "__prefab": { + "__id__": 325 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 88 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76Sa4mmOZMQrMumtAHxyo2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 323 + }, + "_enabled": true, + "__prefab": { + "__id__": 327 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 38, + "g": 61, + "b": 112, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 323 + }, + "_enabled": true, + "__prefab": { + "__id__": 329 + }, + "_alignFlags": 45, + "_target": null, + "_left": 6, + "_right": 6, + "_top": 6, + "_bottom": 6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea6Ym3niBBkZkK1S3FsMEf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "68ynJ6KthFHKvnm/9hhwDy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 314 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 332 + }, + { + "__id__": 334 + }, + { + "__id__": 336 + } + ], + "_prefab": { + "__id__": 338 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 331 + }, + "_enabled": true, + "__prefab": { + "__id__": 333 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19t10HqqxDEp2LKqJQnjiC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 331 + }, + "_enabled": true, + "__prefab": { + "__id__": 335 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 28, + "g": 23, + "b": 50, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80zToIZShG5JGX0MPHQLpU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 331 + }, + "_enabled": true, + "__prefab": { + "__id__": 337 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 52, + "_originalHeight": 52, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bep9e5Pp1IkL7MXt7p4y78" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oHa+DbJBxaNK0AtFNYj1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 314 + }, + "_enabled": true, + "__prefab": { + "__id__": 340 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13yEVDrg9IQLLM3+IGDJ2i" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "64e/C4RgNPCLJGkqpPb6fG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 233 + }, + "_enabled": true, + "__prefab": { + "__id__": 343 + }, "_contentSize": { "__type__": "cc.Size", "width": 90, @@ -5898,11 +6438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 241 + "__id__": 233 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 345 }, "_alignFlags": 45, "_target": null, @@ -5953,15 +6493,15 @@ "instance": null, "targetOverrides": [ { - "__id__": 328 + "__id__": 348 }, { - "__id__": 330 + "__id__": 350 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 166 + "__id__": 158 }, { "__id__": 40 @@ -5974,7 +6514,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 199 + "__id__": 191 }, "sourceInfo": null, "propertyPath": [ @@ -5984,7 +6524,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 329 + "__id__": 349 } }, { @@ -5996,7 +6536,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 199 + "__id__": 191 }, "sourceInfo": null, "propertyPath": [ @@ -6006,7 +6546,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 331 + "__id__": 351 } }, { diff --git a/assets/resources/gui/element/cItem.prefab b/assets/resources/gui/element/cItem.prefab index 25de5b7e..0bcaaeb0 100644 --- a/assets/resources/gui/element/cItem.prefab +++ b/assets/resources/gui/element/cItem.prefab @@ -28,26 +28,26 @@ "__id__": 40 }, { - "__id__": 90 + "__id__": 100 }, { - "__id__": 122 + "__id__": 132 } ], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 161 }, { - "__id__": 153 + "__id__": 163 }, { - "__id__": 155 + "__id__": 165 } ], "_prefab": { - "__id__": 283 + "__id__": 321 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,9 +295,9 @@ ], "value": { "__type__": "cc.Color", - "r": 76, - "g": 192, - "b": 47, + "r": 158, + "g": 255, + "b": 134, "a": 255 } }, @@ -858,60 +858,78 @@ "__id__": 54 }, { - "__id__": 55 + "__id__": 56 }, { - "__id__": 57 + "__id__": 58 }, { - "__id__": 59 + "__id__": 60 }, { - "__id__": 61 + "__id__": 62 }, { - "__id__": 63 + "__id__": 64 }, { - "__id__": 65 + "__id__": 66 }, { - "__id__": 67 + "__id__": 68 }, { - "__id__": 69 + "__id__": 70 }, { - "__id__": 71 + "__id__": 72 }, { - "__id__": 73 + "__id__": 74 }, { - "__id__": 75 + "__id__": 76 }, { - "__id__": 77 + "__id__": 78 }, { - "__id__": 79 + "__id__": 80 }, { - "__id__": 81 + "__id__": 82 }, { - "__id__": 83 + "__id__": 84 }, { - "__id__": 85 + "__id__": 86 }, { - "__id__": 87 + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 91 + }, + { + "__id__": 93 + }, + { + "__id__": 94 + }, + { + "__id__": 96 + }, + { + "__id__": 98 } ], "removedComponents": [ { - "__id__": 89 + "__id__": 99 } ] }, @@ -1039,38 +1057,6 @@ "targetInfo": { "__id__": 53 }, - "propertyPath": [ - "_spriteFrame" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", - "__expectedType__": "cc.SpriteFrame" - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "075wC9BqZNpKBHWkkHGa0w" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 - }, - "propertyPath": [ - "_atlas" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", - "__expectedType__": "cc.SpriteAtlas" - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 56 - }, "propertyPath": [ "_contentSize" ], @@ -1089,7 +1075,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 55 }, "propertyPath": [ "_contentSize" @@ -1109,7 +1095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 57 }, "propertyPath": [ "_contentSize" @@ -1129,7 +1115,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 59 }, "propertyPath": [ "_contentSize" @@ -1149,7 +1135,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 61 }, "propertyPath": [ "_contentSize" @@ -1169,7 +1155,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 63 }, "propertyPath": [ "_contentSize" @@ -1189,7 +1175,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 65 }, "propertyPath": [ "_contentSize" @@ -1209,7 +1195,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 67 }, "propertyPath": [ "_contentSize" @@ -1229,7 +1215,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 72 + "__id__": 69 }, "propertyPath": [ "_contentSize" @@ -1249,7 +1235,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 71 }, "propertyPath": [ "_contentSize" @@ -1269,7 +1255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 76 + "__id__": 73 }, "propertyPath": [ "_contentSize" @@ -1289,7 +1275,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 78 + "__id__": 75 }, "propertyPath": [ "_contentSize" @@ -1309,27 +1295,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0elb3r0slJwbY2BNC1zTKn" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 82 + "__id__": 77 }, "propertyPath": [ "_active" @@ -1345,7 +1311,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1361,7 +1327,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 86 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1377,7 +1343,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 83 }, "propertyPath": [ "_active" @@ -1390,6 +1356,159 @@ "d3r4ZGziNEz77IzWW7ndja" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 85 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "deVarRuaFN1LhVMF8Wr72H" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "68ynJ6KthFHKvnm/9hhwDy" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 89 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 86, + "height": 86 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e2LJMsJCxMdZP6mZ0DhjCz" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 85 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 92 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "76Sa4mmOZMQrMumtAHxyo2" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 87 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 95 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1oHa+DbJBxaNK0AtFNYj1" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 97 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "19t10HqqxDEp2LKqJQnjiC" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 95 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -1406,29 +1525,29 @@ }, "_children": [ { - "__id__": 91 + "__id__": 101 }, { - "__id__": 99 + "__id__": 109 }, { - "__id__": 107 + "__id__": 117 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 125 }, { - "__id__": 117 + "__id__": 127 }, { - "__id__": 119 + "__id__": 129 } ], "_prefab": { - "__id__": 121 + "__id__": 131 }, "_lpos": { "__type__": "cc.Vec3", @@ -1465,23 +1584,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 102 }, { - "__id__": 94 + "__id__": 104 }, { - "__id__": 96 + "__id__": 106 } ], "_prefab": { - "__id__": 98 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -1518,11 +1637,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 103 }, "_contentSize": { "__type__": "cc.Size", @@ -1546,11 +1665,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 105 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1614,11 +1733,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 101 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 107 }, "_alignFlags": 40, "_target": null, @@ -1663,23 +1782,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 110 }, { - "__id__": 102 + "__id__": 112 }, { - "__id__": 104 + "__id__": 114 } ], "_prefab": { - "__id__": 106 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1716,11 +1835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -1744,11 +1863,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 113 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1812,11 +1931,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 109 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 115 }, "_alignFlags": 40, "_target": null, @@ -1861,23 +1980,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 100 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 118 }, { - "__id__": 110 + "__id__": 120 }, { - "__id__": 112 + "__id__": 122 } ], "_prefab": { - "__id__": 114 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -1914,11 +2033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -1942,11 +2061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2010,11 +2129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 123 }, "_alignFlags": 40, "_target": null, @@ -2059,11 +2178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -2087,11 +2206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 128 }, "_alignFlags": 45, "_target": null, @@ -2123,11 +2242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 100 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 130 }, "_resizeMode": 1, "_layoutType": 2, @@ -2175,14 +2294,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 123 + "__id__": 133 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 122 + "__id__": 132 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2190,7 +2309,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 124 + "__id__": 134 }, "targetOverrides": null }, @@ -2204,32 +2323,17 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 125 + "__id__": 135 }, { - "__id__": 127 - }, - { - "__id__": 128 - }, - { - "__id__": 129 - }, - { - "__id__": 130 - }, - { - "__id__": 132 - }, - { - "__id__": 134 - }, - { - "__id__": 136 + "__id__": 137 }, { "__id__": 138 }, + { + "__id__": 139 + }, { "__id__": 140 }, @@ -2237,16 +2341,31 @@ "__id__": 142 }, { - "__id__": 143 + "__id__": 144 }, { - "__id__": 145 + "__id__": 146 }, { - "__id__": 147 + "__id__": 148 }, { - "__id__": 149 + "__id__": 150 + }, + { + "__id__": 152 + }, + { + "__id__": 153 + }, + { + "__id__": 155 + }, + { + "__id__": 157 + }, + { + "__id__": 159 } ], "removedComponents": [] @@ -2254,7 +2373,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 136 }, "propertyPath": [ "_name" @@ -2270,7 +2389,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 136 }, "propertyPath": [ "_lpos" @@ -2285,7 +2404,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 136 }, "propertyPath": [ "_lrot" @@ -2301,7 +2420,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 136 }, "propertyPath": [ "_euler" @@ -2316,7 +2435,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 131 + "__id__": 141 }, "propertyPath": [ "_contentSize" @@ -2336,7 +2455,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 133 + "__id__": 143 }, "propertyPath": [ "_contentSize" @@ -2356,7 +2475,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 145 }, "propertyPath": [ "_contentSize" @@ -2376,7 +2495,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 137 + "__id__": 147 }, "propertyPath": [ "_lpos" @@ -2397,7 +2516,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 149 }, "propertyPath": [ "_contentSize" @@ -2417,7 +2536,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 151 }, "propertyPath": [ "_top" @@ -2433,7 +2552,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 151 }, "propertyPath": [ "_bottom" @@ -2443,7 +2562,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 154 }, "propertyPath": [ "_active" @@ -2459,7 +2578,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 146 + "__id__": 156 }, "propertyPath": [ "_lpos" @@ -2480,7 +2599,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 158 }, "propertyPath": [ "_color" @@ -2502,7 +2621,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 160 }, "propertyPath": [ "_color" @@ -2531,7 +2650,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -2559,7 +2678,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 164 }, "_alignFlags": 40, "_target": null, @@ -2595,31 +2714,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 166 }, "icon_node": { - "__id__": 157 + "__id__": 167 }, "bg_node": { - "__id__": 197 + "__id__": 207 }, "name_label": { "__id__": 24 }, "fied1": { - "__id__": 94 + "__id__": 104 }, "fied2": { - "__id__": 102 + "__id__": 112 }, "fied3": { - "__id__": 110 + "__id__": 120 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 122 + "__id__": 132 }, "_id": "" }, @@ -2633,20 +2752,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 192 + "__id__": 202 }, { - "__id__": 194 + "__id__": 204 } ], "_prefab": { - "__id__": 196 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -2687,38 +2806,38 @@ }, "_children": [ { - "__id__": 159 + "__id__": 169 }, { - "__id__": 157 + "__id__": 167 }, { - "__id__": 165 + "__id__": 175 }, { - "__id__": 171 + "__id__": 181 }, { - "__id__": 177 + "__id__": 187 } ], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 193 }, { - "__id__": 185 + "__id__": 195 }, { - "__id__": 187 + "__id__": 197 }, { - "__id__": 189 + "__id__": 199 } ], "_prefab": { - "__id__": 191 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -2755,20 +2874,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 168 }, "_children": [], "_active": true, "_components": [ { - "__id__": 160 + "__id__": 170 }, { - "__id__": 162 + "__id__": 172 } ], "_prefab": { - "__id__": 164 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -2805,11 +2924,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -2833,11 +2952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 159 + "__id__": 169 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2891,20 +3010,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 168 }, "_children": [], "_active": false, "_components": [ { - "__id__": 166 + "__id__": 176 }, { - "__id__": 168 + "__id__": 178 } ], "_prefab": { - "__id__": 170 + "__id__": 180 }, "_lpos": { "__type__": "cc.Vec3", @@ -2941,11 +3060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 167 + "__id__": 177 }, "_contentSize": { "__type__": "cc.Size", @@ -2969,11 +3088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 175 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 179 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3030,20 +3149,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 168 }, "_children": [], "_active": false, "_components": [ { - "__id__": 172 + "__id__": 182 }, { - "__id__": 174 + "__id__": 184 } ], "_prefab": { - "__id__": 176 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -3080,11 +3199,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -3108,11 +3227,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 181 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3169,20 +3288,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 158 + "__id__": 168 }, "_children": [], "_active": false, "_components": [ { - "__id__": 178 + "__id__": 188 }, { - "__id__": 180 + "__id__": 190 } ], "_prefab": { - "__id__": 182 + "__id__": 192 }, "_lpos": { "__type__": "cc.Vec3", @@ -3219,11 +3338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 189 }, "_contentSize": { "__type__": "cc.Size", @@ -3247,11 +3366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 187 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 191 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3308,11 +3427,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 194 }, "_contentSize": { "__type__": "cc.Size", @@ -3336,11 +3455,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 196 }, "_type": 0, "_inverted": false, @@ -3358,11 +3477,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 198 }, "_alignFlags": 45, "_target": null, @@ -3394,11 +3513,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 158 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 200 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3453,11 +3572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -3481,11 +3600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 167 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3546,32 +3665,35 @@ }, "_children": [ { - "__id__": 198 + "__id__": 208 }, { - "__id__": 214 + "__id__": 224 }, { - "__id__": 230 + "__id__": 240 }, { - "__id__": 246 + "__id__": 256 }, { - "__id__": 262 + "__id__": 272 + }, + { + "__id__": 288 } ], "_active": true, "_components": [ { - "__id__": 278 + "__id__": 316 }, { - "__id__": 280 + "__id__": 318 } ], "_prefab": { - "__id__": 282 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -3608,27 +3730,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 207 }, "_children": [ { - "__id__": 199 + "__id__": 209 } ], "_active": true, "_components": [ { - "__id__": 207 + "__id__": 217 }, { - "__id__": 209 + "__id__": 219 }, { - "__id__": 211 + "__id__": 221 } ], "_prefab": { - "__id__": 213 + "__id__": 223 }, "_lpos": { "__type__": "cc.Vec3", @@ -3665,23 +3787,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 210 }, { - "__id__": 202 + "__id__": 212 }, { - "__id__": 204 + "__id__": 214 } ], "_prefab": { - "__id__": 206 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -3718,11 +3840,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -3746,11 +3868,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3794,11 +3916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 215 }, "_alignFlags": 45, "_target": null, @@ -3843,11 +3965,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -3871,11 +3993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3919,11 +4041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 222 }, "_alignFlags": 45, "_target": null, @@ -3968,27 +4090,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 207 }, "_children": [ { - "__id__": 215 + "__id__": 225 } ], "_active": false, "_components": [ { - "__id__": 223 + "__id__": 233 }, { - "__id__": 225 + "__id__": 235 }, { - "__id__": 227 + "__id__": 237 } ], "_prefab": { - "__id__": 229 + "__id__": 239 }, "_lpos": { "__type__": "cc.Vec3", @@ -4025,23 +4147,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 224 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 226 }, { - "__id__": 218 + "__id__": 228 }, { - "__id__": 220 + "__id__": 230 } ], "_prefab": { - "__id__": 222 + "__id__": 232 }, "_lpos": { "__type__": "cc.Vec3", @@ -4078,16 +4200,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4106,11 +4228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4151,11 +4273,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 231 }, "_alignFlags": 45, "_target": null, @@ -4200,16 +4322,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4228,11 +4350,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 236 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4276,11 +4398,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 224 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 238 }, "_alignFlags": 45, "_target": null, @@ -4325,27 +4447,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 207 }, "_children": [ { - "__id__": 231 + "__id__": 241 } ], "_active": false, "_components": [ { - "__id__": 239 + "__id__": 249 }, { - "__id__": 241 + "__id__": 251 }, { - "__id__": 243 + "__id__": 253 } ], "_prefab": { - "__id__": 245 + "__id__": 255 }, "_lpos": { "__type__": "cc.Vec3", @@ -4382,23 +4504,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 230 + "__id__": 240 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 242 }, { - "__id__": 234 + "__id__": 244 }, { - "__id__": 236 + "__id__": 246 } ], "_prefab": { - "__id__": 238 + "__id__": 248 }, "_lpos": { "__type__": "cc.Vec3", @@ -4435,16 +4557,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 243 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4463,11 +4585,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 245 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4511,11 +4633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 247 }, "_alignFlags": 45, "_target": null, @@ -4560,16 +4682,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 250 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4588,11 +4710,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 252 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4636,11 +4758,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 240 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 254 }, "_alignFlags": 45, "_target": null, @@ -4685,27 +4807,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 207 }, "_children": [ { - "__id__": 247 + "__id__": 257 } ], "_active": false, "_components": [ { - "__id__": 255 + "__id__": 265 }, { - "__id__": 257 + "__id__": 267 }, { - "__id__": 259 + "__id__": 269 } ], "_prefab": { - "__id__": 261 + "__id__": 271 }, "_lpos": { "__type__": "cc.Vec3", @@ -4742,23 +4864,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 246 + "__id__": 256 }, "_children": [], "_active": true, "_components": [ { - "__id__": 248 + "__id__": 258 }, { - "__id__": 250 + "__id__": 260 }, { - "__id__": 252 + "__id__": 262 } ], "_prefab": { - "__id__": 254 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", @@ -4795,16 +4917,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 259 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4823,11 +4945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 251 + "__id__": 261 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4871,11 +4993,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 247 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 263 }, "_alignFlags": 45, "_target": null, @@ -4920,16 +5042,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 266 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4948,11 +5070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 268 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4996,11 +5118,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 246 + "__id__": 256 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 270 }, "_alignFlags": 45, "_target": null, @@ -5045,27 +5167,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 197 + "__id__": 207 }, "_children": [ { - "__id__": 263 + "__id__": 273 } ], "_active": false, "_components": [ { - "__id__": 271 + "__id__": 281 }, { - "__id__": 273 + "__id__": 283 }, { - "__id__": 275 + "__id__": 285 } ], "_prefab": { - "__id__": 277 + "__id__": 287 }, "_lpos": { "__type__": "cc.Vec3", @@ -5102,23 +5224,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 272 }, "_children": [], "_active": true, "_components": [ { - "__id__": 264 + "__id__": 274 }, { - "__id__": 266 + "__id__": 276 }, { - "__id__": 268 + "__id__": 278 } ], "_prefab": { - "__id__": 270 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -5155,16 +5277,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 275 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5183,11 +5305,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 277 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5231,11 +5353,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 273 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 279 }, "_alignFlags": 45, "_target": null, @@ -5280,16 +5402,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 272 + "__id__": 282 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5308,11 +5430,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 284 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5356,11 +5478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 272 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 286 }, "_alignFlags": 45, "_target": null, @@ -5399,17 +5521,640 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 207 + }, + "_children": [ + { + "__id__": 289 + }, + { + "__id__": 297 + }, + { + "__id__": 305 + } + ], + "_active": false, + "_components": [ + { + "__id__": 313 + } + ], + "_prefab": { + "__id__": 315 + }, + "_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": "ItemFrame_Square_03_InnerBorder1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 288 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 290 + }, + { + "__id__": 292 + }, + { + "__id__": 294 + } + ], + "_prefab": { + "__id__": 296 + }, + "_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.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 289 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 291 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 86, + "height": 86 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 289 + }, + "_enabled": true, + "__prefab": { + "__id__": 293 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 126, + "b": 185, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdw29+nndGY4mHhULUKpcp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 289 + }, + "_enabled": true, + "__prefab": { + "__id__": 295 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 48, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c29FKZj1dLY7MBfjR9CZ1j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deVarRuaFN1LhVMF8Wr72H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_InnerBorder2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 288 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 298 + }, + { + "__id__": 300 + }, + { + "__id__": 302 + } + ], + "_prefab": { + "__id__": 304 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 297 + }, + "_enabled": true, + "__prefab": { + "__id__": 299 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76Sa4mmOZMQrMumtAHxyo2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 297 + }, + "_enabled": true, + "__prefab": { + "__id__": 301 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 38, + "g": 61, + "b": 112, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 297 + }, + "_enabled": true, + "__prefab": { + "__id__": 303 + }, + "_alignFlags": 45, + "_target": null, + "_left": 6, + "_right": 6, + "_top": 6, + "_bottom": 6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea6Ym3niBBkZkK1S3FsMEf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "68ynJ6KthFHKvnm/9hhwDy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 288 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 306 + }, + { + "__id__": 308 + }, + { + "__id__": 310 + } + ], + "_prefab": { + "__id__": 312 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 305 + }, + "_enabled": true, + "__prefab": { + "__id__": 307 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19t10HqqxDEp2LKqJQnjiC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 305 + }, + "_enabled": true, + "__prefab": { + "__id__": 309 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 28, + "g": 23, + "b": 50, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80zToIZShG5JGX0MPHQLpU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 305 + }, + "_enabled": true, + "__prefab": { + "__id__": 311 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 52, + "_originalHeight": 52, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bep9e5Pp1IkL7MXt7p4y78" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oHa+DbJBxaNK0AtFNYj1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 288 + }, + "_enabled": true, + "__prefab": { + "__id__": 314 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13yEVDrg9IQLLM3+IGDJ2i" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "64e/C4RgNPCLJGkqpPb6fG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 207 + }, + "_enabled": true, + "__prefab": { + "__id__": 317 }, "_contentSize": { "__type__": "cc.Size", @@ -5433,11 +6178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 197 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 319 }, "_alignFlags": 45, "_target": null, @@ -5488,15 +6233,15 @@ "instance": null, "targetOverrides": [ { - "__id__": 284 + "__id__": 322 }, { - "__id__": 286 + "__id__": 324 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 122 + "__id__": 132 }, { "__id__": 40 @@ -5509,7 +6254,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 155 + "__id__": 165 }, "sourceInfo": null, "propertyPath": [ @@ -5519,7 +6264,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 285 + "__id__": 323 } }, { @@ -5531,7 +6276,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 155 + "__id__": 165 }, "sourceInfo": null, "propertyPath": [ @@ -5541,7 +6286,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 287 + "__id__": 325 } }, { diff --git a/assets/resources/gui/element/cSkill.prefab b/assets/resources/gui/element/cSkill.prefab index 3bd67c05..6c6f3cf0 100644 --- a/assets/resources/gui/element/cSkill.prefab +++ b/assets/resources/gui/element/cSkill.prefab @@ -28,26 +28,26 @@ "__id__": 40 }, { - "__id__": 90 + "__id__": 85 }, { - "__id__": 122 + "__id__": 117 } ], "_active": true, "_components": [ { - "__id__": 151 + "__id__": 146 }, { - "__id__": 153 + "__id__": 148 }, { - "__id__": 155 + "__id__": 150 } ], "_prefab": { - "__id__": 251 + "__id__": 306 }, "_lpos": { "__type__": "cc.Vec3", @@ -295,9 +295,9 @@ ], "value": { "__type__": "cc.Color", - "r": 0, - "g": 143, - "b": 255, + "r": 92, + "g": 185, + "b": 247, "a": 255 } }, @@ -858,60 +858,51 @@ "__id__": 54 }, { - "__id__": 55 + "__id__": 56 }, { - "__id__": 57 + "__id__": 58 }, { - "__id__": 59 + "__id__": 60 }, { - "__id__": 61 + "__id__": 62 }, { - "__id__": 63 + "__id__": 64 }, { - "__id__": 65 + "__id__": 66 }, { - "__id__": 67 + "__id__": 68 }, { - "__id__": 69 + "__id__": 70 }, { - "__id__": 71 + "__id__": 72 }, { - "__id__": 73 + "__id__": 74 }, { - "__id__": 75 + "__id__": 76 }, { - "__id__": 77 + "__id__": 78 }, { - "__id__": 79 + "__id__": 80 }, { - "__id__": 81 - }, - { - "__id__": 83 - }, - { - "__id__": 85 - }, - { - "__id__": 87 + "__id__": 82 } ], "removedComponents": [ { - "__id__": 89 + "__id__": 84 } ] }, @@ -1039,38 +1030,6 @@ "targetInfo": { "__id__": 53 }, - "propertyPath": [ - "_spriteFrame" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", - "__expectedType__": "cc.SpriteFrame" - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "075wC9BqZNpKBHWkkHGa0w" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 53 - }, - "propertyPath": [ - "_atlas" - ], - "value": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", - "__expectedType__": "cc.SpriteAtlas" - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 56 - }, "propertyPath": [ "_contentSize" ], @@ -1089,7 +1048,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 58 + "__id__": 55 }, "propertyPath": [ "_contentSize" @@ -1109,7 +1068,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 60 + "__id__": 57 }, "propertyPath": [ "_contentSize" @@ -1129,7 +1088,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 62 + "__id__": 59 }, "propertyPath": [ "_contentSize" @@ -1149,7 +1108,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 64 + "__id__": 61 }, "propertyPath": [ "_contentSize" @@ -1169,7 +1128,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 66 + "__id__": 63 }, "propertyPath": [ "_contentSize" @@ -1189,7 +1148,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 68 + "__id__": 65 }, "propertyPath": [ "_contentSize" @@ -1209,7 +1168,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 70 + "__id__": 67 }, "propertyPath": [ "_contentSize" @@ -1229,7 +1188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 72 + "__id__": 69 }, "propertyPath": [ "_contentSize" @@ -1249,7 +1208,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 74 + "__id__": 71 }, "propertyPath": [ "_contentSize" @@ -1269,7 +1228,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 76 + "__id__": 73 }, "propertyPath": [ "_contentSize" @@ -1289,7 +1248,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 78 + "__id__": 75 }, "propertyPath": [ "_contentSize" @@ -1309,27 +1268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "0elb3r0slJwbY2BNC1zTKn" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 82 + "__id__": 77 }, "propertyPath": [ "_active" @@ -1345,7 +1284,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 79 }, "propertyPath": [ "_active" @@ -1361,7 +1300,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 86 + "__id__": 81 }, "propertyPath": [ "_active" @@ -1377,7 +1316,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 88 + "__id__": 83 }, "propertyPath": [ "_active" @@ -1406,29 +1345,29 @@ }, "_children": [ { - "__id__": 91 + "__id__": 86 }, { - "__id__": 99 + "__id__": 94 }, { - "__id__": 107 + "__id__": 102 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 110 }, { - "__id__": 117 + "__id__": 112 }, { - "__id__": 119 + "__id__": 114 } ], "_prefab": { - "__id__": 121 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", @@ -1465,23 +1404,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 85 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 87 }, { - "__id__": 94 + "__id__": 89 }, { - "__id__": 96 + "__id__": 91 } ], "_prefab": { - "__id__": 98 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -1518,11 +1457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -1546,11 +1485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1614,11 +1553,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 92 }, "_alignFlags": 40, "_target": null, @@ -1663,23 +1602,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 85 }, "_children": [], "_active": true, "_components": [ { - "__id__": 100 + "__id__": 95 }, { - "__id__": 102 + "__id__": 97 }, { - "__id__": 104 + "__id__": 99 } ], "_prefab": { - "__id__": 106 + "__id__": 101 }, "_lpos": { "__type__": "cc.Vec3", @@ -1716,11 +1655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 101 + "__id__": 96 }, "_contentSize": { "__type__": "cc.Size", @@ -1744,11 +1683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 98 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1812,11 +1751,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 99 + "__id__": 94 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 100 }, "_alignFlags": 40, "_target": null, @@ -1861,23 +1800,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 85 }, "_children": [], "_active": true, "_components": [ { - "__id__": 108 + "__id__": 103 }, { - "__id__": 110 + "__id__": 105 }, { - "__id__": 112 + "__id__": 107 } ], "_prefab": { - "__id__": 114 + "__id__": 109 }, "_lpos": { "__type__": "cc.Vec3", @@ -1914,11 +1853,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 104 }, "_contentSize": { "__type__": "cc.Size", @@ -1942,11 +1881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 106 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2010,11 +1949,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 102 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 108 }, "_alignFlags": 40, "_target": null, @@ -2059,11 +1998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 111 }, "_contentSize": { "__type__": "cc.Size", @@ -2087,11 +2026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 113 }, "_alignFlags": 45, "_target": null, @@ -2123,11 +2062,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 115 }, "_resizeMode": 1, "_layoutType": 2, @@ -2175,14 +2114,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 123 + "__id__": 118 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 122 + "__id__": 117 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -2190,7 +2129,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 124 + "__id__": 119 }, "targetOverrides": null }, @@ -2203,29 +2142,38 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ + { + "__id__": 120 + }, + { + "__id__": 122 + }, + { + "__id__": 123 + }, + { + "__id__": 124 + }, { "__id__": 125 }, { "__id__": 127 }, - { - "__id__": 128 - }, { "__id__": 129 }, { - "__id__": 130 + "__id__": 131 }, { - "__id__": 132 + "__id__": 133 }, { - "__id__": 134 + "__id__": 135 }, { - "__id__": 136 + "__id__": 137 }, { "__id__": 138 @@ -2237,16 +2185,7 @@ "__id__": 142 }, { - "__id__": 143 - }, - { - "__id__": 145 - }, - { - "__id__": 147 - }, - { - "__id__": 149 + "__id__": 144 } ], "removedComponents": [] @@ -2254,7 +2193,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 121 }, "propertyPath": [ "_name" @@ -2270,7 +2209,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 121 }, "propertyPath": [ "_lpos" @@ -2285,7 +2224,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 121 }, "propertyPath": [ "_lrot" @@ -2301,7 +2240,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 121 }, "propertyPath": [ "_euler" @@ -2316,7 +2255,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 131 + "__id__": 126 }, "propertyPath": [ "_contentSize" @@ -2336,7 +2275,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 133 + "__id__": 128 }, "propertyPath": [ "_contentSize" @@ -2356,7 +2295,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 130 }, "propertyPath": [ "_contentSize" @@ -2376,7 +2315,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 137 + "__id__": 132 }, "propertyPath": [ "_lpos" @@ -2397,7 +2336,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 134 }, "propertyPath": [ "_contentSize" @@ -2417,7 +2356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 136 }, "propertyPath": [ "_top" @@ -2433,7 +2372,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 136 }, "propertyPath": [ "_bottom" @@ -2443,7 +2382,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 144 + "__id__": 139 }, "propertyPath": [ "_active" @@ -2459,7 +2398,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 146 + "__id__": 141 }, "propertyPath": [ "_lpos" @@ -2480,7 +2419,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 148 + "__id__": 143 }, "propertyPath": [ "_color" @@ -2502,7 +2441,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 150 + "__id__": 145 }, "propertyPath": [ "_color" @@ -2531,7 +2470,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -2559,7 +2498,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 149 }, "_alignFlags": 40, "_target": null, @@ -2595,31 +2534,31 @@ }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 151 }, "icon_node": { - "__id__": 157 + "__id__": 152 }, "bg_node": { - "__id__": 165 + "__id__": 192 }, "name_label": { "__id__": 24 }, "fied1": { - "__id__": 94 + "__id__": 89 }, "fied2": { - "__id__": 102 + "__id__": 97 }, "fied3": { - "__id__": 110 + "__id__": 105 }, "level_label": { "__id__": 30 }, "buy_node": { - "__id__": 122 + "__id__": 117 }, "_id": "" }, @@ -2633,23 +2572,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 40 + "__id__": 153 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 158 + "__id__": 187 }, { - "__id__": 160 - }, - { - "__id__": 162 + "__id__": 189 } ], "_prefab": { - "__id__": 164 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -2666,8 +2602,130 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.6, - "y": 0.6, + "x": 0.9, + "y": 0.9, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Mask", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 40 + }, + "_children": [ + { + "__id__": 154 + }, + { + "__id__": 152 + }, + { + "__id__": 160 + }, + { + "__id__": 166 + }, + { + "__id__": 172 + } + ], + "_active": true, + "_components": [ + { + "__id__": 178 + }, + { + "__id__": 180 + }, + { + "__id__": 182 + }, + { + "__id__": 184 + } + ], + "_prefab": { + "__id__": 186 + }, + "_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": "ItemFrame00~03_BgGlow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 153 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 155 + }, + { + "__id__": 157 + } + ], + "_prefab": { + "__id__": 159 + }, + "_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": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, @@ -2686,16 +2744,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 156 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 133, + "height": 133 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2706,7 +2764,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0elb3r0slJwbY2BNC1zTKn" + "fileId": "104MEwfepJOojH2VuLhJOd" }, { "__type__": "cc.Sprite", @@ -2714,11 +2772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 157 + "__id__": 154 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 158 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2731,11 +2789,147 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20@048d1", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@e217d", "__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": "8eUcY/ZzxGerlWs7mB2pN3" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1aXiaxY2xGibmv+6AL2LT7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 153 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 161 + }, + { + "__id__": 163 + } + ], + "_prefab": { + "__id__": 165 + }, + "_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": 0.9, + "y": 0.9, + "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__": 160 + }, + "_enabled": true, + "__prefab": { + "__id__": 162 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acwGVgSsdCUIEmlLZVMZbN" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 160 + }, + "_enabled": true, + "__prefab": { + "__id__": 164 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -2747,50 +2941,14 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "2842dc10-d89e-4ff6-8a11-6d09bf48cf20", + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "075wC9BqZNpKBHWkkHGa0w" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 157 - }, - "_enabled": true, - "__prefab": { - "__id__": 163 - }, - "_alignFlags": 45, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 15, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 78, - "_originalHeight": 78, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "979E8VFL1G3qbMjoTp5l0c" + "fileId": "8dbZob0aNPQJ3mFkIF47XB" }, { "__type__": "cc.PrefabInfo", @@ -2800,7 +2958,519 @@ "asset": { "__id__": 0 }, - "fileId": "a33ReyWcpAoZY5ieotS6Ir", + "fileId": "146QBwBOlH6LhCFATSJzVj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "equip", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 153 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 167 + }, + { + "__id__": 169 + } + ], + "_prefab": { + "__id__": 171 + }, + "_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": 0.9, + "y": 0.9, + "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__": 166 + }, + "_enabled": true, + "__prefab": { + "__id__": 168 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23LtSLPpxPLbmAJs09fdIw" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 166 + }, + "_enabled": true, + "__prefab": { + "__id__": 170 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5dzgwgV3tNZJEoewp8KY38" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "21Hk2mEnFEOJ/v55XuBpKw", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 153 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 173 + }, + { + "__id__": 175 + } + ], + "_prefab": { + "__id__": 177 + }, + "_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": 0.9, + "y": 0.9, + "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__": 172 + }, + "_enabled": true, + "__prefab": { + "__id__": 174 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8GRaxM2BNv76iifo8Ck5A" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 172 + }, + "_enabled": true, + "__prefab": { + "__id__": 176 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13FTxdrcpMHrkutB9UhlCj" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ebx0efAj5OQo5tDYo7CJ1Y", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 153 + }, + "_enabled": true, + "__prefab": { + "__id__": 179 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "03nWLvwvFC5YKsJgnNXuKJ" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 153 + }, + "_enabled": true, + "__prefab": { + "__id__": 181 + }, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "08gc0G6tZOap5VMXyIUk96" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 153 + }, + "_enabled": true, + "__prefab": { + "__id__": 183 + }, + "_alignFlags": 45, + "_target": null, + "_left": 5, + "_right": 5, + "_top": 5, + "_bottom": 5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4aJp4RicZF+KFW5/t1OofP" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 153 + }, + "_enabled": true, + "__prefab": { + "__id__": 185 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c4keB0pt9LtbZHrkWB7R0n" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c7ymg5OshHabafeZJICJug", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 152 + }, + "_enabled": true, + "__prefab": { + "__id__": 188 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 78, + "height": 78 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fdak7SgstFMLwEvzn6+Pbp" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 152 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", + "__expectedType__": "cc.SpriteAtlas" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7ekr/R70BLWL/gB7w5hxpx" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "93wpdyvytKPqGrBBUDf293", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2815,32 +3485,35 @@ }, "_children": [ { - "__id__": 166 + "__id__": 193 }, { - "__id__": 182 + "__id__": 209 }, { - "__id__": 198 + "__id__": 225 }, { - "__id__": 214 + "__id__": 241 }, { - "__id__": 230 + "__id__": 257 + }, + { + "__id__": 273 } ], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 301 }, { - "__id__": 248 + "__id__": 303 } ], "_prefab": { - "__id__": 250 + "__id__": 305 }, "_lpos": { "__type__": "cc.Vec3", @@ -2877,27 +3550,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 192 }, "_children": [ { - "__id__": 167 + "__id__": 194 } ], "_active": false, "_components": [ { - "__id__": 175 + "__id__": 202 }, { - "__id__": 177 + "__id__": 204 }, { - "__id__": 179 + "__id__": 206 } ], "_prefab": { - "__id__": 181 + "__id__": 208 }, "_lpos": { "__type__": "cc.Vec3", @@ -2934,23 +3607,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 166 + "__id__": 193 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 195 }, { - "__id__": 170 + "__id__": 197 }, { - "__id__": 172 + "__id__": 199 } ], "_prefab": { - "__id__": 174 + "__id__": 201 }, "_lpos": { "__type__": "cc.Vec3", @@ -2987,16 +3660,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 196 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3015,11 +3688,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 198 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3063,11 +3736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 200 }, "_alignFlags": 45, "_target": null, @@ -3112,16 +3785,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3140,11 +3813,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3188,11 +3861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 207 }, "_alignFlags": 45, "_target": null, @@ -3237,27 +3910,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 192 }, "_children": [ { - "__id__": 183 + "__id__": 210 } ], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 218 }, { - "__id__": 193 + "__id__": 220 }, { - "__id__": 195 + "__id__": 222 } ], "_prefab": { - "__id__": 197 + "__id__": 224 }, "_lpos": { "__type__": "cc.Vec3", @@ -3294,23 +3967,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 182 + "__id__": 209 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 211 }, { - "__id__": 186 + "__id__": 213 }, { - "__id__": 188 + "__id__": 215 } ], "_prefab": { - "__id__": 190 + "__id__": 217 }, "_lpos": { "__type__": "cc.Vec3", @@ -3347,11 +4020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 212 }, "_contentSize": { "__type__": "cc.Size", @@ -3375,11 +4048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 214 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3420,11 +4093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 183 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 216 }, "_alignFlags": 45, "_target": null, @@ -3469,11 +4142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -3497,11 +4170,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3545,11 +4218,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 223 }, "_alignFlags": 45, "_target": null, @@ -3594,27 +4267,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 192 }, "_children": [ { - "__id__": 199 + "__id__": 226 } ], "_active": false, "_components": [ { - "__id__": 207 + "__id__": 234 }, { - "__id__": 209 + "__id__": 236 }, { - "__id__": 211 + "__id__": 238 } ], "_prefab": { - "__id__": 213 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -3651,23 +4324,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 198 + "__id__": 225 }, "_children": [], "_active": true, "_components": [ { - "__id__": 200 + "__id__": 227 }, { - "__id__": 202 + "__id__": 229 }, { - "__id__": 204 + "__id__": 231 } ], "_prefab": { - "__id__": 206 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", @@ -3704,16 +4377,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3732,11 +4405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3780,11 +4453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 226 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 232 }, "_alignFlags": 45, "_target": null, @@ -3829,16 +4502,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 235 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3857,11 +4530,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 237 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3905,11 +4578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 198 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 239 }, "_alignFlags": 45, "_target": null, @@ -3954,27 +4627,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 192 }, "_children": [ { - "__id__": 215 + "__id__": 242 } ], "_active": false, "_components": [ { - "__id__": 223 + "__id__": 250 }, { - "__id__": 225 + "__id__": 252 }, { - "__id__": 227 + "__id__": 254 } ], "_prefab": { - "__id__": 229 + "__id__": 256 }, "_lpos": { "__type__": "cc.Vec3", @@ -4011,23 +4684,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 241 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 243 }, { - "__id__": 218 + "__id__": 245 }, { - "__id__": 220 + "__id__": 247 } ], "_prefab": { - "__id__": 222 + "__id__": 249 }, "_lpos": { "__type__": "cc.Vec3", @@ -4064,16 +4737,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 242 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4092,11 +4765,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 242 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4140,11 +4813,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 242 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 248 }, "_alignFlags": 45, "_target": null, @@ -4189,16 +4862,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 251 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4217,11 +4890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 253 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4265,11 +4938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 255 }, "_alignFlags": 45, "_target": null, @@ -4314,27 +4987,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 192 }, "_children": [ { - "__id__": 231 + "__id__": 258 } ], "_active": false, "_components": [ { - "__id__": 239 + "__id__": 266 }, { - "__id__": 241 + "__id__": 268 }, { - "__id__": 243 + "__id__": 270 } ], "_prefab": { - "__id__": 245 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -4371,23 +5044,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 230 + "__id__": 257 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 259 }, { - "__id__": 234 + "__id__": 261 }, { - "__id__": 236 + "__id__": 263 } ], "_prefab": { - "__id__": 238 + "__id__": 265 }, "_lpos": { "__type__": "cc.Vec3", @@ -4424,16 +5097,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 260 }, "_contentSize": { "__type__": "cc.Size", - "width": 233, - "height": 233 + "width": 193, + "height": 193 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4452,11 +5125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 262 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4500,11 +5173,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 258 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 264 }, "_alignFlags": 45, "_target": null, @@ -4549,16 +5222,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", - "width": 450, - "height": 450 + "width": 370, + "height": 370 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4577,11 +5250,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4625,11 +5298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 257 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 271 }, "_alignFlags": 45, "_target": null, @@ -4668,17 +5341,640 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 192 + }, + "_children": [ + { + "__id__": 274 + }, + { + "__id__": 282 + }, + { + "__id__": 290 + } + ], + "_active": false, + "_components": [ + { + "__id__": 298 + } + ], + "_prefab": { + "__id__": 300 + }, + "_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": "ItemFrame_Square_03_InnerBorder1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 273 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 275 + }, + { + "__id__": 277 + }, + { + "__id__": 279 + } + ], + "_prefab": { + "__id__": 281 + }, + "_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.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 276 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 274 + }, + "_enabled": true, + "__prefab": { + "__id__": 278 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 126, + "b": 185, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdw29+nndGY4mHhULUKpcp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 274 + }, + "_enabled": true, + "__prefab": { + "__id__": 280 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 48, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c29FKZj1dLY7MBfjR9CZ1j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deVarRuaFN1LhVMF8Wr72H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_InnerBorder2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 273 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 283 + }, + { + "__id__": 285 + }, + { + "__id__": 287 + } + ], + "_prefab": { + "__id__": 289 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 282 + }, + "_enabled": true, + "__prefab": { + "__id__": 284 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 88 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76Sa4mmOZMQrMumtAHxyo2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 282 + }, + "_enabled": true, + "__prefab": { + "__id__": 286 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 38, + "g": 61, + "b": 112, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 282 + }, + "_enabled": true, + "__prefab": { + "__id__": 288 + }, + "_alignFlags": 45, + "_target": null, + "_left": 6, + "_right": 6, + "_top": 6, + "_bottom": 6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea6Ym3niBBkZkK1S3FsMEf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "68ynJ6KthFHKvnm/9hhwDy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 273 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 291 + }, + { + "__id__": 293 + }, + { + "__id__": 295 + } + ], + "_prefab": { + "__id__": 297 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 290 + }, + "_enabled": true, + "__prefab": { + "__id__": 292 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19t10HqqxDEp2LKqJQnjiC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 290 + }, + "_enabled": true, + "__prefab": { + "__id__": 294 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 28, + "g": 23, + "b": 50, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80zToIZShG5JGX0MPHQLpU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 290 + }, + "_enabled": true, + "__prefab": { + "__id__": 296 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 52, + "_originalHeight": 52, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bep9e5Pp1IkL7MXt7p4y78" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oHa+DbJBxaNK0AtFNYj1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 273 + }, + "_enabled": true, + "__prefab": { + "__id__": 299 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13yEVDrg9IQLLM3+IGDJ2i" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "64e/C4RgNPCLJGkqpPb6fG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 192 + }, + "_enabled": true, + "__prefab": { + "__id__": 302 }, "_contentSize": { "__type__": "cc.Size", @@ -4702,11 +5998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 304 }, "_alignFlags": 45, "_target": null, @@ -4757,15 +6053,15 @@ "instance": null, "targetOverrides": [ { - "__id__": 252 + "__id__": 307 }, { - "__id__": 254 + "__id__": 309 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 122 + "__id__": 117 }, { "__id__": 40 @@ -4778,7 +6074,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 155 + "__id__": 150 }, "sourceInfo": null, "propertyPath": [ @@ -4788,19 +6084,19 @@ "__id__": 40 }, "targetInfo": { - "__id__": 253 + "__id__": 308 } }, { "__type__": "cc.TargetInfo", "localID": [ - "a33ReyWcpAoZY5ieotS6Ir" + "93wpdyvytKPqGrBBUDf293" ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 155 + "__id__": 150 }, "sourceInfo": null, "propertyPath": [ @@ -4810,7 +6106,7 @@ "__id__": 40 }, "targetInfo": { - "__id__": 255 + "__id__": 310 } }, { diff --git a/assets/resources/gui/element/sbox.prefab b/assets/resources/gui/element/sbox.prefab index 7a050834..28b1eac6 100644 --- a/assets/resources/gui/element/sbox.prefab +++ b/assets/resources/gui/element/sbox.prefab @@ -22,38 +22,26 @@ "__id__": 2 }, { - "__id__": 88 + "__id__": 116 }, { - "__id__": 128 + "__id__": 156 }, { - "__id__": 136 - }, - { - "__id__": 144 - }, - { - "__id__": 152 - }, - { - "__id__": 160 - }, - { - "__id__": 168 + "__id__": 164 } ], "_active": true, "_components": [ { - "__id__": 174 + "__id__": 170 }, { - "__id__": 176 + "__id__": 172 } ], "_prefab": { - "__id__": 178 + "__id__": 174 }, "_lpos": { "__type__": "cc.Vec3", @@ -107,19 +95,22 @@ }, { "__id__": 67 + }, + { + "__id__": 83 } ], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 111 }, { - "__id__": 85 + "__id__": 113 } ], "_prefab": { - "__id__": 87 + "__id__": 115 }, "_lpos": { "__type__": "cc.Vec3", @@ -1947,6 +1938,629 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "item", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [ + { + "__id__": 84 + }, + { + "__id__": 92 + }, + { + "__id__": 100 + } + ], + "_active": false, + "_components": [ + { + "__id__": 108 + } + ], + "_prefab": { + "__id__": 110 + }, + "_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": "ItemFrame_Square_03_InnerBorder1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 85 + }, + { + "__id__": 87 + }, + { + "__id__": 89 + } + ], + "_prefab": { + "__id__": 91 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": { + "__id__": 86 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 96, + "height": 96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": { + "__id__": 88 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 87, + "g": 126, + "b": 185, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdw29+nndGY4mHhULUKpcp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": { + "__id__": 90 + }, + "_alignFlags": 45, + "_target": null, + "_left": 2, + "_right": 2, + "_top": 2, + "_bottom": 2, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 48, + "_originalHeight": 48, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c29FKZj1dLY7MBfjR9CZ1j" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deVarRuaFN1LhVMF8Wr72H", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_InnerBorder2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 93 + }, + { + "__id__": 95 + }, + { + "__id__": 97 + } + ], + "_prefab": { + "__id__": 99 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 92 + }, + "_enabled": true, + "__prefab": { + "__id__": 94 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 88 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76Sa4mmOZMQrMumtAHxyo2" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 92 + }, + "_enabled": true, + "__prefab": { + "__id__": 96 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 38, + "g": 61, + "b": 112, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 92 + }, + "_enabled": true, + "__prefab": { + "__id__": 98 + }, + "_alignFlags": 45, + "_target": null, + "_left": 6, + "_right": 6, + "_top": 6, + "_bottom": 6, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 40, + "_originalHeight": 40, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ea6Ym3niBBkZkK1S3FsMEf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "68ynJ6KthFHKvnm/9hhwDy", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "ItemFrame_Square_03_Border", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 101 + }, + { + "__id__": 103 + }, + { + "__id__": 105 + } + ], + "_prefab": { + "__id__": 107 + }, + "_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.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 102 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "19t10HqqxDEp2LKqJQnjiC" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 104 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 28, + "g": 23, + "b": 50, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "80zToIZShG5JGX0MPHQLpU" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 100 + }, + "_enabled": true, + "__prefab": { + "__id__": 106 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 52, + "_originalHeight": 52, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bep9e5Pp1IkL7MXt7p4y78" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c1oHa+DbJBxaNK0AtFNYj1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 83 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "13yEVDrg9IQLLM3+IGDJ2i" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "64e/C4RgNPCLJGkqpPb6fG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1957,7 +2571,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -1985,7 +2599,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 114 }, "_alignFlags": 45, "_target": null, @@ -2034,38 +2648,38 @@ }, "_children": [ { - "__id__": 89 - }, - { - "__id__": 95 - }, - { - "__id__": 101 - }, - { - "__id__": 107 - }, - { - "__id__": 113 - } - ], - "_active": true, - "_components": [ - { - "__id__": 119 - }, - { - "__id__": 121 + "__id__": 117 }, { "__id__": 123 }, { - "__id__": 125 + "__id__": 129 + }, + { + "__id__": 135 + }, + { + "__id__": 141 + } + ], + "_active": true, + "_components": [ + { + "__id__": 147 + }, + { + "__id__": 149 + }, + { + "__id__": 151 + }, + { + "__id__": 153 } ], "_prefab": { - "__id__": 127 + "__id__": 155 }, "_lpos": { "__type__": "cc.Vec3", @@ -2102,20 +2716,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 116 }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 118 }, { - "__id__": 92 + "__id__": 120 } ], "_prefab": { - "__id__": 94 + "__id__": 122 }, "_lpos": { "__type__": "cc.Vec3", @@ -2152,11 +2766,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 119 }, "_contentSize": { "__type__": "cc.Size", @@ -2180,11 +2794,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 89 + "__id__": 117 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 121 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2238,20 +2852,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 116 }, "_children": [], "_active": true, "_components": [ { - "__id__": 96 + "__id__": 124 }, { - "__id__": 98 + "__id__": 126 } ], "_prefab": { - "__id__": 100 + "__id__": 128 }, "_lpos": { "__type__": "cc.Vec3", @@ -2288,11 +2902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 97 + "__id__": 125 }, "_contentSize": { "__type__": "cc.Size", @@ -2316,11 +2930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 123 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 127 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2377,20 +2991,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 116 }, "_children": [], "_active": false, "_components": [ { - "__id__": 102 + "__id__": 130 }, { - "__id__": 104 + "__id__": 132 } ], "_prefab": { - "__id__": 106 + "__id__": 134 }, "_lpos": { "__type__": "cc.Vec3", @@ -2427,11 +3041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -2455,11 +3069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 133 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2516,20 +3130,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 116 }, "_children": [], "_active": false, "_components": [ { - "__id__": 108 + "__id__": 136 }, { - "__id__": 110 + "__id__": 138 } ], "_prefab": { - "__id__": 112 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", @@ -2566,11 +3180,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 109 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", @@ -2594,11 +3208,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 107 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2655,20 +3269,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 88 + "__id__": 116 }, "_children": [], "_active": false, "_components": [ { - "__id__": 114 + "__id__": 142 }, { - "__id__": 116 + "__id__": 144 } ], "_prefab": { - "__id__": 118 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -2705,11 +3319,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -2733,11 +3347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 113 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2794,11 +3408,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 120 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -2822,11 +3436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 150 }, "_type": 0, "_inverted": false, @@ -2844,11 +3458,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 152 }, "_alignFlags": 45, "_target": null, @@ -2880,11 +3494,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 88 + "__id__": 116 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 154 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2933,709 +3547,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_InnerBorder1", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 129 - }, - { - "__id__": 131 - }, - { - "__id__": 133 - } - ], - "_prefab": { - "__id__": 135 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 35, - "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.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 128 - }, - "_enabled": true, - "__prefab": { - "__id__": 130 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 66, - "height": 66 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e2LJMsJCxMdZP6mZ0DhjCz" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 128 - }, - "_enabled": true, - "__prefab": { - "__id__": 132 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 87, - "g": 126, - "b": 185, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@9bd48", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cdw29+nndGY4mHhULUKpcp" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 128 - }, - "_enabled": true, - "__prefab": { - "__id__": 134 - }, - "_alignFlags": 45, - "_target": null, - "_left": 2, - "_right": 2, - "_top": 2, - "_bottom": 2, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 48, - "_originalHeight": 48, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c29FKZj1dLY7MBfjR9CZ1j" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "deVarRuaFN1LhVMF8Wr72H", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_InnerBorder2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 137 - }, - { - "__id__": 139 - }, - { - "__id__": 141 - } - ], - "_prefab": { - "__id__": 143 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 35, - "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.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 136 - }, - "_enabled": true, - "__prefab": { - "__id__": 138 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 58, - "height": 58 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "76Sa4mmOZMQrMumtAHxyo2" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 136 - }, - "_enabled": true, - "__prefab": { - "__id__": 140 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 38, - "g": 61, - "b": 112, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@d2e99", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a8HgrX5AFGlZ/cUTnUe2mr" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 136 - }, - "_enabled": true, - "__prefab": { - "__id__": 142 - }, - "_alignFlags": 45, - "_target": null, - "_left": 6, - "_right": 6, - "_top": 6, - "_bottom": 6, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 40, - "_originalHeight": 40, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "ea6Ym3niBBkZkK1S3FsMEf" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "68ynJ6KthFHKvnm/9hhwDy", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "ItemFrame_Square_03_Border", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 145 - }, - { - "__id__": 147 - }, - { - "__id__": 149 - } - ], - "_prefab": { - "__id__": 151 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 35, - "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.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 144 - }, - "_enabled": true, - "__prefab": { - "__id__": 146 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 70, - "height": 70 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "19t10HqqxDEp2LKqJQnjiC" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 144 - }, - "_enabled": true, - "__prefab": { - "__id__": 148 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 28, - "g": 23, - "b": 50, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@3b8af", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "80zToIZShG5JGX0MPHQLpU" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 144 - }, - "_enabled": true, - "__prefab": { - "__id__": 150 - }, - "_alignFlags": 45, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 52, - "_originalHeight": 52, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bep9e5Pp1IkL7MXt7p4y78" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c1oHa+DbJBxaNK0AtFNYj1", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 153 - }, - { - "__id__": 155 - }, - { - "__id__": 157 - } - ], - "_prefab": { - "__id__": 159 - }, - "_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": 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__": 152 - }, - "_enabled": true, - "__prefab": { - "__id__": 154 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 83.33333333333334, - "height": 83.33333333333334 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "0elb3r0slJwbY2BNC1zTKn" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 152 - }, - "_enabled": true, - "__prefab": { - "__id__": 156 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73@fcdc9", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": { - "__uuid__": "cb93c900-b440-4571-91d1-7da1636e3d73", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "075wC9BqZNpKBHWkkHGa0w" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 152 - }, - "_enabled": true, - "__prefab": { - "__id__": 158 - }, - "_alignFlags": 45, - "_target": null, - "_left": 15, - "_right": 15, - "_top": 15, - "_bottom": 15, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 78, - "_originalHeight": 78, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "979E8VFL1G3qbMjoTp5l0c" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a33ReyWcpAoZY5ieotS6Ir", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", "_name": "cdui", @@ -3647,18 +3558,18 @@ "_children": [], "_active": false, "_components": [ + { + "__id__": 157 + }, + { + "__id__": 159 + }, { "__id__": 161 - }, - { - "__id__": 163 - }, - { - "__id__": 165 } ], "_prefab": { - "__id__": 167 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -3695,16 +3606,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 162 + "__id__": 158 }, "_contentSize": { "__type__": "cc.Size", - "width": 55, - "height": 55 + "width": 70, + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3723,11 +3634,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 160 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3771,18 +3682,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 160 + "__id__": 156 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 162 }, "_alignFlags": 45, "_target": null, - "_left": 12.5, - "_right": 12.5, - "_top": 12.5, - "_bottom": 12.5, + "_left": 5, + "_right": 5, + "_top": 5, + "_bottom": 5, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3826,19 +3737,19 @@ "_active": false, "_components": [ { - "__id__": 169 + "__id__": 165 }, { - "__id__": 171 + "__id__": 167 } ], "_prefab": { - "__id__": 173 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -38.838, + "y": 0, "z": 0 }, "_lrot": { @@ -3870,15 +3781,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 166 }, "_contentSize": { "__type__": "cc.Size", - "width": 15.123046875, + "width": 20.6845703125, "height": 54.4 }, "_anchorPoint": { @@ -3898,11 +3809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 168 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3917,8 +3828,8 @@ "_string": "9", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 30, + "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, @@ -3927,7 +3838,7 @@ "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, - "_isBold": false, + "_isBold": true, "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, @@ -3983,7 +3894,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -4011,17 +3922,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 173 }, "icon_node": { - "__id__": 152 + "__id__": 123 }, "bg_node": { "__id__": 2 }, "info_label": null, "cd_mask": { - "__id__": 160 + "__id__": 156 }, "_id": "" }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 5b5b0d3f..e1ef9edd 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -283,13 +283,13 @@ export class SingletonModuleComp extends ecs.Comp { * 在游戏载入早期调用，预加载常用图集 */ preloadCommonAssets() { - resources.load("gui/ui3", SpriteAtlas, (err, atlas) => { + resources.load("gui/ui6", SpriteAtlas, (err, atlas) => { if (!err && atlas) { // 增加引用计数，防止图集被引擎自动垃圾回收（GC）导致底层 spriteFrames 为 null atlas.addRef(); this.uiconsAtlas = atlas; } else { - mLogger.error(this.debugMode, 'SMC', "预加载 gui/ui3 图集失败:", err); + mLogger.error(this.debugMode, 'SMC', "预加载 gui/ui6 图集失败:", err); } }); } diff --git a/assets/script/game/common/config/EquipSet.ts b/assets/script/game/common/config/EquipSet.ts index 6b79afdf..2dde70af 100644 --- a/assets/script/game/common/config/EquipSet.ts +++ b/assets/script/game/common/config/EquipSet.ts @@ -28,6 +28,7 @@ interface EquipRawData { wave: number; name: string; info: string; + icon?: string; // 图标ID（对应 ui6 图集 frame 名） field: number[]; cost?: number; } @@ -35,56 +36,56 @@ interface EquipRawData { /** 装备卡原始数据表 */ const EquipRawList: EquipRawData[] = [ // ==================== wave 1 档（基础强度） ==================== - { uuid: 8701, wave: SKILL_CARD_WAVES[0], name: "战后恢复", info: "战斗结束生命回复量+10%", field: [7001] }, - { uuid: 8702, wave: SKILL_CARD_WAVES[0], name: "攻击加成", info: "英雄攻击力+10%", field: [7002] }, - { uuid: 8703, wave: SKILL_CARD_WAVES[0], name: "击晕加成", info: "英雄击晕概率+10%", field: [7003] }, - { uuid: 8704, wave: SKILL_CARD_WAVES[0], name: "暴击加成", info: "英雄暴击率+10%", field: [7004] }, - { uuid: 8705, wave: SKILL_CARD_WAVES[0], name: "暴伤加成", info: "英雄暴击伤害+20%", field: [7005] }, - { uuid: 8706, wave: SKILL_CARD_WAVES[0], name: "攻速加成", info: "英雄攻击速度+10%", field: [7006] }, - { uuid: 8707, wave: SKILL_CARD_WAVES[0], name: "生命加成", info: "英雄最大生命+10%", field: [7007] }, - { uuid: 8708, wave: SKILL_CARD_WAVES[0], name: "风怒加成", info: "英雄风怒概率+10%", field: [7008] }, - { uuid: 8709, wave: SKILL_CARD_WAVES[0], name: "穿刺加成", info: "英雄穿刺概率+10%", field: [7009] }, - { uuid: 8710, wave: SKILL_CARD_WAVES[0], name: "金币收益", info: "每回合金币收益+1", field: [7010] }, - { uuid: 8711, wave: SKILL_CARD_WAVES[0], name: "出售强化", info: "卖出英雄金币+1", field: [7011] }, + { uuid: 8701, wave: SKILL_CARD_WAVES[0], icon: "Stat_PotionBoost", name: "战后恢复", info: "战斗结束生命回复量+10%", field: [7001] }, + { uuid: 8702, wave: SKILL_CARD_WAVES[0], icon: "Stat_Attack_03", name: "攻击加成", info: "英雄攻击力+10%", field: [7002] }, + { uuid: 8703, wave: SKILL_CARD_WAVES[0], icon: "Stat_Stun_01", name: "击晕加成", info: "英雄击晕概率+10%", field: [7003] }, + { uuid: 8704, wave: SKILL_CARD_WAVES[0], icon: "Stat_CriticalChance_02", name: "暴击加成", info: "英雄暴击率+10%", field: [7004] }, + { uuid: 8705, wave: SKILL_CARD_WAVES[0], icon: "Stat_Critical_01", name: "暴伤加成", info: "英雄暴击伤害+20%", field: [7005] }, + { uuid: 8706, wave: SKILL_CARD_WAVES[0], icon: "Stat_AttackSpeed_02", name: "攻速加成", info: "英雄攻击速度+10%", field: [7006] }, + { uuid: 8707, wave: SKILL_CARD_WAVES[0], icon: "Stat_Hp_02", name: "生命加成", info: "英雄最大生命+10%", field: [7007] }, + { uuid: 8708, wave: SKILL_CARD_WAVES[0], icon: "Stat_CriticalComboChance", name: "风怒加成", info: "英雄风怒概率+10%", field: [7008] }, + { uuid: 8709, wave: SKILL_CARD_WAVES[0], icon: "Stat_Tripleshot", name: "穿刺加成", info: "英雄穿刺概率+10%", field: [7009] }, + { uuid: 8710, wave: SKILL_CARD_WAVES[0], icon: "Stat_InventorySlotIncrease", name: "金币收益", info: "每回合金币收益+1", field: [7010] }, + { uuid: 8711, wave: SKILL_CARD_WAVES[0], icon: "Stat_GoldGainIncrease_01", name: "出售强化", info: "卖出英雄金币+1", field: [7011] }, // 多词条装备 - { uuid: 8720, wave: SKILL_CARD_WAVES[0], name: "勇者护符", info: "英雄攻击力+10%, 暴击率+10%, 暴击伤害+20%", field: [7002, 7004, 7005] }, + { uuid: 8720, wave: SKILL_CARD_WAVES[0], icon: "Stat_Attack_03", name: "勇者护符", info: "英雄攻击力+10%, 暴击率+10%, 暴击伤害+20%", field: [7002, 7004, 7005] }, // ==================== wave 5 档（强度 ×2） ==================== - { uuid: 8751, wave: SKILL_CARD_WAVES[1], name: "战后恢复+", info: "战斗结束生命回复量+20%", field: [7201] }, - { uuid: 8752, wave: SKILL_CARD_WAVES[1], name: "攻击加成+", info: "英雄攻击力+20%", field: [7202] }, - { uuid: 8753, wave: SKILL_CARD_WAVES[1], name: "击晕加成+", info: "英雄击晕概率+20%", field: [7203] }, - { uuid: 8754, wave: SKILL_CARD_WAVES[1], name: "暴击加成+", info: "英雄暴击率+20%", field: [7204] }, - { uuid: 8755, wave: SKILL_CARD_WAVES[1], name: "暴伤加成+", info: "英雄暴击伤害+40%", field: [7205] }, - { uuid: 8756, wave: SKILL_CARD_WAVES[1], name: "攻速加成+", info: "英雄攻击速度+20%", field: [7206] }, - { uuid: 8757, wave: SKILL_CARD_WAVES[1], name: "生命加成+", info: "英雄最大生命+20%", field: [7207] }, - { uuid: 8758, wave: SKILL_CARD_WAVES[1], name: "风怒加成+", info: "英雄风怒概率+20%", field: [7208] }, - { uuid: 8759, wave: SKILL_CARD_WAVES[1], name: "穿刺加成+", info: "英雄穿刺概率+20%", field: [7209] }, - { uuid: 8760, wave: SKILL_CARD_WAVES[1], name: "金币收益+", info: "每回合金币收益+2", field: [7210] }, - { uuid: 8761, wave: SKILL_CARD_WAVES[1], name: "购买优惠+", info: "购买卡牌费用-2金币", field: [7212] }, - { uuid: 8762, wave: SKILL_CARD_WAVES[1], name: "刷新优惠", info: "刷新卡牌费用-1金币", field: [7213] }, + { uuid: 8751, wave: SKILL_CARD_WAVES[1], icon: "Stat_PotionBoost", name: "战后恢复+", info: "战斗结束生命回复量+20%", field: [7201] }, + { uuid: 8752, wave: SKILL_CARD_WAVES[1], icon: "Stat_Attack_03", name: "攻击加成+", info: "英雄攻击力+20%", field: [7202] }, + { uuid: 8753, wave: SKILL_CARD_WAVES[1], icon: "Stat_Stun_01", name: "击晕加成+", info: "英雄击晕概率+20%", field: [7203] }, + { uuid: 8754, wave: SKILL_CARD_WAVES[1], icon: "Stat_CriticalChance_02", name: "暴击加成+", info: "英雄暴击率+20%", field: [7204] }, + { uuid: 8755, wave: SKILL_CARD_WAVES[1], icon: "Stat_Critical_01", name: "暴伤加成+", info: "英雄暴击伤害+40%", field: [7205] }, + { uuid: 8756, wave: SKILL_CARD_WAVES[1], icon: "Stat_AttackSpeed_02", name: "攻速加成+", info: "英雄攻击速度+20%", field: [7206] }, + { uuid: 8757, wave: SKILL_CARD_WAVES[1], icon: "Stat_Hp_02", name: "生命加成+", info: "英雄最大生命+20%", field: [7207] }, + { uuid: 8758, wave: SKILL_CARD_WAVES[1], icon: "Stat_CriticalComboChance", name: "风怒加成+", info: "英雄风怒概率+20%", field: [7208] }, + { uuid: 8759, wave: SKILL_CARD_WAVES[1], icon: "Stat_Tripleshot", name: "穿刺加成+", info: "英雄穿刺概率+20%", field: [7209] }, + { uuid: 8760, wave: SKILL_CARD_WAVES[1], icon: "Stat_InventorySlotIncrease", name: "金币收益+", info: "每回合金币收益+2", field: [7210] }, + { uuid: 8761, wave: SKILL_CARD_WAVES[1], icon: "Stat_KeyCapacityIncrease", name: "购买优惠+", info: "购买卡牌费用-2金币", field: [7212] }, + { uuid: 8762, wave: SKILL_CARD_WAVES[1], icon: "Stat_RandomBonus", name: "刷新优惠", info: "刷新卡牌费用-1金币", field: [7213] }, // 多词条装备 - { uuid: 8770, wave: SKILL_CARD_WAVES[1], name: "守卫护甲", info: "英雄最大生命+20%, 战后生命回复+20%, 攻速+20%", field: [7207, 7201, 7206] }, + { uuid: 8770, wave: SKILL_CARD_WAVES[1], icon: "Stat_Hp_02", name: "守卫护甲", info: "英雄最大生命+20%, 战后生命回复+20%, 攻速+20%", field: [7207, 7201, 7206] }, // ==================== wave 8 档（强度 ×3） ==================== - { uuid: 8801, wave: SKILL_CARD_WAVES[2], name: "战后恢复++", info: "战斗结束生命回复量+30%", field: [7401] }, - { uuid: 8802, wave: SKILL_CARD_WAVES[2], name: "攻击加成++", info: "英雄攻击力+30%", field: [7402] }, - { uuid: 8803, wave: SKILL_CARD_WAVES[2], name: "击晕加成++", info: "英雄击晕概率+30%", field: [7403] }, - { uuid: 8804, wave: SKILL_CARD_WAVES[2], name: "暴击加成++", info: "英雄暴击率+30%", field: [7404] }, - { uuid: 8805, wave: SKILL_CARD_WAVES[2], name: "暴伤加成++", info: "英雄暴击伤害+60%", field: [7405] }, - { uuid: 8806, wave: SKILL_CARD_WAVES[2], name: "攻速加成++", info: "英雄攻击速度+30%", field: [7406] }, - { uuid: 8807, wave: SKILL_CARD_WAVES[2], name: "生命加成++", info: "英雄最大生命+30%", field: [7407] }, - { uuid: 8808, wave: SKILL_CARD_WAVES[2], name: "风怒加成++", info: "英雄风怒概率+30%", field: [7408] }, - { uuid: 8809, wave: SKILL_CARD_WAVES[2], name: "穿刺加成++", info: "英雄穿刺概率+30%", field: [7409] }, - { uuid: 8810, wave: SKILL_CARD_WAVES[2], name: "金币收益++", info: "每回合金币收益+3", field: [7410] }, + { uuid: 8801, wave: SKILL_CARD_WAVES[2], icon: "Stat_PotionBoost", name: "战后恢复++", info: "战斗结束生命回复量+30%", field: [7401] }, + { uuid: 8802, wave: SKILL_CARD_WAVES[2], icon: "Stat_Attack_03", name: "攻击加成++", info: "英雄攻击力+30%", field: [7402] }, + { uuid: 8803, wave: SKILL_CARD_WAVES[2], icon: "Stat_Stun_01", name: "击晕加成++", info: "英雄击晕概率+30%", field: [7403] }, + { uuid: 8804, wave: SKILL_CARD_WAVES[2], icon: "Stat_CriticalChance_02", name: "暴击加成++", info: "英雄暴击率+30%", field: [7404] }, + { uuid: 8805, wave: SKILL_CARD_WAVES[2], icon: "Stat_Critical_01", name: "暴伤加成++", info: "英雄暴击伤害+60%", field: [7405] }, + { uuid: 8806, wave: SKILL_CARD_WAVES[2], icon: "Stat_AttackSpeed_02", name: "攻速加成++", info: "英雄攻击速度+30%", field: [7406] }, + { uuid: 8807, wave: SKILL_CARD_WAVES[2], icon: "Stat_Hp_02", name: "生命加成++", info: "英雄最大生命+30%", field: [7407] }, + { uuid: 8808, wave: SKILL_CARD_WAVES[2], icon: "Stat_CriticalComboChance", name: "风怒加成++", info: "英雄风怒概率+30%", field: [7408] }, + { uuid: 8809, wave: SKILL_CARD_WAVES[2], icon: "Stat_Tripleshot", name: "穿刺加成++", info: "英雄穿刺概率+30%", field: [7409] }, + { uuid: 8810, wave: SKILL_CARD_WAVES[2], icon: "Stat_InventorySlotIncrease", name: "金币收益++", info: "每回合金币收益+3", field: [7410] }, // 触发次数强化 - { uuid: 8811, wave: SKILL_CARD_WAVES[2], name: "召唤强化++", info: "召唤触发技能次数+1", field: [7014] }, - { uuid: 8812, wave: SKILL_CARD_WAVES[2], name: "死亡强化++", info: "死亡触发技能次数+1", field: [7015] }, - { uuid: 8813, wave: SKILL_CARD_WAVES[2], name: "开场强化++", info: "战斗开始触发技能次数+1", field: [7016] }, - { uuid: 8814, wave: SKILL_CARD_WAVES[2], name: "结束强化++", info: "战斗结束触发技能次数+1", field: [7017] }, - { uuid: 8815, wave: SKILL_CARD_WAVES[2], name: "攻击强化++", info: "攻击触发技能次数+1", field: [7018] }, - { uuid: 8816, wave: SKILL_CARD_WAVES[2], name: "受击强化++", info: "被攻击触发技能次数+1", field: [7019] }, + { uuid: 8811, wave: SKILL_CARD_WAVES[2], icon: "Stat_UnitSummonIncrease_02", name: "召唤强化++", info: "召唤触发技能次数+1", field: [7014] }, + { uuid: 8812, wave: SKILL_CARD_WAVES[2], icon: "Stat_PoisonChanceIncrease", name: "死亡强化++", info: "死亡触发技能次数+1", field: [7015] }, + { uuid: 8813, wave: SKILL_CARD_WAVES[2], icon: "Stat_AttackRangeIncrease_01", name: "开场强化++", info: "战斗开始触发技能次数+1", field: [7016] }, + { uuid: 8814, wave: SKILL_CARD_WAVES[2], icon: "Stat_UnitSummonIncrease_01", name: "结束强化++", info: "战斗结束触发技能次数+1", field: [7017] }, + { uuid: 8815, wave: SKILL_CARD_WAVES[2], icon: "Stat_Attack_03", name: "攻击强化++", info: "攻击触发技能次数+1", field: [7018] }, + { uuid: 8816, wave: SKILL_CARD_WAVES[2], icon: "Stat_Armor_01", name: "受击强化++", info: "被攻击触发技能次数+1", field: [7019] }, // 多词条装备 - { uuid: 8820, wave: SKILL_CARD_WAVES[2], name: "神圣之刃", info: "英雄攻击力+30%, 暴击率+30%, 暴击伤害+60%, 攻速+30%", field: [7402, 7404, 7405, 7406] }, + { uuid: 8820, wave: SKILL_CARD_WAVES[2], icon: "Stat_Attack_03", name: "神圣之刃", info: "英雄攻击力+30%, 暴击率+30%, 暴击伤害+60%, 攻速+30%", field: [7402, 7404, 7405, 7406] }, ]; /** @@ -106,6 +107,7 @@ export const EquipPoolList: CardConfig[] = EquipRawList.map(data => ({ wave: data.wave, kind: CKind.Skill, card_lv: waveToCardLv[data.wave] ?? 1, + icon: data.icon, name: data.name, info: data.info, is_inst: false, diff --git a/assets/script/game/common/config/ICardSet.ts b/assets/script/game/common/config/ICardSet.ts index 98845f77..7dcf700b 100644 --- a/assets/script/game/common/config/ICardSet.ts +++ b/assets/script/game/common/config/ICardSet.ts @@ -25,6 +25,7 @@ interface ItemCardRaw { skill: number; // 关联的技能 UUID（buff 技能） name: string; info: string; + icon?: string; // 图标ID（对应 ui6 图集 frame 名） cost: number; // 购买价格 weight: number; // 抽取权重 overrides?: SkillOverrides; // 技能参数覆写（如自定义治疗量、护盾值等） @@ -32,24 +33,24 @@ interface ItemCardRaw { const ItemCardData: ItemCardRaw[] = [ // ==================== 一次性回血（计时性 HoT，5s） ==================== - { uuid: 9101, skill: 6502, name: "再生药水", info: "全体友方每秒回复生命，持续 5 秒", cost: 0, weight: 20 }, + { uuid: 9101, skill: 6502, icon: "Stat_PotionBoost", name: "再生药水", info: "全体友方每秒回复生命，持续 5 秒", cost: 0, weight: 20 }, // ==================== 计时性强化（统一 5s） ==================== - { uuid: 9102, skill: 6503, name: "攻击药水", info: "全体友方攻击力提升 50%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9103, skill: 6504, name: "暴击药水", info: "全体友方暴击率提升 30%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9104, skill: 6505, name: "击退药水", info: "全体友方击退概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9105, skill: 6506, name: "穿透药水", info: "全体友方穿透概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9106, skill: 6507, name: "攻速药水", info: "全体友方攻击速度提升 40%，持续 5 秒", cost: 0, weight: 15 }, - { uuid: 9107, skill: 6508, name: "风怒药水", info: "全体友方风怒概率提升 20%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9108, skill: 6509, name: "击晕药水", info: "全体友方击晕概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, - { uuid: 9109, skill: 6510, name: "击晕抗性药水", info: "全体友方击晕抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, - { uuid: 9110, skill: 6511, name: "冰冻抗性药水", info: "全体友方冰冻抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, + { uuid: 9102, skill: 6503, icon: "Stat_Attack_03", name: "攻击药水", info: "全体友方攻击力提升 50%，持续 5 秒", cost: 0, weight: 15 }, + { uuid: 9103, skill: 6504, icon: "Stat_CriticalChance_02", name: "暴击药水", info: "全体友方暴击率提升 30%，持续 5 秒", cost: 0, weight: 15 }, + { uuid: 9104, skill: 6505, icon: "Stat_Stun_01", name: "击退药水", info: "全体友方击退概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, + { uuid: 9105, skill: 6506, icon: "Stat_Tripleshot", name: "穿透药水", info: "全体友方穿透概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, + { uuid: 9106, skill: 6507, icon: "Stat_AttackSpeed_02", name: "攻速药水", info: "全体友方攻击速度提升 40%，持续 5 秒", cost: 0, weight: 15 }, + { uuid: 9107, skill: 6508, icon: "Stat_CriticalComboChance", name: "风怒药水", info: "全体友方风怒概率提升 20%，持续 5 秒", cost: 0, weight: 12 }, + { uuid: 9108, skill: 6509, icon: "Stat_Stun_01", name: "击晕药水", info: "全体友方击晕概率提升 30%，持续 5 秒", cost: 0, weight: 12 }, + { uuid: 9109, skill: 6510, icon: "Stat_Armor_01", name: "击晕抗性药水", info: "全体友方击晕抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, + { uuid: 9110, skill: 6511, icon: "Stat_Freeze", name: "冰冻抗性药水", info: "全体友方冰冻抗性提升 50%，持续 5 秒", cost: 4, weight: 10 }, // ==================== 高级档（buff_value 覆写，复用同一技能底座） ==================== - { uuid: 9201, skill: 6502, name: "高级再生药水", info: "全体友方每秒回复 25 生命，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 25 } }, - { uuid: 9202, skill: 6503, name: "高级攻击药水", info: "全体友方攻击力提升 80%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 80 } }, - { uuid: 9203, skill: 6504, name: "高级暴击药水", info: "全体友方暴击率提升 50%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 50 } }, - { uuid: 9206, skill: 6507, name: "高级攻速药水", info: "全体友方攻击速度提升 70%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 70 } }, + { uuid: 9201, skill: 6502, icon: "Stat_PotionBoost", name: "高级再生药水", info: "全体友方每秒回复 25 生命，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 25 } }, + { uuid: 9202, skill: 6503, icon: "Stat_Attack_03", name: "高级攻击药水", info: "全体友方攻击力提升 80%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 80 } }, + { uuid: 9203, skill: 6504, icon: "Stat_CriticalChance_02", name: "高级暴击药水", info: "全体友方暴击率提升 50%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 50 } }, + { uuid: 9206, skill: 6507, icon: "Stat_AttackSpeed_02", name: "高级攻速药水", info: "全体友方攻击速度提升 70%，持续 5 秒", cost: 0, weight: 8, overrides: { buff_value: 70 } }, ]; /** @@ -70,6 +71,7 @@ export const ItemCardList: CardConfig[] = ItemCardData.map(data => ({ pool_lv: CardLV.LV1, kind: CKind.Potion, card_lv: 1, + icon: data.icon, name: data.name, info: data.info, is_inst: true, diff --git a/assets/script/game/common/config/SCardSet.ts b/assets/script/game/common/config/SCardSet.ts index 389ca828..5dbdb9da 100644 --- a/assets/script/game/common/config/SCardSet.ts +++ b/assets/script/game/common/config/SCardSet.ts @@ -24,6 +24,7 @@ interface SkillCardRaw { card_lv: number; name: string; info: string; + icon?: string; // 图标ID（对应 ui6 图集 frame 名） is_inst: boolean; t_times?: number; // 触发次数（未设置时按 is_inst 取默认值：即时=1，定时=3） t_inv?: number; @@ -35,20 +36,20 @@ interface SkillCardRaw { const SkillCardData: SkillCardRaw[] = [ // ==================== card_lv 2 档（强度 ×2） ==================== // --- 范围攻击卡（ap 递增，间隔缩短） --- - { uuid: 8261, skill: 6201, card_lv: 2, name: "雷墙+", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, - { uuid: 8262, skill: 6202, card_lv: 2, name: "火墙+", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, - { uuid: 8263, skill: 6203, card_lv: 2, name: "飓风+", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, - { uuid: 8264, skill: 6204, card_lv: 2, name: "水墙+", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, - { uuid: 8265, skill: 6205, card_lv: 2, name: "风墙+", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, - { uuid: 8266, skill: 6206, card_lv: 2, name: "陨石术+", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8261, skill: 6201, card_lv: 2, icon: "Stat_LightningDamag", name: "雷墙+", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8262, skill: 6202, card_lv: 2, icon: "Stat_FireDamage", name: "火墙+", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8263, skill: 6203, card_lv: 2, icon: "Stat_Stun_01", name: "飓风+", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8264, skill: 6204, card_lv: 2, icon: "Stat_Mana", name: "水墙+", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8265, skill: 6205, card_lv: 2, icon: "Stat_Stun_01", name: "风墙+", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, + { uuid: 8266, skill: 6206, card_lv: 2, icon: "Stat_Tripleshot", name: "陨石术+", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 3, t_inv: 5, trigger_type: CardTriggerType.Interval, overrides: { ap: 150 } }, // ==================== card_lv 3 档（强度 ×3） ==================== - { uuid: 8361, skill: 6201, card_lv: 3, name: "雷墙++", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, - { uuid: 8362, skill: 6202, card_lv: 3, name: "火墙++", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, - { uuid: 8363, skill: 6203, card_lv: 3, name: "飓风++", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, - { uuid: 8364, skill: 6204, card_lv: 3, name: "水墙++", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, - { uuid: 8365, skill: 6205, card_lv: 3, name: "风墙++", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, - { uuid: 8366, skill: 6206, card_lv: 3, name: "陨石术++", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8361, skill: 6201, card_lv: 3, icon: "Stat_LightningDamag", name: "雷墙++", info: "召唤雷墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8362, skill: 6202, card_lv: 3, icon: "Stat_FireDamage", name: "火墙++", info: "召唤火墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8363, skill: 6203, card_lv: 3, icon: "Stat_Stun_01", name: "飓风++", info: "召唤飓风攻击敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8364, skill: 6204, card_lv: 3, icon: "Stat_Mana", name: "水墙++", info: "召唤水墙阻挡敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8365, skill: 6205, card_lv: 3, icon: "Stat_Stun_01", name: "风墙++", info: "召唤风墙困住敌人,有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, + { uuid: 8366, skill: 6206, card_lv: 3, icon: "Stat_Tripleshot", name: "陨石术++", info: "召唤陨石范围攻击敌人，有概率击晕", is_inst: false, t_times: 4, t_inv: 4, trigger_type: CardTriggerType.Interval, overrides: { ap: 250 } }, ]; /** @@ -67,6 +68,7 @@ export const SkillCardList: CardConfig[] = SkillCardData.map(data => { pool_lv: CardLV.LV1, kind: CKind.Skill, card_lv: data.card_lv, + icon: data.icon, name: data.name, info: data.info, is_inst: data.is_inst, diff --git a/assets/script/game/map/EquipListComp.ts b/assets/script/game/map/EquipListComp.ts index 925ef6c0..433624ab 100644 --- a/assets/script/game/map/EquipListComp.ts +++ b/assets/script/game/map/EquipListComp.ts @@ -181,9 +181,9 @@ export class EquipListComp extends CCComp { } } - // 图标（取第一个 field 词条的图标） + // 图标（优先用卡牌自定义 icon，否则取第一个 field 词条图标） if (this.icon_node && fields.length > 0) { - const iconId = FieldSkillSet[fields[0]]?.icon || ""; + const iconId = this.cardData.icon || FieldSkillSet[fields[0]]?.icon || ""; this.updateIcon(this.icon_node, iconId); } diff --git a/assets/script/game/map/ItemListComp.ts b/assets/script/game/map/ItemListComp.ts index ab67812f..f86c5ee2 100644 --- a/assets/script/game/map/ItemListComp.ts +++ b/assets/script/game/map/ItemListComp.ts @@ -218,10 +218,12 @@ export class ItemListComp extends CCComp { } } - // 图标：装备取第一个 field 词条图标，商品取技能图标 + // 图标：优先用卡牌自定义 icon，装备取第一个 field 词条图标，商品取技能图标 if (this.icon_node) { let iconId = ""; - if (isEquip) { + if (this.cardData.icon) { + iconId = this.cardData.icon; + } else if (isEquip) { const fields = this.cardData.field || []; if (fields.length > 0) { iconId = FieldSkillSet[fields[0]]?.icon || ""; diff --git a/assets/script/game/map/SCardComp.ts b/assets/script/game/map/SCardComp.ts index 646de608..832256a9 100644 --- a/assets/script/game/map/SCardComp.ts +++ b/assets/script/game/map/SCardComp.ts @@ -346,9 +346,10 @@ export class SCardComp extends CCComp { return skillCard?.info || skill?.info || this.cardData.info || ""; } - /** 获取技能图标 id：驻场技能取 FieldSkillSet.icon，其余取 SkillSet.icon */ + /** 获取技能图标 id：优先用卡牌自定义 icon，驻场技能取 FieldSkillSet.icon，其余取 SkillSet.icon */ private getIconId(skill: SkillConfig | null): string { if (!this.cardData) return ""; + if (this.cardData.icon) return this.cardData.icon; if (!this.cardData.skill && this.cardData.field && this.cardData.field.length > 0) { const fieldUuid = this.cardData.field[0]; return FieldSkillSet[fieldUuid]?.icon || `${fieldUuid}`;