diff --git a/assets/resources/gui/element/hnode.prefab b/assets/resources/gui/element/hnode.prefab index c8c68f93..1c1d8ea5 100644 --- a/assets/resources/gui/element/hnode.prefab +++ b/assets/resources/gui/element/hnode.prefab @@ -31,35 +31,35 @@ "__id__": 31 }, { - "__id__": 200 + "__id__": 206 }, { - "__id__": 238 + "__id__": 244 }, { - "__id__": 254 + "__id__": 260 }, { - "__id__": 270 + "__id__": 276 }, { - "__id__": 374 + "__id__": 380 } ], "_active": true, "_components": [ { - "__id__": 396 + "__id__": 402 }, { - "__id__": 398 + "__id__": 404 }, { - "__id__": 400 + "__id__": 406 } ], "_prefab": { - "__id__": 402 + "__id__": 408 }, "_lpos": { "__type__": "cc.Vec3", @@ -744,26 +744,26 @@ "__id__": 112 }, { - "__id__": 134 + "__id__": 140 }, { - "__id__": 154 - }, - { - "__id__": 162 + "__id__": 160 }, { "__id__": 168 + }, + { + "__id__": 174 } ], "_active": true, "_components": [ { - "__id__": 197 + "__id__": 203 } ], "_prefab": { - "__id__": 199 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -1911,25 +1911,28 @@ }, { "__id__": 119 + }, + { + "__id__": 125 } ], "_active": true, "_components": [ - { - "__id__": 125 - }, - { - "__id__": 127 - }, - { - "__id__": 129 - }, { "__id__": 131 + }, + { + "__id__": 133 + }, + { + "__id__": 135 + }, + { + "__id__": 137 } ], "_prefab": { - "__id__": 133 + "__id__": 139 }, "_lpos": { "__type__": "cc.Vec3", @@ -2238,6 +2241,142 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 112 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 126 + }, + { + "__id__": 128 + } + ], + "_prefab": { + "__id__": 130 + }, + "_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.8, + "y": 0.8, + "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__": 125 + }, + "_enabled": true, + "__prefab": { + "__id__": 127 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 112, + "height": 116 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a5wjPg5s9AjrJsWxL9kOvm" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 125 + }, + "_enabled": true, + "__prefab": { + "__id__": 129 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_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": "36rCNklq1Ii5GM4eHI+4oa" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2e18f4BSROTYDbnjR2m1Pu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2248,7 +2387,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 132 }, "_contentSize": { "__type__": "cc.Size", @@ -2276,7 +2415,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 128 + "__id__": 134 }, "_type": 3, "_inverted": false, @@ -2298,7 +2437,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 130 + "__id__": 136 }, "_alignFlags": 41, "_target": null, @@ -2334,7 +2473,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 132 + "__id__": 138 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2395,26 +2534,26 @@ }, "_children": [ { - "__id__": 135 + "__id__": 141 }, { - "__id__": 141 + "__id__": 147 } ], "_active": false, "_components": [ { - "__id__": 147 + "__id__": 153 }, { - "__id__": 149 + "__id__": 155 }, { - "__id__": 151 + "__id__": 157 } ], "_prefab": { - "__id__": 153 + "__id__": 159 }, "_lpos": { "__type__": "cc.Vec3", @@ -2451,20 +2590,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 140 }, "_children": [], "_active": true, "_components": [ { - "__id__": 136 + "__id__": 142 }, { - "__id__": 138 + "__id__": 144 } ], "_prefab": { - "__id__": 140 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", @@ -2501,11 +2640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 137 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -2529,11 +2668,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2590,20 +2729,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 134 + "__id__": 140 }, "_children": [], "_active": true, "_components": [ { - "__id__": 142 + "__id__": 148 }, { - "__id__": 144 + "__id__": 150 } ], "_prefab": { - "__id__": 146 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -2640,11 +2779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -2668,11 +2807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2749,11 +2888,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 154 }, "_contentSize": { "__type__": "cc.Size", @@ -2777,11 +2916,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2819,11 +2958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 140 }, "_enabled": true, "__prefab": { - "__id__": 152 + "__id__": 158 }, "_alignFlags": 9, "_target": null, @@ -2874,17 +3013,17 @@ "_active": true, "_components": [ { - "__id__": 155 + "__id__": 161 }, { - "__id__": 157 + "__id__": 163 }, { - "__id__": 159 + "__id__": 165 } ], "_prefab": { - "__id__": 161 + "__id__": 167 }, "_lpos": { "__type__": "cc.Vec3", @@ -2921,11 +3060,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -2949,11 +3088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 158 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3017,11 +3156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 154 + "__id__": 160 }, "_enabled": true, "__prefab": { - "__id__": 160 + "__id__": 166 }, "_alignFlags": 17, "_target": null, @@ -3072,14 +3211,14 @@ "_active": true, "_components": [ { - "__id__": 163 + "__id__": 169 }, { - "__id__": 165 + "__id__": 171 } ], "_prefab": { - "__id__": 167 + "__id__": 173 }, "_lpos": { "__type__": "cc.Vec3", @@ -3116,11 +3255,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 164 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -3144,11 +3283,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 162 + "__id__": 168 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3226,14 +3365,14 @@ "__id__": 31 }, "_prefab": { - "__id__": 169 + "__id__": 175 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 168 + "__id__": 174 }, "asset": { "__uuid__": "bf40528a-fcf8-44da-af2e-d6b113904f35", @@ -3241,7 +3380,7 @@ }, "fileId": "0exfRYL89I3Lnv8hzgx3e7", "instance": { - "__id__": 170 + "__id__": 176 }, "targetOverrides": null }, @@ -3255,26 +3394,17 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 171 + "__id__": 177 }, { - "__id__": 173 - }, - { - "__id__": 174 - }, - { - "__id__": 175 - }, - { - "__id__": 176 - }, - { - "__id__": 178 + "__id__": 179 }, { "__id__": 180 }, + { + "__id__": 181 + }, { "__id__": 182 }, @@ -3290,23 +3420,32 @@ { "__id__": 190 }, - { - "__id__": 191 - }, { "__id__": 192 }, - { - "__id__": 193 - }, { "__id__": 194 }, { - "__id__": 195 + "__id__": 196 }, { - "__id__": 196 + "__id__": 197 + }, + { + "__id__": 198 + }, + { + "__id__": 199 + }, + { + "__id__": 200 + }, + { + "__id__": 201 + }, + { + "__id__": 202 } ], "removedComponents": [] @@ -3314,7 +3453,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 178 }, "propertyPath": [ "_name" @@ -3330,7 +3469,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 178 }, "propertyPath": [ "_lpos" @@ -3345,7 +3484,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 178 }, "propertyPath": [ "_lrot" @@ -3361,7 +3500,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 172 + "__id__": 178 }, "propertyPath": [ "_euler" @@ -3376,7 +3515,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 177 + "__id__": 183 }, "propertyPath": [ "_active" @@ -3392,7 +3531,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 185 }, "propertyPath": [ "_active" @@ -3408,7 +3547,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 181 + "__id__": 187 }, "propertyPath": [ "_active" @@ -3424,7 +3563,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 189 }, "propertyPath": [ "_active" @@ -3440,7 +3579,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 185 + "__id__": 191 }, "propertyPath": [ "_active" @@ -3456,7 +3595,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 187 + "__id__": 193 }, "propertyPath": [ "_active" @@ -3472,7 +3611,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 195 }, "propertyPath": [ "_top" @@ -3488,7 +3627,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 187 + "__id__": 193 }, "propertyPath": [ "_lpos" @@ -3503,7 +3642,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 185 + "__id__": 191 }, "propertyPath": [ "_lpos" @@ -3518,7 +3657,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 183 + "__id__": 189 }, "propertyPath": [ "_lpos" @@ -3533,7 +3672,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 181 + "__id__": 187 }, "propertyPath": [ "_lpos" @@ -3548,7 +3687,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 179 + "__id__": 185 }, "propertyPath": [ "_lpos" @@ -3563,7 +3702,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 177 + "__id__": 183 }, "propertyPath": [ "_lpos" @@ -3578,7 +3717,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 189 + "__id__": 195 }, "propertyPath": [ "_left" @@ -3595,7 +3734,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -3635,9 +3774,6 @@ "__id__": 1 }, "_children": [ - { - "__id__": 201 - }, { "__id__": 207 }, @@ -3649,22 +3785,25 @@ }, { "__id__": 225 + }, + { + "__id__": 231 } ], "_active": false, "_components": [ { - "__id__": 231 + "__id__": 237 }, { - "__id__": 233 + "__id__": 239 }, { - "__id__": 235 + "__id__": 241 } ], "_prefab": { - "__id__": 237 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -3701,20 +3840,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 208 }, { - "__id__": 204 + "__id__": 210 } ], "_prefab": { - "__id__": 206 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -3751,11 +3890,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -3779,11 +3918,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3840,20 +3979,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 214 }, { - "__id__": 210 + "__id__": 216 } ], "_prefab": { - "__id__": 212 + "__id__": 218 }, "_lpos": { "__type__": "cc.Vec3", @@ -3890,11 +4029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -3918,11 +4057,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 213 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3979,20 +4118,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 220 }, { - "__id__": 216 + "__id__": 222 } ], "_prefab": { - "__id__": 218 + "__id__": 224 }, "_lpos": { "__type__": "cc.Vec3", @@ -4029,11 +4168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 221 }, "_contentSize": { "__type__": "cc.Size", @@ -4057,11 +4196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 219 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 223 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4118,20 +4257,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [], "_active": false, "_components": [ { - "__id__": 220 + "__id__": 226 }, { - "__id__": 222 + "__id__": 228 } ], "_prefab": { - "__id__": 224 + "__id__": 230 }, "_lpos": { "__type__": "cc.Vec3", @@ -4168,11 +4307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 221 + "__id__": 227 }, "_contentSize": { "__type__": "cc.Size", @@ -4196,11 +4335,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 219 + "__id__": 225 }, "_enabled": true, "__prefab": { - "__id__": 223 + "__id__": 229 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4257,20 +4396,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [], "_active": false, "_components": [ { - "__id__": 226 + "__id__": 232 }, { - "__id__": 228 + "__id__": 234 } ], "_prefab": { - "__id__": 230 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -4307,11 +4446,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 233 }, "_contentSize": { "__type__": "cc.Size", @@ -4335,11 +4474,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 225 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 235 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4396,11 +4535,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -4424,11 +4563,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 240 }, "_resizeMode": 1, "_layoutType": 1, @@ -4462,11 +4601,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 242 }, "_alignFlags": 16, "_target": null, @@ -4515,26 +4654,26 @@ }, "_children": [ { - "__id__": 239 + "__id__": 245 } ], "_active": true, "_components": [ - { - "__id__": 245 - }, - { - "__id__": 247 - }, - { - "__id__": 249 - }, { "__id__": 251 + }, + { + "__id__": 253 + }, + { + "__id__": 255 + }, + { + "__id__": 257 } ], "_prefab": { - "__id__": 253 + "__id__": 259 }, "_lpos": { "__type__": "cc.Vec3", @@ -4571,20 +4710,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 238 + "__id__": 244 }, "_children": [], "_active": true, "_components": [ { - "__id__": 240 + "__id__": 246 }, { - "__id__": 242 + "__id__": 248 } ], "_prefab": { - "__id__": 244 + "__id__": 250 }, "_lpos": { "__type__": "cc.Vec3", @@ -4621,11 +4760,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 247 }, "_contentSize": { "__type__": "cc.Size", @@ -4649,11 +4788,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 249 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4730,11 +4869,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 246 + "__id__": 252 }, "_contentSize": { "__type__": "cc.Size", @@ -4758,11 +4897,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 248 + "__id__": 254 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4806,11 +4945,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 256 }, "clickEvents": [], "_interactable": true, @@ -4850,7 +4989,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 238 + "__id__": 244 }, "_id": "" }, @@ -4864,11 +5003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 238 + "__id__": 244 }, "_enabled": false, "__prefab": { - "__id__": 252 + "__id__": 258 }, "_alignFlags": 44, "_target": null, @@ -4917,26 +5056,26 @@ }, "_children": [ { - "__id__": 255 + "__id__": 261 } ], "_active": true, "_components": [ - { - "__id__": 261 - }, - { - "__id__": 263 - }, - { - "__id__": 265 - }, { "__id__": 267 + }, + { + "__id__": 269 + }, + { + "__id__": 271 + }, + { + "__id__": 273 } ], "_prefab": { - "__id__": 269 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", @@ -4973,20 +5112,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 254 + "__id__": 260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 256 + "__id__": 262 }, { - "__id__": 258 + "__id__": 264 } ], "_prefab": { - "__id__": 260 + "__id__": 266 }, "_lpos": { "__type__": "cc.Vec3", @@ -5023,11 +5162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 257 + "__id__": 263 }, "_contentSize": { "__type__": "cc.Size", @@ -5051,11 +5190,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 255 + "__id__": 261 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 265 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5132,11 +5271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 262 + "__id__": 268 }, "_contentSize": { "__type__": "cc.Size", @@ -5160,11 +5299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 270 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5208,11 +5347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 272 }, "clickEvents": [], "_interactable": true, @@ -5252,7 +5391,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 254 + "__id__": 260 }, "_id": "" }, @@ -5266,11 +5405,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": false, "__prefab": { - "__id__": 268 + "__id__": 274 }, "_alignFlags": 44, "_target": null, @@ -5319,29 +5458,29 @@ }, "_children": [ { - "__id__": 271 + "__id__": 277 }, { - "__id__": 299 + "__id__": 305 }, { - "__id__": 333 + "__id__": 339 } ], "_active": true, "_components": [ { - "__id__": 367 + "__id__": 373 }, { - "__id__": 369 + "__id__": 375 }, { - "__id__": 371 + "__id__": 377 } ], "_prefab": { - "__id__": 373 + "__id__": 379 }, "_lpos": { "__type__": "cc.Vec3", @@ -5378,33 +5517,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 270 + "__id__": 276 }, "_children": [ { - "__id__": 272 - }, - { - "__id__": 280 + "__id__": 278 }, { "__id__": 286 + }, + { + "__id__": 292 } ], "_active": true, "_components": [ { - "__id__": 292 + "__id__": 298 }, { - "__id__": 294 + "__id__": 300 }, { - "__id__": 296 + "__id__": 302 } ], "_prefab": { - "__id__": 298 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -5441,23 +5580,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 271 + "__id__": 277 }, "_children": [], "_active": true, "_components": [ { - "__id__": 273 + "__id__": 279 }, { - "__id__": 275 + "__id__": 281 }, { - "__id__": 277 + "__id__": 283 } ], "_prefab": { - "__id__": 279 + "__id__": 285 }, "_lpos": { "__type__": "cc.Vec3", @@ -5494,11 +5633,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 274 + "__id__": 280 }, "_contentSize": { "__type__": "cc.Size", @@ -5522,11 +5661,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 276 + "__id__": 282 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5570,11 +5709,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "__prefab": { - "__id__": 278 + "__id__": 284 }, "_alignFlags": 45, "_target": null, @@ -5619,20 +5758,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 271 + "__id__": 277 }, "_children": [], "_active": true, "_components": [ { - "__id__": 281 + "__id__": 287 }, { - "__id__": 283 + "__id__": 289 } ], "_prefab": { - "__id__": 285 + "__id__": 291 }, "_lpos": { "__type__": "cc.Vec3", @@ -5669,11 +5808,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 288 }, "_contentSize": { "__type__": "cc.Size", @@ -5697,11 +5836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 290 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5758,20 +5897,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 271 + "__id__": 277 }, "_children": [], "_active": true, "_components": [ { - "__id__": 287 + "__id__": 293 }, { - "__id__": 289 + "__id__": 295 } ], "_prefab": { - "__id__": 291 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -5808,11 +5947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 286 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 294 }, "_contentSize": { "__type__": "cc.Size", @@ -5836,11 +5975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 286 + "__id__": 292 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 296 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5917,11 +6056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": true, "__prefab": { - "__id__": 293 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -5945,11 +6084,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": false, "__prefab": { - "__id__": 295 + "__id__": 301 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5990,11 +6129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 277 }, "_enabled": false, "__prefab": { - "__id__": 297 + "__id__": 303 }, "_alignFlags": 44, "_target": null, @@ -6039,36 +6178,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 270 + "__id__": 276 }, "_children": [ { - "__id__": 300 - }, - { - "__id__": 308 + "__id__": 306 }, { "__id__": 314 }, { "__id__": 320 + }, + { + "__id__": 326 } ], "_active": true, "_components": [ { - "__id__": 326 + "__id__": 332 }, { - "__id__": 328 + "__id__": 334 }, { - "__id__": 330 + "__id__": 336 } ], "_prefab": { - "__id__": 332 + "__id__": 338 }, "_lpos": { "__type__": "cc.Vec3", @@ -6105,23 +6244,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 299 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 301 + "__id__": 307 }, { - "__id__": 303 + "__id__": 309 }, { - "__id__": 305 + "__id__": 311 } ], "_prefab": { - "__id__": 307 + "__id__": 313 }, "_lpos": { "__type__": "cc.Vec3", @@ -6158,11 +6297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 308 }, "_contentSize": { "__type__": "cc.Size", @@ -6186,11 +6325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 304 + "__id__": 310 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6234,11 +6373,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 300 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 306 + "__id__": 312 }, "_alignFlags": 45, "_target": null, @@ -6283,20 +6422,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 299 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 309 + "__id__": 315 }, { - "__id__": 311 + "__id__": 317 } ], "_prefab": { - "__id__": 313 + "__id__": 319 }, "_lpos": { "__type__": "cc.Vec3", @@ -6333,11 +6472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 310 + "__id__": 316 }, "_contentSize": { "__type__": "cc.Size", @@ -6361,11 +6500,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 308 + "__id__": 314 }, "_enabled": true, "__prefab": { - "__id__": 312 + "__id__": 318 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6422,20 +6561,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 299 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 315 + "__id__": 321 }, { - "__id__": 317 + "__id__": 323 } ], "_prefab": { - "__id__": 319 + "__id__": 325 }, "_lpos": { "__type__": "cc.Vec3", @@ -6472,11 +6611,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 316 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -6500,11 +6639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "__prefab": { - "__id__": 318 + "__id__": 324 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6581,20 +6720,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 299 + "__id__": 305 }, "_children": [], "_active": true, "_components": [ { - "__id__": 321 + "__id__": 327 }, { - "__id__": 323 + "__id__": 329 } ], "_prefab": { - "__id__": 325 + "__id__": 331 }, "_lpos": { "__type__": "cc.Vec3", @@ -6631,11 +6770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 322 + "__id__": 328 }, "_contentSize": { "__type__": "cc.Size", @@ -6659,11 +6798,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 320 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 324 + "__id__": 330 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6740,11 +6879,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 333 }, "_contentSize": { "__type__": "cc.Size", @@ -6768,11 +6907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 305 }, "_enabled": false, "__prefab": { - "__id__": 329 + "__id__": 335 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6813,11 +6952,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 299 + "__id__": 305 }, "_enabled": false, "__prefab": { - "__id__": 331 + "__id__": 337 }, "_alignFlags": 44, "_target": null, @@ -6862,36 +7001,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 270 + "__id__": 276 }, "_children": [ { - "__id__": 334 - }, - { - "__id__": 342 + "__id__": 340 }, { "__id__": 348 }, { "__id__": 354 + }, + { + "__id__": 360 } ], "_active": true, "_components": [ { - "__id__": 360 + "__id__": 366 }, { - "__id__": 362 + "__id__": 368 }, { - "__id__": 364 + "__id__": 370 } ], "_prefab": { - "__id__": 366 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -6928,23 +7067,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 333 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 335 + "__id__": 341 }, { - "__id__": 337 + "__id__": 343 }, { - "__id__": 339 + "__id__": 345 } ], "_prefab": { - "__id__": 341 + "__id__": 347 }, "_lpos": { "__type__": "cc.Vec3", @@ -6981,11 +7120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 342 }, "_contentSize": { "__type__": "cc.Size", @@ -7009,11 +7148,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 338 + "__id__": 344 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7057,11 +7196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 334 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 340 + "__id__": 346 }, "_alignFlags": 45, "_target": null, @@ -7106,20 +7245,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 333 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 343 + "__id__": 349 }, { - "__id__": 345 + "__id__": 351 } ], "_prefab": { - "__id__": 347 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -7156,11 +7295,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 350 }, "_contentSize": { "__type__": "cc.Size", @@ -7184,11 +7323,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 342 + "__id__": 348 }, "_enabled": true, "__prefab": { - "__id__": 346 + "__id__": 352 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7242,20 +7381,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 333 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 349 + "__id__": 355 }, { - "__id__": 351 + "__id__": 357 } ], "_prefab": { - "__id__": 353 + "__id__": 359 }, "_lpos": { "__type__": "cc.Vec3", @@ -7292,11 +7431,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 356 }, "_contentSize": { "__type__": "cc.Size", @@ -7320,11 +7459,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 354 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 358 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7401,20 +7540,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 333 + "__id__": 339 }, "_children": [], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 361 }, { - "__id__": 357 + "__id__": 363 } ], "_prefab": { - "__id__": 359 + "__id__": 365 }, "_lpos": { "__type__": "cc.Vec3", @@ -7451,11 +7590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 356 + "__id__": 362 }, "_contentSize": { "__type__": "cc.Size", @@ -7479,11 +7618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 354 + "__id__": 360 }, "_enabled": true, "__prefab": { - "__id__": 358 + "__id__": 364 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7560,11 +7699,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 339 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 367 }, "_contentSize": { "__type__": "cc.Size", @@ -7588,11 +7727,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 339 }, "_enabled": false, "__prefab": { - "__id__": 363 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7633,11 +7772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 333 + "__id__": 339 }, "_enabled": false, "__prefab": { - "__id__": 365 + "__id__": 371 }, "_alignFlags": 44, "_target": null, @@ -7682,11 +7821,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 374 }, "_contentSize": { "__type__": "cc.Size", @@ -7710,11 +7849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 376 }, "_alignFlags": 0, "_target": null, @@ -7746,11 +7885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 270 + "__id__": 276 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 378 }, "_resizeMode": 1, "_layoutType": 3, @@ -7801,26 +7940,26 @@ }, "_children": [ { - "__id__": 375 + "__id__": 381 }, { - "__id__": 383 + "__id__": 389 } ], "_active": true, "_components": [ { - "__id__": 389 + "__id__": 395 }, { - "__id__": 391 + "__id__": 397 }, { - "__id__": 393 + "__id__": 399 } ], "_prefab": { - "__id__": 395 + "__id__": 401 }, "_lpos": { "__type__": "cc.Vec3", @@ -7857,23 +7996,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 380 }, "_children": [], "_active": true, "_components": [ { - "__id__": 376 + "__id__": 382 }, { - "__id__": 378 + "__id__": 384 }, { - "__id__": 380 + "__id__": 386 } ], "_prefab": { - "__id__": 382 + "__id__": 388 }, "_lpos": { "__type__": "cc.Vec3", @@ -7910,11 +8049,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 383 }, "_contentSize": { "__type__": "cc.Size", @@ -7938,11 +8077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 379 + "__id__": 385 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7986,11 +8125,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 375 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 381 + "__id__": 387 }, "_alignFlags": 45, "_target": null, @@ -8035,20 +8174,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 380 }, "_children": [], "_active": true, "_components": [ { - "__id__": 384 + "__id__": 390 }, { - "__id__": 386 + "__id__": 392 } ], "_prefab": { - "__id__": 388 + "__id__": 394 }, "_lpos": { "__type__": "cc.Vec3", @@ -8085,11 +8224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 385 + "__id__": 391 }, "_contentSize": { "__type__": "cc.Size", @@ -8113,11 +8252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 383 + "__id__": 389 }, "_enabled": true, "__prefab": { - "__id__": 387 + "__id__": 393 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8194,11 +8333,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 390 + "__id__": 396 }, "_contentSize": { "__type__": "cc.Size", @@ -8222,11 +8361,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 380 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 398 }, "_alignFlags": 0, "_target": null, @@ -8258,11 +8397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 380 }, "_enabled": false, "__prefab": { - "__id__": 394 + "__id__": 400 }, "_resizeMode": 1, "_layoutType": 3, @@ -8313,7 +8452,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 397 + "__id__": 403 }, "_contentSize": { "__type__": "cc.Size", @@ -8341,37 +8480,40 @@ }, "_enabled": true, "__prefab": { - "__id__": 399 + "__id__": 405 }, "icon_node": { "__id__": 113 }, + "skill_icon_node": { + "__id__": 125 + }, "sell_node": { - "__id__": 238 + "__id__": 244 }, "BG_node": { "__id__": 32 }, "close_node": { - "__id__": 254 + "__id__": 260 }, "Name_node": { - "__id__": 154 + "__id__": 160 }, "info_node": { - "__id__": 383 + "__id__": 389 }, "lv_node": { - "__id__": 165 + "__id__": 171 }, "ap_node": { - "__id__": 299 + "__id__": 305 }, "hp_node": { - "__id__": 333 + "__id__": 339 }, "cd_node": { - "__id__": 271 + "__id__": 277 }, "_id": "" }, @@ -8389,7 +8531,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 407 }, "_alignFlags": 41, "_target": null, @@ -8428,7 +8570,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 168 + "__id__": 174 }, { "__id__": 87 diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 3436668c..3c55d822 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -86,6 +86,7 @@ export interface CardConfig { // 技能卡扩展属性 skill?: number // 关联的技能 UUID + icon?: string // 图标ID(可选,优先使用;未设置时按 trigger_type 从 SkillSet/FieldSkillSet 自动取) name?: string // 卡牌名称 info?: string // 卡牌描述信息 is_inst?: boolean // 是否即时起效 @@ -265,6 +266,7 @@ SkillCardData.forEach(data => { card_lv: 1, name: data.name, info: data.info, + icon: data.icon, // 【新增】透传自定义图标ID(优先级最高) is_inst: data.is_inst, t_times: data.t_times || (data.is_inst ? 1 : 999), t_inv: data.t_inv || 0, diff --git a/assets/script/game/map/HInfoComp.ts b/assets/script/game/map/HInfoComp.ts index 7af5f0fc..1fd7d0f3 100644 --- a/assets/script/game/map/HInfoComp.ts +++ b/assets/script/game/map/HInfoComp.ts @@ -35,7 +35,7 @@ import { mLogger } from "../common/Logger"; import { MissionHeroComp } from "./MissionHeroComp"; import { MoveComp } from "../hero/MoveComp"; import { FacSet, getLvColor } from "../common/config/GameSet"; -import { CKind, CardPoolList } from "../common/config/CardSet"; +import { CKind, CardPoolList, CardConfig, CardTriggerType } from "../common/config/CardSet"; import { SkillSet } from "../common/config/SkillSet"; import { CardBgComp } from "./CardBgComp"; import { MissionEconomy } from "./MissionEconomy"; @@ -54,6 +54,9 @@ export class HInfoComp extends CCComp { /** 英雄 idle 动画图标节点 */ @property(Node) icon_node=null! + /** 技能图标节点 */ + @property(Node) + skill_icon_node=null! /** 出售按钮节点 */ @property(Node) sell_node=null! @@ -169,6 +172,10 @@ export class HInfoComp extends CCComp { if (this.isSkillCard) { // ================= 技能卡预览 ================= + // 互斥:技能卡只显示技能图标,隐藏英雄图标 + if (this.icon_node) this.icon_node.active = false; + if (this.skill_icon_node) this.skill_icon_node.active = true; + const config = CardPoolList.find(c => c.uuid === heroUuid); if (!config) return; @@ -192,10 +199,14 @@ export class HInfoComp extends CCComp { if (heroUuid !== this.iconHeroUuid) { this.iconHeroUuid = heroUuid; this.iconVisualToken += 1; - this.updateSkillAnimation(this.icon_node, config.skill ?? heroUuid, this.iconVisualToken); + this.updateSkillAnimation(this.skill_icon_node, config, this.iconVisualToken); } } else { // ================= 英雄卡预览 ================= + // 互斥:英雄卡只显示英雄图标,隐藏技能图标 + if (this.icon_node) this.icon_node.active = true; + if (this.skill_icon_node) this.skill_icon_node.active = false; + const hero = HeroInfo[heroUuid]; if (!hero) return; @@ -461,31 +472,35 @@ export class HInfoComp extends CCComp { /** * 为技能图标加载静态图片。 - * @param node 图标节点 - * @param skillUuid 技能 UUID - * @param token 视觉令牌 + * 图标来源优先级:config.icon > 按 trigger_type 自动取(Interval→SkillSet,Field→FieldSkillSet)。 + * @param node 图标节点 + * @param config 卡牌配置 + * @param token 视觉令牌 */ - private updateSkillAnimation(node: Node, skillUuid: number, token: number) { + private updateSkillAnimation(node: Node, config: CardConfig, token: number) { if (!node) return; - this.clearIconAnimation(node); // 停止之前的动画 + this.clearIconAnimation(node); const sprite = node.getComponent(Sprite) || node.getComponentInChildren(Sprite); if (!sprite) return; - - const skillData = SkillSet[skillUuid]; - if (!skillData || !skillData.icon) { - sprite.spriteFrame = null; - return; - } + sprite.spriteFrame = null; - if (smc.uiconsAtlas) { - const frame = smc.uiconsAtlas.getSpriteFrame(skillData.icon); - if (frame && token === this.iconVisualToken) { - sprite.spriteFrame = frame; + // 优先使用卡牌自定义 icon;未定义则按 trigger_type 自动取 + let iconId: string | undefined = config.icon; + if (!iconId) { + if (config.trigger_type === CardTriggerType.Interval) { + iconId = config.skill ? SkillSet[config.skill]?.icon : undefined; + } else if (config.trigger_type === CardTriggerType.Field) { + const fieldUuid = config.field?.[0]; + iconId = fieldUuid ? FieldSkillSet[fieldUuid]?.icon : undefined; } - } else { - const sf = oops.res.get("game/heros/cards/" + skillData.icon, SpriteFrame) as SpriteFrame; - if (sf && token === this.iconVisualToken) { - sprite.spriteFrame = sf; + } + if (!iconId) return; + + // 与 CardComp / SCardComp 一致:仅信任全局缓存的 uiconsAtlas + if (smc.uiconsAtlas) { + const frame = smc.uiconsAtlas.getSpriteFrame(iconId); + if (token === this.iconVisualToken) { + sprite.spriteFrame = frame || null; } } }