diff --git a/assets/resources/gui/element/cEquip.prefab b/assets/resources/gui/element/cEquip.prefab index df5072e1..8423a0d5 100644 --- a/assets/resources/gui/element/cEquip.prefab +++ b/assets/resources/gui/element/cEquip.prefab @@ -31,29 +31,29 @@ "__id__": 111 }, { - "__id__": 336 + "__id__": 302 }, { - "__id__": 368 + "__id__": 334 }, { - "__id__": 374 + "__id__": 340 } ], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 380 }, { - "__id__": 416 + "__id__": 382 }, { - "__id__": 418 + "__id__": 384 } ], "_prefab": { - "__id__": 512 + "__id__": 478 }, "_lpos": { "__type__": "cc.Vec3", @@ -1799,54 +1799,75 @@ { "__id__": 187 }, + { + "__id__": 188 + }, { "__id__": 189 }, { - "__id__": 191 + "__id__": 190 }, { - "__id__": 193 + "__id__": 192 }, { - "__id__": 195 + "__id__": 194 }, { - "__id__": 197 + "__id__": 196 }, { - "__id__": 199 + "__id__": 198 }, { - "__id__": 201 + "__id__": 200 }, { - "__id__": 203 + "__id__": 202 }, { - "__id__": 205 + "__id__": 204 }, { - "__id__": 207 + "__id__": 206 }, { - "__id__": 209 + "__id__": 208 + }, + { + "__id__": 210 }, { "__id__": 211 }, + { + "__id__": 212 + }, { "__id__": 213 }, + { + "__id__": 214 + }, { "__id__": 215 }, + { + "__id__": 216 + }, { "__id__": 217 }, + { + "__id__": 218 + }, { "__id__": 219 }, + { + "__id__": 220 + }, { "__id__": 221 }, @@ -1860,77 +1881,56 @@ "__id__": 224 }, { - "__id__": 226 + "__id__": 225 }, { - "__id__": 228 + "__id__": 227 }, { - "__id__": 230 + "__id__": 229 }, { - "__id__": 232 + "__id__": 231 }, { - "__id__": 234 + "__id__": 233 }, { - "__id__": 236 + "__id__": 235 }, { - "__id__": 238 + "__id__": 237 }, { - "__id__": 240 + "__id__": 239 }, { - "__id__": 242 + "__id__": 241 }, { - "__id__": 244 + "__id__": 243 }, { "__id__": 245 }, - { - "__id__": 246 - }, { "__id__": 247 }, - { - "__id__": 248 - }, { "__id__": 249 }, - { - "__id__": 250 - }, { "__id__": 251 }, - { - "__id__": 252 - }, { "__id__": 253 }, - { - "__id__": 254 - }, { "__id__": 255 }, - { - "__id__": 256 - }, { "__id__": 257 }, - { - "__id__": 258 - }, { "__id__": 259 }, @@ -1993,62 +1993,11 @@ }, { "__id__": 299 - }, - { - "__id__": 301 - }, - { - "__id__": 303 - }, - { - "__id__": 305 - }, - { - "__id__": 307 - }, - { - "__id__": 309 - }, - { - "__id__": 311 - }, - { - "__id__": 313 - }, - { - "__id__": 315 - }, - { - "__id__": 317 - }, - { - "__id__": 319 - }, - { - "__id__": 321 - }, - { - "__id__": 323 - }, - { - "__id__": 325 - }, - { - "__id__": 327 - }, - { - "__id__": 329 - }, - { - "__id__": 331 - }, - { - "__id__": 333 } ], "removedComponents": [ { - "__id__": 335 + "__id__": 301 } ] }, @@ -2196,306 +2145,6 @@ "targetInfo": { "__id__": 126 }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44Ed4eH0lI5Kssdq2dPzke" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 128 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 370, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "01RZgHEk5DOImBHnPTZbSl" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 130 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 193, - "height": 193 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7eXE020LJO2re5wfhWMR+x" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 132 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 370, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "cdEeG/ubFJgqKs1MdM6xd9" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 134 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 193, - "height": 193 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "bdhTW5lJ9PJamgUN/UmnC2" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 136 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 370, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "01Tb8sF1pD1K401C16wfxs" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 138 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 193, - "height": 193 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "31upVgp9hMgqBxdoieIwVm" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 140 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 370, - "height": 370 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c82typVIdBJJabkX/s0ZkZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 142 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 193, - "height": 193 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "ce0/u2yctKCZkL+Ru0cbmo" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 144 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 450, - "height": 450 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "68Zpxa86JHMbiKqxEUYo0V" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 146 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 233, - "height": 233 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "4cdo17U+VOh4SgXfb/+Gk7" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 148 - }, - "propertyPath": [ - "_active" - ], - "value": true - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "d3r4ZGziNEz77IzWW7ndja" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 150 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "f815Ec4HdHl7lhEUTBr/l3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 152 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c8GUMPCaFLxq7iBjkJgK3j" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 154 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "93fFoXu3BBYqu4RLG2YPon" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 156 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "51ns/anqVO87NRv6DMzJKj" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 158 - }, "propertyPath": [ "_spriteFrame" ], @@ -2510,7 +2159,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 128 }, "propertyPath": [ "_active" @@ -2526,23 +2175,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 - }, - "propertyPath": [ - "_active" - ], - "value": false - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c8niXKCPZJkZO13m9+xJNN" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 164 + "__id__": 130 }, "propertyPath": [ "_color" @@ -2564,7 +2197,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 132 }, "propertyPath": [ "_enabled" @@ -2580,7 +2213,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 168 + "__id__": 134 }, "propertyPath": [ "_contentSize" @@ -2600,7 +2233,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 170 + "__id__": 136 }, "propertyPath": [ "_contentSize" @@ -2618,6 +2251,363 @@ "e14VVYGSBKLoDfQrNILK6T" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 138 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "876mNfef5KVKYRzBqj8gYK", + "83P4sVbBxHe71l75/tRNjY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 140 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 168, + "height": 168 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "876mNfef5KVKYRzBqj8gYK", + "ecnsLXt8JDhaks57yhUGcF" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 142 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 176, + "height": 176 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "876mNfef5KVKYRzBqj8gYK", + "1aw4GfFWhHqIf+lgck1P7l" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 144 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "876mNfef5KVKYRzBqj8gYK", + "dbucZ8H09MU4QKWtxwzmpf" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 146 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeEpjaytRNf5wc6HPNIv0c", + "e14VVYGSBKLoDfQrNILK6T" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 148 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeEpjaytRNf5wc6HPNIv0c", + "83P4sVbBxHe71l75/tRNjY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 150 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 168, + "height": 168 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeEpjaytRNf5wc6HPNIv0c", + "ecnsLXt8JDhaks57yhUGcF" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 152 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 176, + "height": 176 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeEpjaytRNf5wc6HPNIv0c", + "1aw4GfFWhHqIf+lgck1P7l" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 154 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "aeEpjaytRNf5wc6HPNIv0c", + "dbucZ8H09MU4QKWtxwzmpf" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 156 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44f04XYU5IuI/vjTLt9imQ", + "e14VVYGSBKLoDfQrNILK6T" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 158 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44f04XYU5IuI/vjTLt9imQ", + "83P4sVbBxHe71l75/tRNjY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 160 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 168, + "height": 168 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44f04XYU5IuI/vjTLt9imQ", + "ecnsLXt8JDhaks57yhUGcF" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 162 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 176, + "height": 176 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44f04XYU5IuI/vjTLt9imQ", + "1aw4GfFWhHqIf+lgck1P7l" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 164 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "44f04XYU5IuI/vjTLt9imQ", + "dbucZ8H09MU4QKWtxwzmpf" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 166 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9e4a3FYB1NYan0EPGwSxOE", + "e14VVYGSBKLoDfQrNILK6T" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 168 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9e4a3FYB1NYan0EPGwSxOE", + "83P4sVbBxHe71l75/tRNjY" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 170 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 168, + "height": 168 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9e4a3FYB1NYan0EPGwSxOE", + "ecnsLXt8JDhaks57yhUGcF" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -2628,15 +2618,15 @@ ], "value": { "__type__": "cc.Size", - "width": 172, - "height": 172 + "width": 176, + "height": 176 } }, { "__type__": "cc.TargetInfo", "localID": [ - "876mNfef5KVKYRzBqj8gYK", - "83P4sVbBxHe71l75/tRNjY" + "9e4a3FYB1NYan0EPGwSxOE", + "1aw4GfFWhHqIf+lgck1P7l" ] }, { @@ -2649,15 +2639,15 @@ ], "value": { "__type__": "cc.Size", - "width": 168, - "height": 168 + "width": 180, + "height": 180 } }, { "__type__": "cc.TargetInfo", "localID": [ - "876mNfef5KVKYRzBqj8gYK", - "ecnsLXt8JDhaks57yhUGcF" + "9e4a3FYB1NYan0EPGwSxOE", + "dbucZ8H09MU4QKWtxwzmpf" ] }, { @@ -2670,15 +2660,15 @@ ], "value": { "__type__": "cc.Size", - "width": 176, - "height": 176 + "width": 90, + "height": 90 } }, { "__type__": "cc.TargetInfo", "localID": [ - "876mNfef5KVKYRzBqj8gYK", - "1aw4GfFWhHqIf+lgck1P7l" + "23N3QsLc5MH5KSNw/l/xwf", + "e14VVYGSBKLoDfQrNILK6T" ] }, { @@ -2691,15 +2681,15 @@ ], "value": { "__type__": "cc.Size", - "width": 180, - "height": 180 + "width": 172, + "height": 172 } }, { "__type__": "cc.TargetInfo", "localID": [ - "876mNfef5KVKYRzBqj8gYK", - "dbucZ8H09MU4QKWtxwzmpf" + "23N3QsLc5MH5KSNw/l/xwf", + "83P4sVbBxHe71l75/tRNjY" ] }, { @@ -2712,15 +2702,15 @@ ], "value": { "__type__": "cc.Size", - "width": 90, - "height": 90 + "width": 168, + "height": 168 } }, { "__type__": "cc.TargetInfo", "localID": [ - "aeEpjaytRNf5wc6HPNIv0c", - "e14VVYGSBKLoDfQrNILK6T" + "23N3QsLc5MH5KSNw/l/xwf", + "ecnsLXt8JDhaks57yhUGcF" ] }, { @@ -2733,15 +2723,15 @@ ], "value": { "__type__": "cc.Size", - "width": 172, - "height": 172 + "width": 176, + "height": 176 } }, { "__type__": "cc.TargetInfo", "localID": [ - "aeEpjaytRNf5wc6HPNIv0c", - "83P4sVbBxHe71l75/tRNjY" + "23N3QsLc5MH5KSNw/l/xwf", + "1aw4GfFWhHqIf+lgck1P7l" ] }, { @@ -2754,15 +2744,15 @@ ], "value": { "__type__": "cc.Size", - "width": 168, - "height": 168 + "width": 180, + "height": 180 } }, { "__type__": "cc.TargetInfo", "localID": [ - "aeEpjaytRNf5wc6HPNIv0c", - "ecnsLXt8JDhaks57yhUGcF" + "23N3QsLc5MH5KSNw/l/xwf", + "dbucZ8H09MU4QKWtxwzmpf" ] }, { @@ -2770,363 +2760,6 @@ "targetInfo": { "__id__": 186 }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 176, - "height": 176 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "aeEpjaytRNf5wc6HPNIv0c", - "1aw4GfFWhHqIf+lgck1P7l" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 188 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "aeEpjaytRNf5wc6HPNIv0c", - "dbucZ8H09MU4QKWtxwzmpf" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 190 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44f04XYU5IuI/vjTLt9imQ", - "e14VVYGSBKLoDfQrNILK6T" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 192 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44f04XYU5IuI/vjTLt9imQ", - "83P4sVbBxHe71l75/tRNjY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 194 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 168, - "height": 168 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44f04XYU5IuI/vjTLt9imQ", - "ecnsLXt8JDhaks57yhUGcF" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 196 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 176, - "height": 176 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44f04XYU5IuI/vjTLt9imQ", - "1aw4GfFWhHqIf+lgck1P7l" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 198 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "44f04XYU5IuI/vjTLt9imQ", - "dbucZ8H09MU4QKWtxwzmpf" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 200 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9e4a3FYB1NYan0EPGwSxOE", - "e14VVYGSBKLoDfQrNILK6T" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 202 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9e4a3FYB1NYan0EPGwSxOE", - "83P4sVbBxHe71l75/tRNjY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 204 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 168, - "height": 168 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9e4a3FYB1NYan0EPGwSxOE", - "ecnsLXt8JDhaks57yhUGcF" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 206 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 176, - "height": 176 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9e4a3FYB1NYan0EPGwSxOE", - "1aw4GfFWhHqIf+lgck1P7l" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 208 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "9e4a3FYB1NYan0EPGwSxOE", - "dbucZ8H09MU4QKWtxwzmpf" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 210 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23N3QsLc5MH5KSNw/l/xwf", - "e14VVYGSBKLoDfQrNILK6T" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 212 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23N3QsLc5MH5KSNw/l/xwf", - "83P4sVbBxHe71l75/tRNjY" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 214 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 168, - "height": 168 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23N3QsLc5MH5KSNw/l/xwf", - "ecnsLXt8JDhaks57yhUGcF" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 216 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 176, - "height": 176 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23N3QsLc5MH5KSNw/l/xwf", - "1aw4GfFWhHqIf+lgck1P7l" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 218 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "23N3QsLc5MH5KSNw/l/xwf", - "dbucZ8H09MU4QKWtxwzmpf" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 220 - }, "propertyPath": [ "_left" ], @@ -3141,7 +2774,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 220 + "__id__": 186 }, "propertyPath": [ "_right" @@ -3151,7 +2784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 220 + "__id__": 186 }, "propertyPath": [ "_top" @@ -3161,7 +2794,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 220 + "__id__": 186 }, "propertyPath": [ "_bottom" @@ -3171,7 +2804,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 191 }, "propertyPath": [ "_left" @@ -3188,7 +2821,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 227 + "__id__": 193 }, "propertyPath": [ "_lpos" @@ -3210,7 +2843,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 195 }, "propertyPath": [ "_left" @@ -3227,7 +2860,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 197 }, "propertyPath": [ "_left" @@ -3244,7 +2877,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 233 + "__id__": 199 }, "propertyPath": [ "_left" @@ -3261,7 +2894,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 201 }, "propertyPath": [ "_left" @@ -3278,7 +2911,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 237 + "__id__": 203 }, "propertyPath": [ "_lpos" @@ -3300,7 +2933,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 239 + "__id__": 205 }, "propertyPath": [ "_lpos" @@ -3322,7 +2955,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 241 + "__id__": 207 }, "propertyPath": [ "_lpos" @@ -3344,7 +2977,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 243 + "__id__": 209 }, "propertyPath": [ "_lpos" @@ -3366,7 +2999,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 191 }, "propertyPath": [ "_right" @@ -3376,7 +3009,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 195 }, "propertyPath": [ "_right" @@ -3386,7 +3019,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 197 }, "propertyPath": [ "_right" @@ -3396,7 +3029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 233 + "__id__": 199 }, "propertyPath": [ "_right" @@ -3406,7 +3039,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 201 }, "propertyPath": [ "_right" @@ -3416,7 +3049,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 191 }, "propertyPath": [ "_bottom" @@ -3426,7 +3059,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 195 }, "propertyPath": [ "_bottom" @@ -3436,7 +3069,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 197 }, "propertyPath": [ "_bottom" @@ -3446,7 +3079,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 233 + "__id__": 199 }, "propertyPath": [ "_bottom" @@ -3456,7 +3089,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 201 }, "propertyPath": [ "_bottom" @@ -3466,7 +3099,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 225 + "__id__": 191 }, "propertyPath": [ "_top" @@ -3476,7 +3109,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 229 + "__id__": 195 }, "propertyPath": [ "_top" @@ -3486,7 +3119,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 231 + "__id__": 197 }, "propertyPath": [ "_top" @@ -3496,7 +3129,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 233 + "__id__": 199 }, "propertyPath": [ "_top" @@ -3506,7 +3139,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 235 + "__id__": 201 }, "propertyPath": [ "_top" @@ -3516,7 +3149,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 260 + "__id__": 226 }, "propertyPath": [ "_active" @@ -3532,7 +3165,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 262 + "__id__": 228 }, "propertyPath": [ "_contentSize" @@ -3552,7 +3185,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 264 + "__id__": 230 }, "propertyPath": [ "_contentSize" @@ -3570,6 +3203,366 @@ "afvZZKnn9Fb5obG6jVyKta" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 232 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 164, + "height": 164 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b07gB1EX9B7bgt1SSMJuZf", + "16PS2L0JBEEoS7TAT1HRoZ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 234 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b07gB1EX9B7bgt1SSMJuZf", + "59WtR+lBhBiIzfpFWU1cG8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 236 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b07gB1EX9B7bgt1SSMJuZf", + "6fsOId08VB9bqPtzuiF8/t" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 238 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -36.75, + "y": 38.75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b07gB1EX9B7bgt1SSMJuZf", + "75w8fK3CJCSbcfUF7Bzbl3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 240 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 44 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "b07gB1EX9B7bgt1SSMJuZf", + "1f2dXBc41DFp8cNetX1car" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 242 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "afvZZKnn9Fb5obG6jVyKta" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 244 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 164, + "height": 164 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "16PS2L0JBEEoS7TAT1HRoZ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 246 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "59WtR+lBhBiIzfpFWU1cG8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 248 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "6fsOId08VB9bqPtzuiF8/t" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 250 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -36.75, + "y": 38.75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "75w8fK3CJCSbcfUF7Bzbl3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 252 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 44 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c1YknG2hdD7YYNoBiQUeEP", + "1f2dXBc41DFp8cNetX1car" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 254 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 90, + "height": 90 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "afvZZKnn9Fb5obG6jVyKta" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 256 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 164, + "height": 164 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "16PS2L0JBEEoS7TAT1HRoZ" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 258 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "59WtR+lBhBiIzfpFWU1cG8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 260 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 180, + "height": 180 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "6fsOId08VB9bqPtzuiF8/t" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 262 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -36.75, + "y": 38.75, + "z": 0 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "75w8fK3CJCSbcfUF7Bzbl3" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 264 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 44 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "f101kaswJDXq6VOKS4gofh", + "1f2dXBc41DFp8cNetX1car" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -3580,15 +3573,15 @@ ], "value": { "__type__": "cc.Size", - "width": 164, - "height": 164 + "width": 90, + "height": 90 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "16PS2L0JBEEoS7TAT1HRoZ" + "05jFDX5FhJuruUzmKX9L6a", + "afvZZKnn9Fb5obG6jVyKta" ] }, { @@ -3601,15 +3594,15 @@ ], "value": { "__type__": "cc.Size", - "width": 172, - "height": 172 + "width": 164, + "height": 164 } }, { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "59WtR+lBhBiIzfpFWU1cG8" + "05jFDX5FhJuruUzmKX9L6a", + "16PS2L0JBEEoS7TAT1HRoZ" ] }, { @@ -3620,6 +3613,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "05jFDX5FhJuruUzmKX9L6a", + "59WtR+lBhBiIzfpFWU1cG8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 272 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 180, @@ -3629,14 +3643,14 @@ { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", + "05jFDX5FhJuruUzmKX9L6a", "6fsOId08VB9bqPtzuiF8/t" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 272 + "__id__": 274 }, "propertyPath": [ "_lpos" @@ -3651,31 +3665,10 @@ { "__type__": "cc.TargetInfo", "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", + "05jFDX5FhJuruUzmKX9L6a", "75w8fK3CJCSbcfUF7Bzbl3" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 274 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b07gB1EX9B7bgt1SSMJuZf", - "1f2dXBc41DFp8cNetX1car" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -3686,15 +3679,15 @@ ], "value": { "__type__": "cc.Size", - "width": 90, - "height": 90 + "width": 172, + "height": 44 } }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "afvZZKnn9Fb5obG6jVyKta" + "05jFDX5FhJuruUzmKX9L6a", + "1f2dXBc41DFp8cNetX1car" ] }, { @@ -3707,15 +3700,15 @@ ], "value": { "__type__": "cc.Size", - "width": 164, - "height": 164 + "width": 90, + "height": 90 } }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "16PS2L0JBEEoS7TAT1HRoZ" + "a6auQQZAlEFbbpTWbi1Icr", + "afvZZKnn9Fb5obG6jVyKta" ] }, { @@ -3728,15 +3721,15 @@ ], "value": { "__type__": "cc.Size", - "width": 172, - "height": 172 + "width": 164, + "height": 164 } }, { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "59WtR+lBhBiIzfpFWU1cG8" + "a6auQQZAlEFbbpTWbi1Icr", + "16PS2L0JBEEoS7TAT1HRoZ" ] }, { @@ -3747,6 +3740,27 @@ "propertyPath": [ "_contentSize" ], + "value": { + "__type__": "cc.Size", + "width": 172, + "height": 172 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "a6auQQZAlEFbbpTWbi1Icr", + "59WtR+lBhBiIzfpFWU1cG8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 284 + }, + "propertyPath": [ + "_contentSize" + ], "value": { "__type__": "cc.Size", "width": 180, @@ -3756,14 +3770,14 @@ { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", + "a6auQQZAlEFbbpTWbi1Icr", "6fsOId08VB9bqPtzuiF8/t" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 284 + "__id__": 286 }, "propertyPath": [ "_lpos" @@ -3778,31 +3792,10 @@ { "__type__": "cc.TargetInfo", "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", + "a6auQQZAlEFbbpTWbi1Icr", "75w8fK3CJCSbcfUF7Bzbl3" ] }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 286 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "c1YknG2hdD7YYNoBiQUeEP", - "1f2dXBc41DFp8cNetX1car" - ] - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -3813,15 +3806,15 @@ ], "value": { "__type__": "cc.Size", - "width": 90, - "height": 90 + "width": 172, + "height": 44 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "afvZZKnn9Fb5obG6jVyKta" + "a6auQQZAlEFbbpTWbi1Icr", + "1f2dXBc41DFp8cNetX1car" ] }, { @@ -3834,15 +3827,15 @@ ], "value": { "__type__": "cc.Size", - "width": 164, - "height": 164 + "width": 90, + "height": 90 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "16PS2L0JBEEoS7TAT1HRoZ" + "b53BmYygRAQ4gMcRBF/OUZ", + "afvZZKnn9Fb5obG6jVyKta" ] }, { @@ -3855,15 +3848,15 @@ ], "value": { "__type__": "cc.Size", - "width": 172, - "height": 172 + "width": 164, + "height": 164 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "59WtR+lBhBiIzfpFWU1cG8" + "b53BmYygRAQ4gMcRBF/OUZ", + "16PS2L0JBEEoS7TAT1HRoZ" ] }, { @@ -3876,15 +3869,15 @@ ], "value": { "__type__": "cc.Size", - "width": 180, - "height": 180 + "width": 172, + "height": 172 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "6fsOId08VB9bqPtzuiF8/t" + "b53BmYygRAQ4gMcRBF/OUZ", + "59WtR+lBhBiIzfpFWU1cG8" ] }, { @@ -3893,20 +3886,19 @@ "__id__": 296 }, "propertyPath": [ - "_lpos" + "_contentSize" ], "value": { - "__type__": "cc.Vec3", - "x": -36.75, - "y": 38.75, - "z": 0 + "__type__": "cc.Size", + "width": 180, + "height": 180 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "75w8fK3CJCSbcfUF7Bzbl3" + "b53BmYygRAQ4gMcRBF/OUZ", + "6fsOId08VB9bqPtzuiF8/t" ] }, { @@ -3915,19 +3907,20 @@ "__id__": 298 }, "propertyPath": [ - "_contentSize" + "_lpos" ], "value": { - "__type__": "cc.Size", - "width": 172, - "height": 44 + "__type__": "cc.Vec3", + "x": -36.75, + "y": 38.75, + "z": 0 } }, { "__type__": "cc.TargetInfo", "localID": [ - "f101kaswJDXq6VOKS4gofh", - "1f2dXBc41DFp8cNetX1car" + "b53BmYygRAQ4gMcRBF/OUZ", + "75w8fK3CJCSbcfUF7Bzbl3" ] }, { @@ -3938,366 +3931,6 @@ "propertyPath": [ "_contentSize" ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 302 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 164, - "height": 164 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 304 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 306 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 308 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -36.75, - "y": 38.75, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 310 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "05jFDX5FhJuruUzmKX9L6a", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 312 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 314 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 164, - "height": 164 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 316 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 318 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 320 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -36.75, - "y": 38.75, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 322 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 44 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "a6auQQZAlEFbbpTWbi1Icr", - "1f2dXBc41DFp8cNetX1car" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 324 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 90, - "height": 90 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "afvZZKnn9Fb5obG6jVyKta" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 326 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 164, - "height": 164 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "16PS2L0JBEEoS7TAT1HRoZ" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 328 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 172, - "height": 172 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "59WtR+lBhBiIzfpFWU1cG8" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 330 - }, - "propertyPath": [ - "_contentSize" - ], - "value": { - "__type__": "cc.Size", - "width": 180, - "height": 180 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "6fsOId08VB9bqPtzuiF8/t" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 332 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -36.75, - "y": 38.75, - "z": 0 - } - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "b53BmYygRAQ4gMcRBF/OUZ", - "75w8fK3CJCSbcfUF7Bzbl3" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 334 - }, - "propertyPath": [ - "_contentSize" - ], "value": { "__type__": "cc.Size", "width": 172, @@ -4327,29 +3960,29 @@ }, "_children": [ { - "__id__": 337 + "__id__": 303 }, { - "__id__": 345 + "__id__": 311 }, { - "__id__": 353 + "__id__": 319 } ], "_active": false, "_components": [ { - "__id__": 361 + "__id__": 327 }, { - "__id__": 363 + "__id__": 329 }, { - "__id__": 365 + "__id__": 331 } ], "_prefab": { - "__id__": 367 + "__id__": 333 }, "_lpos": { "__type__": "cc.Vec3", @@ -4386,23 +4019,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 302 }, "_children": [], "_active": true, "_components": [ { - "__id__": 338 + "__id__": 304 }, { - "__id__": 340 + "__id__": 306 }, { - "__id__": 342 + "__id__": 308 } ], "_prefab": { - "__id__": 344 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", @@ -4439,11 +4072,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 305 }, "_contentSize": { "__type__": "cc.Size", @@ -4467,11 +4100,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 307 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4535,11 +4168,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 337 + "__id__": 303 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 309 }, "_alignFlags": 40, "_target": null, @@ -4584,23 +4217,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 302 }, "_children": [], "_active": true, "_components": [ { - "__id__": 346 + "__id__": 312 }, { - "__id__": 348 + "__id__": 314 }, { - "__id__": 350 + "__id__": 316 } ], "_prefab": { - "__id__": 352 + "__id__": 318 }, "_lpos": { "__type__": "cc.Vec3", @@ -4637,11 +4270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 347 + "__id__": 313 }, "_contentSize": { "__type__": "cc.Size", @@ -4665,11 +4298,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 349 + "__id__": 315 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4733,11 +4366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 345 + "__id__": 311 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 317 }, "_alignFlags": 40, "_target": null, @@ -4782,23 +4415,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 336 + "__id__": 302 }, "_children": [], "_active": true, "_components": [ { - "__id__": 354 + "__id__": 320 }, { - "__id__": 356 + "__id__": 322 }, { - "__id__": 358 + "__id__": 324 } ], "_prefab": { - "__id__": 360 + "__id__": 326 }, "_lpos": { "__type__": "cc.Vec3", @@ -4835,11 +4468,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 321 }, "_contentSize": { "__type__": "cc.Size", @@ -4863,11 +4496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 323 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4931,11 +4564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 353 + "__id__": 319 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 325 }, "_alignFlags": 40, "_target": null, @@ -4980,11 +4613,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 362 + "__id__": 328 }, "_contentSize": { "__type__": "cc.Size", @@ -5008,11 +4641,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 330 }, "_alignFlags": 45, "_target": null, @@ -5044,11 +4677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 336 + "__id__": 302 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 332 }, "_resizeMode": 1, "_layoutType": 2, @@ -5101,14 +4734,14 @@ "_active": true, "_components": [ { - "__id__": 369 + "__id__": 335 }, { - "__id__": 371 + "__id__": 337 } ], "_prefab": { - "__id__": 373 + "__id__": 339 }, "_lpos": { "__type__": "cc.Vec3", @@ -5145,11 +4778,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -5173,11 +4806,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 368 + "__id__": 334 }, "_enabled": true, "__prefab": { - "__id__": 372 + "__id__": 338 }, "_lineHeight": 20, "_string": "RichText", @@ -5186,9 +4819,9 @@ "_fontSize": 18, "_fontColor": { "__type__": "cc.Color", - "r": 32, - "g": 32, - "b": 32, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_maxWidth": 189.9, @@ -5225,14 +4858,14 @@ "__id__": 1 }, "_prefab": { - "__id__": 375 + "__id__": 341 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 374 + "__id__": 340 }, "asset": { "__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8", @@ -5240,7 +4873,7 @@ }, "fileId": "60RuUkpjBAGoLk3z4xlHcF", "instance": { - "__id__": 376 + "__id__": 342 }, "targetOverrides": null }, @@ -5253,69 +4886,69 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 377 + "__id__": 343 } ], "propertyOverrides": [ { - "__id__": 381 + "__id__": 347 }, { - "__id__": 383 + "__id__": 349 }, { - "__id__": 384 + "__id__": 350 }, { - "__id__": 385 + "__id__": 351 }, { - "__id__": 386 + "__id__": 352 }, { - "__id__": 388 + "__id__": 354 }, { - "__id__": 390 + "__id__": 356 }, { - "__id__": 392 + "__id__": 358 }, { - "__id__": 394 + "__id__": 360 }, { - "__id__": 396 + "__id__": 362 }, { - "__id__": 398 + "__id__": 364 }, { - "__id__": 399 + "__id__": 365 }, { - "__id__": 401 + "__id__": 367 }, { - "__id__": 403 + "__id__": 369 }, { - "__id__": 405 + "__id__": 371 }, { - "__id__": 407 + "__id__": 373 }, { - "__id__": 408 + "__id__": 374 }, { - "__id__": 409 + "__id__": 375 }, { - "__id__": 410 + "__id__": 376 }, { - "__id__": 412 + "__id__": 378 } ], "removedComponents": [] @@ -5323,11 +4956,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 378 + "__id__": 344 }, "components": [ { - "__id__": 379 + "__id__": 345 } ] }, @@ -5343,15 +4976,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 374 + "__id__": 340 } }, "node": { - "__id__": 374 + "__id__": 340 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 346 }, "_alignFlags": 4, "_target": null, @@ -5380,7 +5013,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 382 + "__id__": 348 }, "propertyPath": [ "_name" @@ -5396,7 +5029,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 382 + "__id__": 348 }, "propertyPath": [ "_lpos" @@ -5411,7 +5044,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 382 + "__id__": 348 }, "propertyPath": [ "_lrot" @@ -5427,7 +5060,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 382 + "__id__": 348 }, "propertyPath": [ "_euler" @@ -5442,7 +5075,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 387 + "__id__": 353 }, "propertyPath": [ "_contentSize" @@ -5462,7 +5095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 389 + "__id__": 355 }, "propertyPath": [ "_contentSize" @@ -5482,7 +5115,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 391 + "__id__": 357 }, "propertyPath": [ "_contentSize" @@ -5502,7 +5135,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 393 + "__id__": 359 }, "propertyPath": [ "_lpos" @@ -5523,7 +5156,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 395 + "__id__": 361 }, "propertyPath": [ "_contentSize" @@ -5543,7 +5176,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 397 + "__id__": 363 }, "propertyPath": [ "_top" @@ -5559,7 +5192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 397 + "__id__": 363 }, "propertyPath": [ "_bottom" @@ -5569,7 +5202,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 400 + "__id__": 366 }, "propertyPath": [ "_active" @@ -5585,7 +5218,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 402 + "__id__": 368 }, "propertyPath": [ "_lpos" @@ -5606,7 +5239,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 404 + "__id__": 370 }, "propertyPath": [ "_color" @@ -5628,7 +5261,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 406 + "__id__": 372 }, "propertyPath": [ "_color" @@ -5650,7 +5283,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 382 + "__id__": 348 }, "propertyPath": [ "_active" @@ -5660,7 +5293,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 402 + "__id__": 368 }, "propertyPath": [ "_active" @@ -5670,7 +5303,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 400 + "__id__": 366 }, "propertyPath": [ "_lpos" @@ -5685,7 +5318,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 411 + "__id__": 377 }, "propertyPath": [ "_string" @@ -5701,7 +5334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 413 + "__id__": 379 }, "propertyPath": [ "_contentSize" @@ -5728,7 +5361,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 381 }, "_contentSize": { "__type__": "cc.Size", @@ -5756,7 +5389,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 383 }, "_alignFlags": 40, "_target": null, @@ -5792,10 +5425,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 419 + "__id__": 385 }, "icon_node": { - "__id__": 420 + "__id__": 386 }, "bg_node": { "__id__": 21 @@ -5804,16 +5437,16 @@ "__id__": 95 }, "info_rich": { - "__id__": 371 + "__id__": 337 }, "level_label": { "__id__": 101 }, "buy_node": { - "__id__": 374 + "__id__": 340 }, "cost_label": { - "__id__": 462 + "__id__": 428 }, "_id": "" }, @@ -5827,23 +5460,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 421 + "__id__": 387 }, "_children": [], "_active": true, "_components": [ { - "__id__": 455 + "__id__": 421 }, { - "__id__": 457 + "__id__": 423 }, { - "__id__": 459 + "__id__": 425 } ], "_prefab": { - "__id__": 461 + "__id__": 427 }, "_lpos": { "__type__": "cc.Vec3", @@ -5884,38 +5517,38 @@ }, "_children": [ { - "__id__": 422 + "__id__": 388 }, { - "__id__": 420 + "__id__": 386 }, { - "__id__": 428 + "__id__": 394 }, { - "__id__": 434 + "__id__": 400 }, { - "__id__": 440 + "__id__": 406 } ], "_active": true, "_components": [ { - "__id__": 446 + "__id__": 412 }, { - "__id__": 448 + "__id__": 414 }, { - "__id__": 450 + "__id__": 416 }, { - "__id__": 452 + "__id__": 418 } ], "_prefab": { - "__id__": 454 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -5952,20 +5585,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 421 + "__id__": 387 }, "_children": [], "_active": true, "_components": [ { - "__id__": 423 + "__id__": 389 }, { - "__id__": 425 + "__id__": 391 } ], "_prefab": { - "__id__": 427 + "__id__": 393 }, "_lpos": { "__type__": "cc.Vec3", @@ -6002,11 +5635,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 422 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -6030,11 +5663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 422 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 392 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6088,20 +5721,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 421 + "__id__": 387 }, "_children": [], "_active": false, "_components": [ { - "__id__": 429 + "__id__": 395 }, { - "__id__": 431 + "__id__": 397 } ], "_prefab": { - "__id__": 433 + "__id__": 399 }, "_lpos": { "__type__": "cc.Vec3", @@ -6138,11 +5771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 430 + "__id__": 396 }, "_contentSize": { "__type__": "cc.Size", @@ -6166,11 +5799,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 428 + "__id__": 394 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 398 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6224,20 +5857,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 421 + "__id__": 387 }, "_children": [], "_active": false, "_components": [ { - "__id__": 435 + "__id__": 401 }, { - "__id__": 437 + "__id__": 403 } ], "_prefab": { - "__id__": 439 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -6274,11 +5907,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 402 }, "_contentSize": { "__type__": "cc.Size", @@ -6302,11 +5935,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 400 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 404 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6360,20 +5993,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 421 + "__id__": 387 }, "_children": [], "_active": false, "_components": [ { - "__id__": 441 + "__id__": 407 }, { - "__id__": 443 + "__id__": 409 } ], "_prefab": { - "__id__": 445 + "__id__": 411 }, "_lpos": { "__type__": "cc.Vec3", @@ -6410,11 +6043,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 440 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 442 + "__id__": 408 }, "_contentSize": { "__type__": "cc.Size", @@ -6438,11 +6071,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 440 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 444 + "__id__": 410 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6496,11 +6129,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 413 }, "_contentSize": { "__type__": "cc.Size", @@ -6524,11 +6157,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 387 }, "_enabled": false, "__prefab": { - "__id__": 449 + "__id__": 415 }, "_type": 0, "_inverted": false, @@ -6546,11 +6179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 417 }, "_alignFlags": 45, "_target": null, @@ -6582,11 +6215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 421 + "__id__": 387 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 419 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6641,11 +6274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 456 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", @@ -6669,11 +6302,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 458 + "__id__": 424 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6714,11 +6347,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 420 + "__id__": 386 }, "_enabled": true, "__prefab": { - "__id__": 460 + "__id__": 426 }, "_alignFlags": 45, "_target": null, @@ -6763,11 +6396,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 477 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6827,20 +6460,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 464 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 508 + "__id__": 474 }, { - "__id__": 462 + "__id__": 428 } ], "_prefab": { - "__id__": 510 + "__id__": 476 }, "_lpos": { "__type__": "cc.Vec3", @@ -6879,27 +6512,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 465 + "__id__": 431 }, "_children": [ { - "__id__": 497 + "__id__": 463 }, { - "__id__": 463 + "__id__": 429 } ], "_active": false, "_components": [ { - "__id__": 503 + "__id__": 469 }, { - "__id__": 505 + "__id__": 471 } ], "_prefab": { - "__id__": 507 + "__id__": 473 }, "_lpos": { "__type__": "cc.Vec3", @@ -6936,33 +6569,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 374 + "__id__": 340 }, "_children": [ { - "__id__": 466 + "__id__": 432 }, { - "__id__": 464 + "__id__": 430 }, { - "__id__": 472 + "__id__": 438 } ], "_active": true, "_components": [ { - "__id__": 490 + "__id__": 456 }, { - "__id__": 492 + "__id__": 458 }, { - "__id__": 494 + "__id__": 460 } ], "_prefab": { - "__id__": 496 + "__id__": 462 }, "_lpos": { "__type__": "cc.Vec3", @@ -7001,20 +6634,20 @@ "mountedRoot": null }, "_parent": { - "__id__": 465 + "__id__": 431 }, "_children": [], "_active": true, "_components": [ { - "__id__": 467 + "__id__": 433 }, { - "__id__": 469 + "__id__": 435 } ], "_prefab": { - "__id__": 471 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -7051,11 +6684,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 466 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 434 }, "_contentSize": { "__type__": "cc.Size", @@ -7079,11 +6712,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 466 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 436 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7162,27 +6795,27 @@ "mountedRoot": null }, "_parent": { - "__id__": 465 + "__id__": 431 }, "_children": [ { - "__id__": 473 + "__id__": 439 }, { - "__id__": 479 + "__id__": 445 } ], "_active": false, "_components": [ { - "__id__": 485 + "__id__": 451 }, { - "__id__": 487 + "__id__": 453 } ], "_prefab": { - "__id__": 489 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", @@ -7219,20 +6852,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 472 + "__id__": 438 }, "_children": [], "_active": true, "_components": [ { - "__id__": 474 + "__id__": 440 }, { - "__id__": 476 + "__id__": 442 } ], "_prefab": { - "__id__": 478 + "__id__": 444 }, "_lpos": { "__type__": "cc.Vec3", @@ -7269,11 +6902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 475 + "__id__": 441 }, "_contentSize": { "__type__": "cc.Size", @@ -7297,11 +6930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 473 + "__id__": 439 }, "_enabled": true, "__prefab": { - "__id__": 477 + "__id__": 443 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7358,20 +6991,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 472 + "__id__": 438 }, "_children": [], "_active": true, "_components": [ { - "__id__": 480 + "__id__": 446 }, { - "__id__": 482 + "__id__": 448 } ], "_prefab": { - "__id__": 484 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", @@ -7408,11 +7041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 479 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 481 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -7436,11 +7069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 479 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7517,11 +7150,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 472 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 452 }, "_contentSize": { "__type__": "cc.Size", @@ -7545,11 +7178,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 472 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 454 }, "_resizeMode": 1, "_layoutType": 1, @@ -7596,11 +7229,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 465 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 491 + "__id__": 457 }, "_contentSize": { "__type__": "cc.Size", @@ -7624,11 +7257,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 465 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 459 }, "_alignFlags": 45, "_target": null, @@ -7660,11 +7293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 465 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 495 + "__id__": 461 }, "_resizeMode": 1, "_layoutType": 2, @@ -7711,20 +7344,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 464 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 498 + "__id__": 464 }, { - "__id__": 500 + "__id__": 466 } ], "_prefab": { - "__id__": 502 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -7761,11 +7394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 497 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 499 + "__id__": 465 }, "_contentSize": { "__type__": "cc.Size", @@ -7789,11 +7422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 497 + "__id__": 463 }, "_enabled": true, "__prefab": { - "__id__": 501 + "__id__": 467 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7847,11 +7480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 470 }, "_contentSize": { "__type__": "cc.Size", @@ -7875,11 +7508,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 430 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 472 }, "_resizeMode": 1, "_layoutType": 1, @@ -7926,11 +7559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 463 + "__id__": 429 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 475 }, "_contentSize": { "__type__": "cc.Size", @@ -7977,18 +7610,18 @@ "instance": null, "targetOverrides": [ { - "__id__": 513 + "__id__": 479 }, { - "__id__": 515 + "__id__": 481 }, { - "__id__": 517 + "__id__": 483 } ], "nestedPrefabInstanceRoots": [ { - "__id__": 374 + "__id__": 340 }, { "__id__": 111 @@ -8004,7 +7637,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 418 + "__id__": 384 }, "sourceInfo": null, "propertyPath": [ @@ -8014,7 +7647,7 @@ "__id__": 111 }, "targetInfo": { - "__id__": 514 + "__id__": 480 } }, { @@ -8026,17 +7659,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 418 + "__id__": 384 }, "sourceInfo": null, "propertyPath": [ "cost_label" ], "target": { - "__id__": 374 + "__id__": 340 }, "targetInfo": { - "__id__": 516 + "__id__": 482 } }, { @@ -8048,15 +7681,15 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 379 + "__id__": 345 }, "sourceInfo": null, "propertyPath": [], "target": { - "__id__": 374 + "__id__": 340 }, "targetInfo": { - "__id__": 518 + "__id__": 484 } }, { diff --git a/assets/resources/gui/element/cItem.prefab b/assets/resources/gui/element/cItem.prefab index 208ae26d..b1caece7 100644 --- a/assets/resources/gui/element/cItem.prefab +++ b/assets/resources/gui/element/cItem.prefab @@ -2585,9 +2585,9 @@ "_fontSize": 18, "_fontColor": { "__type__": "cc.Color", - "r": 32, - "g": 32, - "b": 32, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_maxWidth": 189.9, diff --git a/assets/resources/gui/element/cSkill.prefab b/assets/resources/gui/element/cSkill.prefab index b8a8bb7a..2b62a3e2 100644 --- a/assets/resources/gui/element/cSkill.prefab +++ b/assets/resources/gui/element/cSkill.prefab @@ -2322,9 +2322,9 @@ "_fontSize": 18, "_fontColor": { "__type__": "cc.Color", - "r": 32, - "g": 32, - "b": 32, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_maxWidth": 190, diff --git a/assets/script/game/common/RichOutline.ts b/assets/script/game/common/RichOutline.ts new file mode 100644 index 00000000..b6885357 --- /dev/null +++ b/assets/script/game/common/RichOutline.ts @@ -0,0 +1,37 @@ +/** + * @file RichOutline.ts + * @description RichText 描边（outline）BBCode 包裹工具 + * + * 背景： + * Cocos Creator 3.x 的 cc.RichText 原生支持 标签： + * 文本 + * 无需新增组件即可为富文本提供描边能力。 + * + * 使用： + * import { outlineRich } from "./RichOutline"; + * this.info_rich.string = outlineRich(desc); // 默认黑色 2px + * this.info_rich.string = outlineRich(desc, "#000", 1); // 自定义 + * + * 注意： + * - 为包裹型标签，需成对出现；内部可嵌套 / 等标签。 + * - width 为像素宽度（int），color 支持 #RGB/#RRGGBB。 + * - 空字符串直接返回，不包裹空标签。 + */ + +/** 默认描边颜色（深黑，深色面板通用） */ +export const RICH_OUTLINE_COLOR = "#000000"; + +/** 默认描边宽度（像素） */ +export const RICH_OUTLINE_WIDTH = 2; + +/** + * 为 RichText 富文本串包裹描边标签 + * @param text 原始 BBCode 富文本（可为空串） + * @param color 描边颜色（默认 #000000） + * @param width 描边宽度像素（默认 2） + * @returns 包裹 后的富文本串；空串原样返回 + */ +export function outlineRich(text: string, color: string = RICH_OUTLINE_COLOR, width: number = RICH_OUTLINE_WIDTH): string { + if (!text) return text; + return `${text}`; +} diff --git a/assets/script/game/common/RichOutline.ts.meta b/assets/script/game/common/RichOutline.ts.meta new file mode 100644 index 00000000..c7562cad --- /dev/null +++ b/assets/script/game/common/RichOutline.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.24", + "importer": "typescript", + "imported": true, + "uuid": "567d290a-d379-4074-ba04-05d463cc8f7b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts index 420d45aa..308423bc 100644 --- a/assets/script/game/common/config/HeroSkillDesc.ts +++ b/assets/script/game/common/config/HeroSkillDesc.ts @@ -88,8 +88,8 @@ const ATTR_NAME: Partial> = { [Attrs.hp_max]: "最大生命", }; -/** 富文本数值高亮色（亮绿色，与项目绿色系同源，深色面板上清晰可读） */ -const RICH_VALUE_COLOR = "#27AE60"; +/** 富文本数值高亮色（鲜亮绿色，深色面板上高亮醒目） */ +const RICH_VALUE_COLOR = "#3CE66E"; /** 富文本技能名高亮色（蓝色，与数值绿色区分，标识技能名「」片段） */ const RICH_NAME_COLOR = "#2E86C1"; @@ -100,6 +100,9 @@ const RICH_LOCKED_COLOR = "#95A5A6"; /** 技能名「」匹配模式（仅本模块行首/行中技能名片段使用） */ const SKILL_NAME_PATTERN = /「([^」]*)」/g; +/** 技能等级罗马数字徽章（索引 = 技能等级 1~5），用于技能名后的品质感等级标识 */ +const SKILL_LV_BADGE = ["", "Ⅰ", "Ⅱ", "Ⅲ", "Ⅳ", "Ⅴ"]; + /** "持续X秒"匹配模式（卡片描述后处理：把持续时间数值也高亮） */ const DURATION_PATTERN = /持续(\d+)秒/g; @@ -510,8 +513,8 @@ export function buildEquipRich(fieldUuids: number[], showName: boolean = false): * * 格式： * 「技能名」 Lv.当前技能等级：当前档技能效果 - * 升级提示：Lv.当前 → Lv.下一级：下一级技能效果（金色，仅有更高档时出现） * + * 仅展示当前生效档位，不含升级提示；升级前后对比由升级确认框单独提供。 * 数据源为运行时 HeroAttrsComp（lv 取当前英雄等级），逐触发类型逐技能渲染。 * 技能等级取 LvTriggerEntry.s_lv，未标注时按档位序号（1/2/3...）兜底。 * @@ -555,19 +558,14 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string { const curIdx = activeIdx >= 0 ? activeIdx : 0; const cur = sorted[curIdx]; const curSLv = cur.s_lv ?? (curIdx + 1); - const curTrig = needCount ? `${trigName}×${cur.t_num}` : trigName; - const curHead = `「${skillName}」 Lv.${curSLv}: ${curTrig}，`; + // 触发次数直接写为富文本（数字绿色高亮），如 "受伤3次" + const curTrig = needCount + ? `${trigName}${cur.t_num}次` + : trigName; + // 技能名 + 罗马数字等级徽章（如 "不屈壁垒Ⅰ"），等级徽标随技能名一并蓝色高亮 + const badge = SKILL_LV_BADGE[curSLv] ?? `${curSLv}`; + const curHead = `「${skillName}${badge}」: ${curTrig}，`; lines.push(effectRich(buildEffectLine(curHead, mergeSkillParams(base, cur.overrides)))); - - // 升级提示：存在更高档时，金色预览下一档 - if (curIdx + 1 < sorted.length) { - const next = sorted[curIdx + 1]; - const nextSLv = next.s_lv ?? (curIdx + 2); - const nextTrig = needCount ? `${trigName}×${next.t_num}` : trigName; - const nextLine = buildEffectLine(`${nextTrig}，`, mergeSkillParams(base, next.overrides)); - const nextText = `${nextLine.prefix}${nextLine.value}${nextLine.suffix}`; - lines.push(`升级 Lv.${curSLv}→Lv.${nextSLv}: ${nextText}`); - } } } @@ -600,9 +598,6 @@ function highlightDuration(text: string): string { return text.replace(DURATION_PATTERN, `持续$1秒`); } -/** 富文本升级提示色（金色，标识"升级后"的下一档预览，与未激活灰区分） */ -const RICH_UPGRADE_COLOR = "#E8A33D"; - /** * 结构化行 → 富文本串（技能名蓝色、数值绿色）。 * buildEquipRich / buildCardDescRich / buildSkillDescRich 共用，保证渲染规则唯一。 diff --git a/assets/script/game/map/CHeroComp.ts b/assets/script/game/map/CHeroComp.ts index 084ac6a7..50fae250 100644 --- a/assets/script/game/map/CHeroComp.ts +++ b/assets/script/game/map/CHeroComp.ts @@ -23,6 +23,7 @@ import { CardConfig, CardType } from "../common/config/CardSet"; import { HeroInfo } from "../common/config/heroSet"; import { oops } from "db://oops-framework/core/Oops"; import { GameEvent } from "../common/config/GameEvent"; +import { outlineRich } from "../common/RichOutline"; import { smc } from "../common/SingletonModuleComp"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; const { ccclass, property } = _decorator; @@ -284,9 +285,10 @@ export class CHeroComp extends CCComp { this.updateBgNode(); // 描述富文本：直接取 heroSet 的 info 字段（单条手写文案） + // outlineRich 为整段富文本包裹描边，提升深色面板可读性 if (this.info_rich) { const desc = hero?.info || this.cardData.info || ""; - this.info_rich.string = desc; + this.info_rich.string = outlineRich(desc); this.info_rich.node.active = !!desc; } diff --git a/assets/script/game/map/EquipListComp.ts b/assets/script/game/map/EquipListComp.ts index b8eb35fb..6be32730 100644 --- a/assets/script/game/map/EquipListComp.ts +++ b/assets/script/game/map/EquipListComp.ts @@ -18,6 +18,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { CardConfig } from "../common/config/CardSet"; import { EquipPoolList } from "../common/config/EquipSet"; import { buildEquipRich } from "../common/config/HeroSkillDesc"; +import { outlineRich } from "../common/RichOutline"; import { oops } from "db://oops-framework/core/Oops"; import { getCardIconId, setSpriteFrame } from "../common/CardIconHelper"; import { GameEvent } from "../common/config/GameEvent"; @@ -155,9 +156,10 @@ export class EquipListComp extends CCComp { this.updateBgNode(); // 属性词条富文本（多词条装备由 buildEquipRich 按 \n 多行渲染，数值实时高亮） + // outlineRich 为整段富文本包裹描边，提升深色面板可读性 if (this.info_rich) { const desc = buildEquipRich(this.cardData.field || []); - this.info_rich.string = desc; + this.info_rich.string = outlineRich(desc); this.info_rich.node.active = !!desc; } diff --git a/assets/script/game/map/HeroBoxComp.ts b/assets/script/game/map/HeroBoxComp.ts index 5f9095ab..be354046 100644 --- a/assets/script/game/map/HeroBoxComp.ts +++ b/assets/script/game/map/HeroBoxComp.ts @@ -22,7 +22,7 @@ import { HeroInfo } from "../common/config/heroSet"; import { HeroAttrsComp } from "../hero/HeroAttrsComp"; import { Hero } from "../hero/Hero"; import { FacSet, FightSet, getLvColor, NumberFormatter } from "../common/config/GameSet"; -import { buildSkillDesc, ISkillDescSource } from "../common/config/HeroSkillDesc"; +import { buildSkillDescMoreRich, ISkillDescSource } from "../common/config/HeroSkillDesc"; import { MissionEconomy } from "./MissionEconomy"; import { UIID } from "../common/config/GameUIConfig"; import { HeroMoreCom } from "./HeroMoreCom"; @@ -180,12 +180,12 @@ export class HeroBoxComp extends CCComp { oops.message.dispatchEvent(GameEvent.ShowSmallTip, { type: "buy_coin", text: "金币不足" }); return; } - const preview = this.buildUpgradePreview(nextLv); + const preview = this.buildUpgradePreview(heroLv, nextLv); // oops.gui 公共确认窗口（自定义 CommonPrompt：内容支持富文本高亮） oops.gui.open(UIID.Window, { title: `升级英雄`, - content: `${heroName} Lv.${heroLv} → Lv.${nextLv}\n消耗 ${cost} 金币\n\n升级后获得：\n${preview}`, + content: `${heroName} Lv.${heroLv} → Lv.${nextLv}\n消耗 ${cost} 金币\n\n${preview}`, okWord: "升级", cancelWord: "取消", needCancel: true, @@ -205,28 +205,20 @@ export class HeroBoxComp extends CCComp { } /** - * 构建升级后新能力预览富文本。 - * 数据源取 HeroInfo 静态配置（lv 置为目标等级），由描述标准层统一渲染， - * 与面板技能描述同一套文案规则，杜绝数值漂移。 + * 构建升级前后对比富文本（当前能力 vs 升级后能力）。 + * 数据源取 HeroInfo 静态配置，分别按当前 lv 与 nextLv 渲染同一份技能描述， + * 与英雄信息弹窗（buildSkillDescMoreRich）同一套文案规则，杜绝数值漂移。 * + * @param heroLv 当前英雄等级 * @param nextLv 目标等级 - * @returns 多行富文本：属性成长 + 下一档触发技能/光环/复活/加成 + * @returns 多行富文本：当前属性→升级后属性 + 当前技能 vs 升级后技能 */ - private buildUpgradePreview(nextLv: number): string { + private buildUpgradePreview(heroLv: number, nextLv: number): string { const hero = HeroInfo[this.model?.hero_uuid ?? 0]; if (!hero) return ""; - // ---- 属性成长（按 HERO_LV_MULTIPLIER 幂成长 + 等级额外加成） ---- - const mult = Math.pow(FightSet.HERO_LV_MULTIPLIER, nextLv - 1); - const nextAp = Math.floor(hero.ap * mult + HeroBoxComp.sumBonus(hero.ap_bonus, nextLv)); - const nextHp = Math.floor(hero.hp * mult + HeroBoxComp.sumBonus(hero.hp_bonus, nextLv)); - const lines: string[] = [ - `攻击 ${nextAp}　生命 ${nextHp}` - ]; - - // ---- 新能力（触发技能 / 驻场光环 / 复活 / 额外加成，取目标等级生效档） ---- - const source: ISkillDescSource = { - lv: nextLv, + const buildSource = (lv: number): ISkillDescSource => ({ + lv: lv, call: hero.call, dead: hero.dead, fstart: hero.fstart, @@ -235,11 +227,29 @@ export class HeroBoxComp extends CCComp { atked: hero.atked, field: hero.field, revive: hero.revive, - // 预览仅展示增量，额外加成由上方属性成长体现，避免重复 + }); + + // ---- 属性成长（按 HERO_LV_MULTIPLIER 幂成长 + 等级额外加成） ---- + const attrLine = (lv: number): string => { + const mult = Math.pow(FightSet.HERO_LV_MULTIPLIER, lv - 1); + const ap = Math.floor(hero.ap * mult + HeroBoxComp.sumBonus(hero.ap_bonus, lv)); + const hp = Math.floor(hero.hp * mult + HeroBoxComp.sumBonus(hero.hp_bonus, lv)); + return `攻击 ${ap}　生命 ${hp}`; }; - const skillDesc = buildSkillDesc(source); - if (skillDesc) lines.push(skillDesc); - return lines.join("\n"); + + // ---- 升级前后能力对比（当前 vs 升级后，同一份文案规则按 lv 渲染） ---- + const curDesc = buildSkillDescMoreRich(buildSource(heroLv)); + const nextDesc = buildSkillDescMoreRich(buildSource(nextLv)); + + return [ + `当前 Lv.${heroLv}：`, + attrLine(heroLv), + curDesc, + ``, + `升级后 Lv.${nextLv}：`, + attrLine(nextLv), + nextDesc, + ].filter(s => s !== undefined).join("\n"); } /** 累加等级额外加成（≤目标等级的所有档位） */ diff --git a/assets/script/game/map/ItemListComp.ts b/assets/script/game/map/ItemListComp.ts index b69f7a4c..02332c6d 100644 --- a/assets/script/game/map/ItemListComp.ts +++ b/assets/script/game/map/ItemListComp.ts @@ -20,6 +20,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { CardConfig, CardTriggerType, CKind } from "../common/config/CardSet"; import { EquipPoolList } from "../common/config/EquipSet"; import { buildCardDescRich, buildEquipRich } from "../common/config/HeroSkillDesc"; +import { outlineRich } from "../common/RichOutline"; import { oops } from "db://oops-framework/core/Oops"; import { getCardIconId, setSpriteFrame } from "../common/CardIconHelper"; import { GameEvent } from "../common/config/GameEvent"; @@ -172,7 +173,7 @@ export class ItemListComp extends CCComp { } else { desc = this.cardData.info || ""; } - this.info_rich.string = desc; + this.info_rich.string = outlineRich(desc); this.info_rich.node.active = !!desc; } diff --git a/assets/script/game/map/SCardComp.ts b/assets/script/game/map/SCardComp.ts index 2d4449e0..f6db6cb6 100644 --- a/assets/script/game/map/SCardComp.ts +++ b/assets/script/game/map/SCardComp.ts @@ -18,6 +18,7 @@ import { CardConfig } from "../common/config/CardSet"; import { SkillCardList } from "../common/config/SCardSet"; import { SkillSet } from "../common/config/SkillSet"; import { buildCardDescRich } from "../common/config/HeroSkillDesc"; +import { outlineRich } from "../common/RichOutline"; import { oops } from "db://oops-framework/core/Oops"; import { getCardIconId, setSpriteFrame } from "../common/CardIconHelper"; import { GameEvent } from "../common/config/GameEvent"; @@ -196,9 +197,10 @@ export class SCardComp extends CCComp { this.updateBgNode(); // 描述富文本（数值随 overrides 档位自动同步高亮） + // outlineRich 为整段富文本包裹描边，提升深色面板可读性 if (this.info_rich) { const desc = buildCardDescRich(this.cardData); - this.info_rich.string = desc; + this.info_rich.string = outlineRich(desc); this.info_rich.node.active = !!desc; }