diff --git a/assets/resources/gui/element/cHero.prefab b/assets/resources/gui/element/cHero.prefab
index 2424c865..24cf53fa 100644
--- a/assets/resources/gui/element/cHero.prefab
+++ b/assets/resources/gui/element/cHero.prefab
@@ -34,29 +34,29 @@
"__id__": 131
},
{
- "__id__": 304
+ "__id__": 255
},
{
- "__id__": 336
+ "__id__": 287
},
{
- "__id__": 373
+ "__id__": 324
}
],
"_active": true,
"_components": [
{
- "__id__": 379
+ "__id__": 332
},
{
- "__id__": 381
+ "__id__": 334
},
{
- "__id__": 383
+ "__id__": 336
}
],
"_prefab": {
- "__id__": 477
+ "__id__": 430
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -579,7 +579,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -599,7 +599,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -620,7 +620,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -641,7 +641,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -662,7 +662,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -683,7 +683,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -726,7 +726,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -747,7 +747,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -768,7 +768,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -789,7 +789,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -810,7 +810,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -853,7 +853,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -874,7 +874,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -895,7 +895,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -916,7 +916,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -937,7 +937,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -980,7 +980,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -1001,7 +1001,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -1022,7 +1022,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -1043,7 +1043,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -1064,7 +1064,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -1107,7 +1107,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -1128,7 +1128,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -1149,7 +1149,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -1170,7 +1170,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -1191,7 +1191,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -1234,7 +1234,7 @@
"value": {
"__type__": "cc.Size",
"width": 115,
- "height": 160
+ "height": 185
}
},
{
@@ -1255,7 +1255,7 @@
"value": {
"__type__": "cc.Size",
"width": 214,
- "height": 304
+ "height": 354
}
},
{
@@ -1276,7 +1276,7 @@
"value": {
"__type__": "cc.Size",
"width": 222,
- "height": 312
+ "height": 362
}
},
{
@@ -1297,7 +1297,7 @@
"value": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
}
},
{
@@ -1318,7 +1318,7 @@
"value": {
"__type__": "cc.Vec3",
"x": -49.25,
- "y": 73.75,
+ "y": 86.25,
"z": 0
}
},
@@ -1399,7 +1399,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 132.888,
+ "y": 157.888,
"z": 0
},
"_lrot": {
@@ -1882,7 +1882,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 14.94,
+ "y": 37.982,
"z": 0
},
"_lrot": {
@@ -2061,14 +2061,20 @@
"__id__": 154
},
{
- "__id__": 156
+ "__id__": 155
},
{
- "__id__": 158
+ "__id__": 157
+ },
+ {
+ "__id__": 159
},
{
"__id__": 160
},
+ {
+ "__id__": 161
+ },
{
"__id__": 162
},
@@ -2127,20 +2133,14 @@
"__id__": 198
},
{
- "__id__": 199
+ "__id__": 200
},
{
- "__id__": 201
- },
- {
- "__id__": 203
+ "__id__": 202
},
{
"__id__": 204
},
- {
- "__id__": 205
- },
{
"__id__": 206
},
@@ -2156,154 +2156,76 @@
{
"__id__": 214
},
- {
- "__id__": 215
- },
{
"__id__": 216
},
{
- "__id__": 217
+ "__id__": 218
},
{
- "__id__": 219
+ "__id__": 220
},
{
- "__id__": 221
+ "__id__": 222
},
{
- "__id__": 223
+ "__id__": 224
},
{
- "__id__": 225
+ "__id__": 226
},
{
- "__id__": 227
+ "__id__": 228
},
{
- "__id__": 229
+ "__id__": 230
},
{
- "__id__": 231
+ "__id__": 232
},
{
- "__id__": 233
+ "__id__": 234
},
{
- "__id__": 235
+ "__id__": 236
},
{
- "__id__": 237
+ "__id__": 238
},
{
- "__id__": 239
+ "__id__": 240
},
{
- "__id__": 241
+ "__id__": 242
},
{
- "__id__": 243
+ "__id__": 244
},
{
- "__id__": 245
+ "__id__": 246
},
{
"__id__": 247
},
+ {
+ "__id__": 248
+ },
{
"__id__": 249
},
+ {
+ "__id__": 250
+ },
{
"__id__": 251
},
{
- "__id__": 253
- },
- {
- "__id__": 255
- },
- {
- "__id__": 257
- },
- {
- "__id__": 259
- },
- {
- "__id__": 261
- },
- {
- "__id__": 263
- },
- {
- "__id__": 265
- },
- {
- "__id__": 267
- },
- {
- "__id__": 269
- },
- {
- "__id__": 271
- },
- {
- "__id__": 273
- },
- {
- "__id__": 275
- },
- {
- "__id__": 277
- },
- {
- "__id__": 279
- },
- {
- "__id__": 281
- },
- {
- "__id__": 283
- },
- {
- "__id__": 285
- },
- {
- "__id__": 287
- },
- {
- "__id__": 289
- },
- {
- "__id__": 291
- },
- {
- "__id__": 293
- },
- {
- "__id__": 295
- },
- {
- "__id__": 297
- },
- {
- "__id__": 298
- },
- {
- "__id__": 299
- },
- {
- "__id__": 300
- },
- {
- "__id__": 301
- },
- {
- "__id__": 302
+ "__id__": 252
}
],
"removedComponents": [
{
- "__id__": 303
+ "__id__": 254
}
]
},
@@ -2391,7 +2313,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 68.485,
+ "y": 93.48500000000001,
"z": 0
}
},
@@ -2469,226 +2391,6 @@
"targetInfo": {
"__id__": 149
},
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 90,
- "height": 90
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "44Ed4eH0lI5Kssdq2dPzke"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 151
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 370,
- "height": 370
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "01RZgHEk5DOImBHnPTZbSl"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 153
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 193,
- "height": 193
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "7eXE020LJO2re5wfhWMR+x"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 155
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 370,
- "height": 370
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "cdEeG/ubFJgqKs1MdM6xd9"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 157
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 193,
- "height": 193
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "bdhTW5lJ9PJamgUN/UmnC2"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 159
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 370,
- "height": 370
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "01Tb8sF1pD1K401C16wfxs"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 161
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 193,
- "height": 193
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "31upVgp9hMgqBxdoieIwVm"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 163
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 370,
- "height": 370
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c82typVIdBJJabkX/s0ZkZ"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 165
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 193,
- "height": 193
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "ce0/u2yctKCZkL+Ru0cbmo"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 167
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 370,
- "height": 370
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "68Zpxa86JHMbiKqxEUYo0V"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 169
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 193,
- "height": 193
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "4cdo17U+VOh4SgXfb/+Gk7"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 171
- },
"propertyPath": [
"_active"
],
@@ -2703,7 +2405,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 173
+ "__id__": 151
},
"propertyPath": [
"_contentSize"
@@ -2723,7 +2425,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 175
+ "__id__": 153
},
"propertyPath": [
"_active"
@@ -2739,193 +2441,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 177
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c8GUMPCaFLxq7iBjkJgK3j"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 179
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "f815Ec4HdHl7lhEUTBr/l3"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 181
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "51ns/anqVO87NRv6DMzJKj"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 183
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "d3r4ZGziNEz77IzWW7ndja"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 185
- },
- "propertyPath": [
- "_active"
- ],
- "value": true
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "93fFoXu3BBYqu4RLG2YPon"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 187
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c8GUMPCaFLxq7iBjkJgK3j"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 189
- },
- "propertyPath": [
- "_top"
- ],
- "value": 0
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "baf1d9tPZAd4fOS6WGAm8G"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 191
- },
- "propertyPath": [
- "_bottom"
- ],
- "value": 0
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "baf1d9tPZAd4fOS6WGAm8G"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 193
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c8niXKCPZJkZO13m9+xJNN"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 195
- },
- "propertyPath": [
- "_top"
- ],
- "value": 0
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "18zuChgCtJMJcsGZMZXNa3"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 197
- },
- "propertyPath": [
- "_bottom"
- ],
- "value": 0
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "18zuChgCtJMJcsGZMZXNa3"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 175
+ "__id__": 153
},
"propertyPath": [
"_lscale"
@@ -2940,7 +2456,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 200
+ "__id__": 156
},
"propertyPath": [
"_lscale"
@@ -2961,7 +2477,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 202
+ "__id__": 158
},
"propertyPath": [
"_spriteFrame"
@@ -2980,7 +2496,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 202
+ "__id__": 158
},
"propertyPath": [
"_atlas"
@@ -2993,7 +2509,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 202
+ "__id__": 158
},
"propertyPath": [
"_type"
@@ -3003,7 +2519,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 202
+ "__id__": 158
},
"propertyPath": [
"_sizeMode"
@@ -3013,7 +2529,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 207
+ "__id__": 163
},
"propertyPath": [
"_contentSize"
@@ -3033,29 +2549,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 209
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 134,
- "g": 106,
- "b": 33,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "9aNUtJ9bNDS621z3LovfsY"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 211
+ "__id__": 165
},
"propertyPath": [
"_color"
@@ -3077,59 +2571,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 213
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "74QdiEVndDl5Vqf5Hjj8qY"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 213
- },
- "propertyPath": [
- "_useGrayscale"
- ],
- "value": true
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 209
- },
- "propertyPath": [
- "_useGrayscale"
- ],
- "value": true
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 193
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 218
+ "__id__": 167
},
"propertyPath": [
"_active"
@@ -3145,7 +2587,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 220
+ "__id__": 169
},
"propertyPath": [
"_contentSize"
@@ -3165,7 +2607,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 222
+ "__id__": 171
},
"propertyPath": [
"_contentSize"
@@ -3186,7 +2628,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 224
+ "__id__": 173
},
"propertyPath": [
"_contentSize"
@@ -3207,7 +2649,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 226
+ "__id__": 175
},
"propertyPath": [
"_contentSize"
@@ -3228,7 +2670,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 228
+ "__id__": 177
},
"propertyPath": [
"_contentSize"
@@ -3249,7 +2691,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 230
+ "__id__": 179
},
"propertyPath": [
"_lpos"
@@ -3271,7 +2713,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 232
+ "__id__": 181
},
"propertyPath": [
"_contentSize"
@@ -3292,7 +2734,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 234
+ "__id__": 183
},
"propertyPath": [
"_contentSize"
@@ -3313,7 +2755,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 236
+ "__id__": 185
},
"propertyPath": [
"_contentSize"
@@ -3334,7 +2776,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 238
+ "__id__": 187
},
"propertyPath": [
"_contentSize"
@@ -3355,7 +2797,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 240
+ "__id__": 189
},
"propertyPath": [
"_contentSize"
@@ -3376,7 +2818,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 242
+ "__id__": 191
},
"propertyPath": [
"_lpos"
@@ -3398,7 +2840,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 244
+ "__id__": 193
},
"propertyPath": [
"_contentSize"
@@ -3419,7 +2861,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 246
+ "__id__": 195
},
"propertyPath": [
"_contentSize"
@@ -3440,7 +2882,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 248
+ "__id__": 197
},
"propertyPath": [
"_contentSize"
@@ -3461,7 +2903,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 250
+ "__id__": 199
},
"propertyPath": [
"_contentSize"
@@ -3482,7 +2924,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 252
+ "__id__": 201
},
"propertyPath": [
"_contentSize"
@@ -3503,7 +2945,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 254
+ "__id__": 203
},
"propertyPath": [
"_lpos"
@@ -3525,7 +2967,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 256
+ "__id__": 205
},
"propertyPath": [
"_contentSize"
@@ -3546,7 +2988,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 258
+ "__id__": 207
},
"propertyPath": [
"_contentSize"
@@ -3567,7 +3009,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 260
+ "__id__": 209
},
"propertyPath": [
"_contentSize"
@@ -3588,7 +3030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 262
+ "__id__": 211
},
"propertyPath": [
"_contentSize"
@@ -3609,7 +3051,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 264
+ "__id__": 213
},
"propertyPath": [
"_contentSize"
@@ -3630,7 +3072,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 266
+ "__id__": 215
},
"propertyPath": [
"_lpos"
@@ -3652,7 +3094,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 268
+ "__id__": 217
},
"propertyPath": [
"_contentSize"
@@ -3673,7 +3115,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 270
+ "__id__": 219
},
"propertyPath": [
"_contentSize"
@@ -3694,7 +3136,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 272
+ "__id__": 221
},
"propertyPath": [
"_contentSize"
@@ -3715,7 +3157,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 274
+ "__id__": 223
},
"propertyPath": [
"_contentSize"
@@ -3736,7 +3178,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 276
+ "__id__": 225
},
"propertyPath": [
"_contentSize"
@@ -3757,7 +3199,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 278
+ "__id__": 227
},
"propertyPath": [
"_lpos"
@@ -3779,7 +3221,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 280
+ "__id__": 229
},
"propertyPath": [
"_contentSize"
@@ -3800,7 +3242,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 282
+ "__id__": 231
},
"propertyPath": [
"_contentSize"
@@ -3821,7 +3263,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 284
+ "__id__": 233
},
"propertyPath": [
"_contentSize"
@@ -3842,7 +3284,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 286
+ "__id__": 235
},
"propertyPath": [
"_contentSize"
@@ -3863,7 +3305,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 288
+ "__id__": 237
},
"propertyPath": [
"_contentSize"
@@ -3884,7 +3326,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 290
+ "__id__": 239
},
"propertyPath": [
"_lpos"
@@ -3906,7 +3348,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 292
+ "__id__": 241
},
"propertyPath": [
"_contentSize"
@@ -3927,7 +3369,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 294
+ "__id__": 243
},
"propertyPath": [
"_enabled"
@@ -3943,7 +3385,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 296
+ "__id__": 245
},
"propertyPath": [
"_enabled"
@@ -3959,7 +3401,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 296
+ "__id__": 245
},
"propertyPath": [
"_left"
@@ -3969,7 +3411,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 296
+ "__id__": 245
},
"propertyPath": [
"_right"
@@ -3979,7 +3421,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 296
+ "__id__": 245
},
"propertyPath": [
"_top"
@@ -3989,7 +3431,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 296
+ "__id__": 245
},
"propertyPath": [
"_bottom"
@@ -3999,7 +3441,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 200
+ "__id__": 156
},
"propertyPath": [
"_active"
@@ -4009,7 +3451,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 200
+ "__id__": 156
},
"propertyPath": [
"_lpos"
@@ -4021,6 +3463,23 @@
"z": 0
}
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 253
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "b1bEsIBt1AZLNajVhhTZVj",
+ "c8niXKCPZJkZO13m9+xJNN"
+ ]
+ },
{
"__type__": "cc.TargetInfo",
"localID": [
@@ -4037,29 +3496,29 @@
},
"_children": [
{
- "__id__": 305
+ "__id__": 256
},
{
- "__id__": 313
+ "__id__": 264
},
{
- "__id__": 321
+ "__id__": 272
}
],
"_active": false,
"_components": [
{
- "__id__": 329
+ "__id__": 280
},
{
- "__id__": 331
+ "__id__": 282
},
{
- "__id__": 333
+ "__id__": 284
}
],
"_prefab": {
- "__id__": 335
+ "__id__": 286
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -4096,23 +3555,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 304
+ "__id__": 255
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 306
+ "__id__": 257
},
{
- "__id__": 308
+ "__id__": 259
},
{
- "__id__": 310
+ "__id__": 261
}
],
"_prefab": {
- "__id__": 312
+ "__id__": 263
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -4149,11 +3608,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 305
+ "__id__": 256
},
"_enabled": true,
"__prefab": {
- "__id__": 307
+ "__id__": 258
},
"_contentSize": {
"__type__": "cc.Size",
@@ -4177,11 +3636,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 305
+ "__id__": 256
},
"_enabled": true,
"__prefab": {
- "__id__": 309
+ "__id__": 260
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -4245,11 +3704,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 305
+ "__id__": 256
},
"_enabled": true,
"__prefab": {
- "__id__": 311
+ "__id__": 262
},
"_alignFlags": 40,
"_target": null,
@@ -4294,23 +3753,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 304
+ "__id__": 255
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 314
+ "__id__": 265
},
{
- "__id__": 316
+ "__id__": 267
},
{
- "__id__": 318
+ "__id__": 269
}
],
"_prefab": {
- "__id__": 320
+ "__id__": 271
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -4347,11 +3806,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 313
+ "__id__": 264
},
"_enabled": true,
"__prefab": {
- "__id__": 315
+ "__id__": 266
},
"_contentSize": {
"__type__": "cc.Size",
@@ -4375,11 +3834,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 313
+ "__id__": 264
},
"_enabled": true,
"__prefab": {
- "__id__": 317
+ "__id__": 268
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -4443,11 +3902,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 313
+ "__id__": 264
},
"_enabled": true,
"__prefab": {
- "__id__": 319
+ "__id__": 270
},
"_alignFlags": 40,
"_target": null,
@@ -4492,23 +3951,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 304
+ "__id__": 255
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 322
+ "__id__": 273
},
{
- "__id__": 324
+ "__id__": 275
},
{
- "__id__": 326
+ "__id__": 277
}
],
"_prefab": {
- "__id__": 328
+ "__id__": 279
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -4545,11 +4004,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 321
+ "__id__": 272
},
"_enabled": true,
"__prefab": {
- "__id__": 323
+ "__id__": 274
},
"_contentSize": {
"__type__": "cc.Size",
@@ -4573,11 +4032,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 321
+ "__id__": 272
},
"_enabled": true,
"__prefab": {
- "__id__": 325
+ "__id__": 276
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -4641,11 +4100,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 321
+ "__id__": 272
},
"_enabled": true,
"__prefab": {
- "__id__": 327
+ "__id__": 278
},
"_alignFlags": 40,
"_target": null,
@@ -4690,11 +4149,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 304
+ "__id__": 255
},
"_enabled": true,
"__prefab": {
- "__id__": 330
+ "__id__": 281
},
"_contentSize": {
"__type__": "cc.Size",
@@ -4718,11 +4177,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 304
+ "__id__": 255
},
"_enabled": true,
"__prefab": {
- "__id__": 332
+ "__id__": 283
},
"_alignFlags": 45,
"_target": null,
@@ -4754,11 +4213,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 304
+ "__id__": 255
},
"_enabled": true,
"__prefab": {
- "__id__": 334
+ "__id__": 285
},
"_resizeMode": 1,
"_layoutType": 2,
@@ -4806,14 +4265,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 337
+ "__id__": 288
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 336
+ "__id__": 287
},
"asset": {
"__uuid__": "506d0f89-1cf1-4c3b-be47-a3abaf3695e8",
@@ -4821,7 +4280,7 @@
},
"fileId": "60RuUkpjBAGoLk3z4xlHcF",
"instance": {
- "__id__": 338
+ "__id__": 289
},
"targetOverrides": null
},
@@ -4834,63 +4293,63 @@
"mountedChildren": [],
"mountedComponents": [
{
- "__id__": 339
+ "__id__": 290
}
],
"propertyOverrides": [
{
- "__id__": 343
+ "__id__": 294
},
{
- "__id__": 345
+ "__id__": 296
},
{
- "__id__": 346
+ "__id__": 297
},
{
- "__id__": 347
+ "__id__": 298
},
{
- "__id__": 348
+ "__id__": 299
},
{
- "__id__": 350
+ "__id__": 301
},
{
- "__id__": 352
+ "__id__": 303
},
{
- "__id__": 354
+ "__id__": 305
},
{
- "__id__": 356
+ "__id__": 307
},
{
- "__id__": 358
+ "__id__": 309
},
{
- "__id__": 360
+ "__id__": 311
},
{
- "__id__": 361
+ "__id__": 312
},
{
- "__id__": 363
+ "__id__": 314
},
{
- "__id__": 365
+ "__id__": 316
},
{
- "__id__": 367
+ "__id__": 318
},
{
- "__id__": 369
+ "__id__": 320
},
{
- "__id__": 370
+ "__id__": 321
},
{
- "__id__": 371
+ "__id__": 322
}
],
"removedComponents": []
@@ -4898,11 +4357,11 @@
{
"__type__": "cc.MountedComponentsInfo",
"targetInfo": {
- "__id__": 340
+ "__id__": 291
},
"components": [
{
- "__id__": 341
+ "__id__": 292
}
]
},
@@ -4918,15 +4377,15 @@
"_objFlags": 0,
"__editorExtras__": {
"mountedRoot": {
- "__id__": 336
+ "__id__": 287
}
},
"node": {
- "__id__": 336
+ "__id__": 287
},
"_enabled": true,
"__prefab": {
- "__id__": 342
+ "__id__": 293
},
"_alignFlags": 4,
"_target": null,
@@ -4955,7 +4414,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 344
+ "__id__": 295
},
"propertyPath": [
"_name"
@@ -4971,7 +4430,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 344
+ "__id__": 295
},
"propertyPath": [
"_lpos"
@@ -4979,14 +4438,14 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -122,
+ "y": -147,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 344
+ "__id__": 295
},
"propertyPath": [
"_lrot"
@@ -5002,7 +4461,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 344
+ "__id__": 295
},
"propertyPath": [
"_euler"
@@ -5017,7 +4476,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 349
+ "__id__": 300
},
"propertyPath": [
"_contentSize"
@@ -5037,7 +4496,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 351
+ "__id__": 302
},
"propertyPath": [
"_contentSize"
@@ -5057,7 +4516,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 353
+ "__id__": 304
},
"propertyPath": [
"_contentSize"
@@ -5077,7 +4536,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 355
+ "__id__": 306
},
"propertyPath": [
"_lpos"
@@ -5098,7 +4557,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 357
+ "__id__": 308
},
"propertyPath": [
"_contentSize"
@@ -5118,7 +4577,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 359
+ "__id__": 310
},
"propertyPath": [
"_top"
@@ -5134,7 +4593,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 359
+ "__id__": 310
},
"propertyPath": [
"_bottom"
@@ -5144,7 +4603,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 362
+ "__id__": 313
},
"propertyPath": [
"_active"
@@ -5160,7 +4619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 364
+ "__id__": 315
},
"propertyPath": [
"_lpos"
@@ -5181,7 +4640,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 366
+ "__id__": 317
},
"propertyPath": [
"_color"
@@ -5203,7 +4662,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 368
+ "__id__": 319
},
"propertyPath": [
"_color"
@@ -5225,7 +4684,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 364
+ "__id__": 315
},
"propertyPath": [
"_active"
@@ -5235,7 +4694,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 362
+ "__id__": 313
},
"propertyPath": [
"_lpos"
@@ -5250,7 +4709,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 372
+ "__id__": 323
},
"propertyPath": [
"_string"
@@ -5275,19 +4734,22 @@
"_active": true,
"_components": [
{
- "__id__": 374
+ "__id__": 325
},
{
- "__id__": 376
+ "__id__": 327
+ },
+ {
+ "__id__": 329
}
],
"_prefab": {
- "__id__": 378
+ "__id__": 331
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -21.415,
+ "y": -44.99999999999999,
"z": 0
},
"_lrot": {
@@ -5319,15 +4781,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 373
+ "__id__": 324
},
"_enabled": true,
"__prefab": {
- "__id__": 375
+ "__id__": 326
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 190,
+ "width": 200,
"height": 25.2
},
"_anchorPoint": {
@@ -5347,17 +4809,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 373
+ "__id__": 324
},
"_enabled": true,
"__prefab": {
- "__id__": 377
+ "__id__": 328
},
"_lineHeight": 20,
"_string": "RichText",
"_horizontalAlign": 0,
"_verticalAlign": 0,
- "_fontSize": 18,
+ "_fontSize": 17,
"_fontColor": {
"__type__": "cc.Color",
"r": 255,
@@ -5365,7 +4827,7 @@
"b": 255,
"a": 255
},
- "_maxWidth": 190,
+ "_maxWidth": 200,
"_fontFamily": "Arial",
"_font": null,
"_isSystemFontUsed": true,
@@ -5379,6 +4841,42 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "94G83rsRxKLqWHFK2KnEEG"
},
+ {
+ "__type__": "cc.Widget",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 324
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 330
+ },
+ "_alignFlags": 4,
+ "_target": null,
+ "_left": 0,
+ "_right": 0,
+ "_top": 0,
+ "_bottom": 127.4,
+ "_horizontalCenter": 0,
+ "_verticalCenter": 0,
+ "_isAbsLeft": true,
+ "_isAbsRight": true,
+ "_isAbsTop": true,
+ "_isAbsBottom": true,
+ "_isAbsHorizontalCenter": true,
+ "_isAbsVerticalCenter": true,
+ "_originalWidth": 0,
+ "_originalHeight": 0,
+ "_alignMode": 2,
+ "_lockFlags": 0,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d2Dg4IKW9Piplf/xBdNvYL"
+ },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -5402,12 +4900,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 380
+ "__id__": 333
},
"_contentSize": {
"__type__": "cc.Size",
"width": 230,
- "height": 320
+ "height": 370
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -5430,7 +4928,7 @@
},
"_enabled": false,
"__prefab": {
- "__id__": 382
+ "__id__": 335
},
"_alignFlags": 0,
"_target": null,
@@ -5466,10 +4964,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 384
+ "__id__": 337
},
"icon_node": {
- "__id__": 385
+ "__id__": 338
},
"bg_node": {
"__id__": 21
@@ -5478,25 +4976,25 @@
"__id__": 109
},
"fied1": {
- "__id__": 308
+ "__id__": 259
},
"fied2": {
- "__id__": 316
+ "__id__": 267
},
"fied3": {
- "__id__": 324
+ "__id__": 275
},
"info_rich": {
- "__id__": 376
+ "__id__": 327
},
"level_label": {
"__id__": 115
},
"buy_node": {
- "__id__": 336
+ "__id__": 287
},
"cost_label": {
- "__id__": 427
+ "__id__": 380
},
"_id": ""
},
@@ -5510,23 +5008,23 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 386
+ "__id__": 339
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 420
+ "__id__": 373
},
{
- "__id__": 422
+ "__id__": 375
},
{
- "__id__": 424
+ "__id__": 377
}
],
"_prefab": {
- "__id__": 426
+ "__id__": 379
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5567,38 +5065,38 @@
},
"_children": [
{
- "__id__": 387
+ "__id__": 340
},
{
- "__id__": 385
+ "__id__": 338
},
{
- "__id__": 393
+ "__id__": 346
},
{
- "__id__": 399
+ "__id__": 352
},
{
- "__id__": 405
+ "__id__": 358
}
],
"_active": true,
"_components": [
{
- "__id__": 411
+ "__id__": 364
},
{
- "__id__": 413
+ "__id__": 366
},
{
- "__id__": 415
+ "__id__": 368
},
{
- "__id__": 417
+ "__id__": 370
}
],
"_prefab": {
- "__id__": 419
+ "__id__": 372
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5635,20 +5133,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 386
+ "__id__": 339
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 388
+ "__id__": 341
},
{
- "__id__": 390
+ "__id__": 343
}
],
"_prefab": {
- "__id__": 392
+ "__id__": 345
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5685,11 +5183,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 387
+ "__id__": 340
},
"_enabled": true,
"__prefab": {
- "__id__": 389
+ "__id__": 342
},
"_contentSize": {
"__type__": "cc.Size",
@@ -5713,11 +5211,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 387
+ "__id__": 340
},
"_enabled": true,
"__prefab": {
- "__id__": 391
+ "__id__": 344
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -5771,20 +5269,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 386
+ "__id__": 339
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 394
+ "__id__": 347
},
{
- "__id__": 396
+ "__id__": 349
}
],
"_prefab": {
- "__id__": 398
+ "__id__": 351
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5821,11 +5319,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 393
+ "__id__": 346
},
"_enabled": true,
"__prefab": {
- "__id__": 395
+ "__id__": 348
},
"_contentSize": {
"__type__": "cc.Size",
@@ -5849,11 +5347,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 393
+ "__id__": 346
},
"_enabled": true,
"__prefab": {
- "__id__": 397
+ "__id__": 350
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -5907,20 +5405,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 386
+ "__id__": 339
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 400
+ "__id__": 353
},
{
- "__id__": 402
+ "__id__": 355
}
],
"_prefab": {
- "__id__": 404
+ "__id__": 357
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -5957,11 +5455,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 399
+ "__id__": 352
},
"_enabled": true,
"__prefab": {
- "__id__": 401
+ "__id__": 354
},
"_contentSize": {
"__type__": "cc.Size",
@@ -5985,11 +5483,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 399
+ "__id__": 352
},
"_enabled": true,
"__prefab": {
- "__id__": 403
+ "__id__": 356
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6043,20 +5541,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 386
+ "__id__": 339
},
"_children": [],
"_active": false,
"_components": [
{
- "__id__": 406
+ "__id__": 359
},
{
- "__id__": 408
+ "__id__": 361
}
],
"_prefab": {
- "__id__": 410
+ "__id__": 363
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6093,11 +5591,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 405
+ "__id__": 358
},
"_enabled": true,
"__prefab": {
- "__id__": 407
+ "__id__": 360
},
"_contentSize": {
"__type__": "cc.Size",
@@ -6121,11 +5619,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 405
+ "__id__": 358
},
"_enabled": true,
"__prefab": {
- "__id__": 409
+ "__id__": 362
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6179,11 +5677,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 386
+ "__id__": 339
},
"_enabled": true,
"__prefab": {
- "__id__": 412
+ "__id__": 365
},
"_contentSize": {
"__type__": "cc.Size",
@@ -6207,11 +5705,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 386
+ "__id__": 339
},
"_enabled": false,
"__prefab": {
- "__id__": 414
+ "__id__": 367
},
"_type": 0,
"_inverted": false,
@@ -6229,11 +5727,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 386
+ "__id__": 339
},
"_enabled": true,
"__prefab": {
- "__id__": 416
+ "__id__": 369
},
"_alignFlags": 45,
"_target": null,
@@ -6265,11 +5763,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 386
+ "__id__": 339
},
- "_enabled": false,
+ "_enabled": true,
"__prefab": {
- "__id__": 418
+ "__id__": 371
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6324,11 +5822,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 385
+ "__id__": 338
},
"_enabled": true,
"__prefab": {
- "__id__": 421
+ "__id__": 374
},
"_contentSize": {
"__type__": "cc.Size",
@@ -6352,11 +5850,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 385
+ "__id__": 338
},
"_enabled": true,
"__prefab": {
- "__id__": 423
+ "__id__": 376
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6400,11 +5898,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 385
+ "__id__": 338
},
"_enabled": false,
"__prefab": {
- "__id__": 425
+ "__id__": 378
},
"_alignFlags": 45,
"_target": null,
@@ -6449,11 +5947,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 428
+ "__id__": 381
},
"_enabled": true,
"__prefab": {
- "__id__": 476
+ "__id__": 429
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6513,20 +6011,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 429
+ "__id__": 382
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 473
+ "__id__": 426
},
{
- "__id__": 427
+ "__id__": 380
}
],
"_prefab": {
- "__id__": 475
+ "__id__": 428
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6565,27 +6063,27 @@
"mountedRoot": null
},
"_parent": {
- "__id__": 430
+ "__id__": 383
},
"_children": [
{
- "__id__": 462
+ "__id__": 415
},
{
- "__id__": 428
+ "__id__": 381
}
],
"_active": false,
"_components": [
{
- "__id__": 468
+ "__id__": 421
},
{
- "__id__": 470
+ "__id__": 423
}
],
"_prefab": {
- "__id__": 472
+ "__id__": 425
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6622,33 +6120,33 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 336
+ "__id__": 287
},
"_children": [
{
- "__id__": 431
+ "__id__": 384
},
{
- "__id__": 429
+ "__id__": 382
},
{
- "__id__": 437
+ "__id__": 390
}
],
"_active": true,
"_components": [
{
- "__id__": 455
+ "__id__": 408
},
{
- "__id__": 457
+ "__id__": 410
},
{
- "__id__": 459
+ "__id__": 412
}
],
"_prefab": {
- "__id__": 461
+ "__id__": 414
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6687,20 +6185,20 @@
"mountedRoot": null
},
"_parent": {
- "__id__": 430
+ "__id__": 383
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 432
+ "__id__": 385
},
{
- "__id__": 434
+ "__id__": 387
}
],
"_prefab": {
- "__id__": 436
+ "__id__": 389
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6737,11 +6235,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 431
+ "__id__": 384
},
"_enabled": true,
"__prefab": {
- "__id__": 433
+ "__id__": 386
},
"_contentSize": {
"__type__": "cc.Size",
@@ -6765,11 +6263,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 431
+ "__id__": 384
},
"_enabled": true,
"__prefab": {
- "__id__": 435
+ "__id__": 388
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -6848,27 +6346,27 @@
"mountedRoot": null
},
"_parent": {
- "__id__": 430
+ "__id__": 383
},
"_children": [
{
- "__id__": 438
+ "__id__": 391
},
{
- "__id__": 444
+ "__id__": 397
}
],
"_active": false,
"_components": [
{
- "__id__": 450
+ "__id__": 403
},
{
- "__id__": 452
+ "__id__": 405
}
],
"_prefab": {
- "__id__": 454
+ "__id__": 407
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6905,20 +6403,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 437
+ "__id__": 390
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 439
+ "__id__": 392
},
{
- "__id__": 441
+ "__id__": 394
}
],
"_prefab": {
- "__id__": 443
+ "__id__": 396
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -6955,11 +6453,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 438
+ "__id__": 391
},
"_enabled": true,
"__prefab": {
- "__id__": 440
+ "__id__": 393
},
"_contentSize": {
"__type__": "cc.Size",
@@ -6983,11 +6481,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 438
+ "__id__": 391
},
"_enabled": true,
"__prefab": {
- "__id__": 442
+ "__id__": 395
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7044,20 +6542,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 437
+ "__id__": 390
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 445
+ "__id__": 398
},
{
- "__id__": 447
+ "__id__": 400
}
],
"_prefab": {
- "__id__": 449
+ "__id__": 402
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7094,11 +6592,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 444
+ "__id__": 397
},
"_enabled": true,
"__prefab": {
- "__id__": 446
+ "__id__": 399
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7122,11 +6620,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 444
+ "__id__": 397
},
"_enabled": true,
"__prefab": {
- "__id__": 448
+ "__id__": 401
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7203,11 +6701,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 437
+ "__id__": 390
},
"_enabled": true,
"__prefab": {
- "__id__": 451
+ "__id__": 404
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7231,11 +6729,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 437
+ "__id__": 390
},
"_enabled": true,
"__prefab": {
- "__id__": 453
+ "__id__": 406
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -7282,11 +6780,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 430
+ "__id__": 383
},
"_enabled": true,
"__prefab": {
- "__id__": 456
+ "__id__": 409
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7310,11 +6808,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 430
+ "__id__": 383
},
"_enabled": true,
"__prefab": {
- "__id__": 458
+ "__id__": 411
},
"_alignFlags": 45,
"_target": null,
@@ -7346,11 +6844,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 430
+ "__id__": 383
},
"_enabled": true,
"__prefab": {
- "__id__": 460
+ "__id__": 413
},
"_resizeMode": 1,
"_layoutType": 2,
@@ -7397,20 +6895,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 429
+ "__id__": 382
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 463
+ "__id__": 416
},
{
- "__id__": 465
+ "__id__": 418
}
],
"_prefab": {
- "__id__": 467
+ "__id__": 420
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -7447,11 +6945,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 462
+ "__id__": 415
},
"_enabled": true,
"__prefab": {
- "__id__": 464
+ "__id__": 417
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7475,11 +6973,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 462
+ "__id__": 415
},
"_enabled": true,
"__prefab": {
- "__id__": 466
+ "__id__": 419
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -7533,11 +7031,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 429
+ "__id__": 382
},
"_enabled": true,
"__prefab": {
- "__id__": 469
+ "__id__": 422
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7561,11 +7059,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 429
+ "__id__": 382
},
"_enabled": true,
"__prefab": {
- "__id__": 471
+ "__id__": 424
},
"_resizeMode": 1,
"_layoutType": 1,
@@ -7612,11 +7110,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 428
+ "__id__": 381
},
"_enabled": true,
"__prefab": {
- "__id__": 474
+ "__id__": 427
},
"_contentSize": {
"__type__": "cc.Size",
@@ -7663,18 +7161,18 @@
"instance": null,
"targetOverrides": [
{
- "__id__": 478
+ "__id__": 431
},
{
- "__id__": 480
+ "__id__": 433
},
{
- "__id__": 482
+ "__id__": 435
}
],
"nestedPrefabInstanceRoots": [
{
- "__id__": 336
+ "__id__": 287
},
{
"__id__": 131
@@ -7690,7 +7188,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 383
+ "__id__": 336
},
"sourceInfo": null,
"propertyPath": [
@@ -7700,7 +7198,7 @@
"__id__": 131
},
"targetInfo": {
- "__id__": 479
+ "__id__": 432
}
},
{
@@ -7712,17 +7210,17 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 383
+ "__id__": 336
},
"sourceInfo": null,
"propertyPath": [
"cost_label"
],
"target": {
- "__id__": 336
+ "__id__": 287
},
"targetInfo": {
- "__id__": 481
+ "__id__": 434
}
},
{
@@ -7734,15 +7232,15 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
- "__id__": 341
+ "__id__": 292
},
"sourceInfo": null,
"propertyPath": [],
"target": {
- "__id__": 336
+ "__id__": 287
},
"targetInfo": {
- "__id__": 483
+ "__id__": 436
}
},
{
diff --git a/assets/script/game/common/config/HeroSkillDesc.ts b/assets/script/game/common/config/HeroSkillDesc.ts
index 308423bc..e7952019 100644
--- a/assets/script/game/common/config/HeroSkillDesc.ts
+++ b/assets/script/game/common/config/HeroSkillDesc.ts
@@ -579,11 +579,11 @@ export function buildSkillDescMoreRich(source: ISkillDescSource): string {
}
}
- // 复活(revive)
+ // 重生(revive):每回合拥有 N 次重生机会,死亡后以 X% 血量原地重生
const revive = resolveReviveByLv(source[SkillTriggerType.Revive] as LvReviveEntry[] | undefined, lv);
if (revive) {
const reviveName = getTriggerSkillName(SkillTriggerType.Revive, revive.s_uuid);
- lines.push(`「${reviveName}」: 死亡后以${Math.round(revive.upr * 100)}%血量复活${revive.r_num}次`);
+ lines.push(`「${reviveName}」: 每回合拥有${revive.r_num}次重生机会,死亡后以${Math.round(revive.upr * 100)}%血量原地重生`);
}
return lines.join("\n");
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 8db8069c..febd8869 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -654,7 +654,7 @@ export const HeroInfo: Record = {
{ lv: 3, s_uuid: 6501, r_num: 1, upr: 0.6 },
{ lv: 5, s_uuid: 6501, r_num: 1, upr: 0.7 },
],
- info: "✧死亡全队攻血提升\n✦死亡后原地复活",
+ info: "✧死亡全队攻血提升\n✦死亡后原地重生",
},
5043: {
uuid: 5043, name: "亡魂刺客", path: "hc1", fac: FacSet.HERO, card_lv: 3, lv: 1, type: HType.Melee, hp: 900, ap: 85,
@@ -717,7 +717,7 @@ export const HeroInfo: Record = {
{ lv: 1, s_uuid: 6501, r_num: 1, upr: 0.5 },
{ lv: 3, s_uuid: 6501, r_num: 1, upr: 0.6 },
],
- info: "✧死亡全队加护盾\n✧复活1:50%血量",
+ info: "✧死亡全队加护盾\n✧重生:每回合可重生1次,恢复50%血量",
},
// ========== fstart 类(法师 · 战前增益) ==========
@@ -734,7 +734,7 @@ export const HeroInfo: Record = {
],
},
hp_bonus: [{ lv: 2, value: 80 }, { lv: 4, value: 80 }],
- info: "✧开局全队提升攻击",
+ info: "✧回合开始全队提升攻击",
},
5052: {
uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
@@ -751,7 +751,7 @@ export const HeroInfo: Record = {
],
},
hp_bonus: [{ lv: 3, value: 80 }],
- info: "✧开局全队获得护盾",
+ info: "✧回合开始全队获得护盾",
},
// 5052: {
// uuid: 5052, name: "护盾牧师", path: "hm2", fac: FacSet.HERO, card_lv: 2, lv: 1, type: HType.Long, hp: 287, ap: 80,
diff --git a/assets/script/game/map/CHeroComp.ts b/assets/script/game/map/CHeroComp.ts
index 50fae250..3e3e668f 100644
--- a/assets/script/game/map/CHeroComp.ts
+++ b/assets/script/game/map/CHeroComp.ts
@@ -21,6 +21,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec
import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
import { CardConfig, CardType } from "../common/config/CardSet";
import { HeroInfo } from "../common/config/heroSet";
+import { buildSkillDescMoreRich, ISkillDescSource } from "../common/config/HeroSkillDesc";
import { oops } from "db://oops-framework/core/Oops";
import { GameEvent } from "../common/config/GameEvent";
import { outlineRich } from "../common/RichOutline";
@@ -284,10 +285,11 @@ export class CHeroComp extends CCComp {
// 背景:按 card_lv 激活对应颜色子节点(1→green 2→blue 3→purple 4→red 5→yellow)
this.updateBgNode();
- // 描述富文本:直接取 heroSet 的 info 字段(单条手写文案)
+ // 描述富文本:不再单独手写 info,统一套用英雄 1 级能力介绍(buildSkillDescMoreRich)
+ // 与英雄信息弹窗/升级确认框同一套文案规则,杜绝手写文案与数值漂移
// outlineRich 为整段富文本包裹描边,提升深色面板可读性
if (this.info_rich) {
- const desc = hero?.info || this.cardData.info || "";
+ const desc = hero ? buildSkillDescMoreRich(this.buildHeroDescSource(hero)) : (this.cardData.info || "");
this.info_rich.string = outlineRich(desc);
this.info_rich.node.active = !!desc;
}
@@ -464,6 +466,26 @@ export class CHeroComp extends CCComp {
return model.hero_uuid ?? null;
}
+ /**
+ * 构造英雄 1 级能力描述数据源(ISkillDescSource)。
+ * lv 恒为 1,由各 resolver 取 1 级生效档,与英雄信息弹窗初始展示口径一致。
+ * @param hero HeroInfo 静态配置项
+ * @returns 描述数据源
+ */
+ private buildHeroDescSource(hero: typeof HeroInfo[number]): ISkillDescSource {
+ return {
+ lv: 1,
+ call: hero.call,
+ dead: hero.dead,
+ fstart: hero.fstart,
+ fend: hero.fend,
+ atking: hero.atking,
+ atked: hero.atked,
+ field: hero.field,
+ revive: hero.revive,
+ };
+ }
+
/**
* 为英雄图标加载 idle 动画剪辑,提取首帧 SpriteFrame 静止展示。
* 与 HInfoComp 的 updateHeroAnimation 一致,零运行时开销。