diff --git a/assets/resources/common/prefab/notify.prefab b/assets/resources/common/prefab/notify.prefab index 05e8342d..6efa1895 100644 --- a/assets/resources/common/prefab/notify.prefab +++ b/assets/resources/common/prefab/notify.prefab @@ -3,13 +3,13 @@ "__type__": "cc.Prefab", "_name": "notify", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "persistent": false, - "asyncLoadAssets": false + "persistent": false }, { "__type__": "cc.Node", @@ -59,6 +59,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", @@ -72,6 +73,7 @@ "__type__": "cc.Node", "_name": "lab_content", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -110,6 +112,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 33554432, "_euler": { "__type__": "cc.Vec3", @@ -123,6 +126,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -132,7 +136,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 131.21, + "width": 131.2109375, "height": 50.4 }, "_anchorPoint": { @@ -150,6 +154,7 @@ "__type__": "cc.Label", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -184,6 +189,29 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 1, + "_enableOutline": false, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 2, + "_enableShadow": false, + "_shadowColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_shadowOffset": { + "__type__": "cc.Vec2", + "x": 2, + "y": 2 + }, + "_shadowBlur": 2, "_id": "" }, { @@ -194,6 +222,7 @@ "__type__": "110c8vEd5NEPL/N9meGQnaX", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -217,12 +246,16 @@ "asset": { "__id__": 0 }, - "fileId": "ddsPDrtFpNTpbV/TewBYOo" + "fileId": "ddsPDrtFpNTpbV/TewBYOo", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -250,6 +283,7 @@ "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -294,6 +328,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -322,6 +357,7 @@ "__type__": "01391Mp6X1Gn554rkzavN4K", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -349,6 +385,8 @@ "asset": { "__id__": 0 }, - "fileId": "4fj6jVgO1KzKob1u6D65Ik" + "fileId": "4fj6jVgO1KzKob1u6D65Ik", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index f9b0528d..3691664c 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -259,8 +259,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 79, - "height": 106 + "width": 83, + "height": 62 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -296,7 +296,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "c05c3659-4264-42fb-87e8-f43e6422dd43@f9941", + "__uuid__": "8a791edd-743c-45ad-8991-81f589e8b598@a00d6", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, diff --git a/assets/resources/game/heros/hero/heros.plist b/assets/resources/game/heros/hero/heros.plist index 3c41d731..f8b19003 100644 --- a/assets/resources/game/heros/hero/heros.plist +++ b/assets/resources/game/heros/hero/heros.plist @@ -4,123 +4,288 @@ frames - 1001.png + 1011.png aliases spriteOffset - {0,-8} + {0,0} spriteSize - {88,89} + {59,59} spriteSourceSize - {100,105} + {59,59} textureRect - {{106,1},{88,89}} + {{190,1},{59,59}} + textureRotated + + + 1021.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,71} + spriteSourceSize + {74,71} + textureRect + {{179,296},{74,71}} textureRotated - 1002.png + 1031.png aliases spriteOffset - {-2,-1} + {0,0} spriteSize - {84,103} + {83,62} spriteSourceSize - {100,105} + {83,62} textureRect - {{1,1},{84,103}} + {{188,140},{83,62}} textureRotated - 1003.png + 1041.png aliases spriteOffset - {0,-1} + {0,0} spriteSize - {80,103} + {70,63} spriteSourceSize - {100,105} + {70,63} textureRect - {{1,87},{80,103}} + {{177,372},{70,63}} + textureRotated + + + 2021.png + + aliases + + spriteOffset + {0,0} + spriteSize + {68,63} + spriteSourceSize + {68,63} + textureRect + {{176,437},{68,63}} textureRotated - 1004.png + 2022.png aliases spriteOffset - {-2,-6} + {0,0} spriteSize - {80,93} + {69,69} spriteSourceSize - {100,105} + {69,69} textureRect - {{100,173},{80,93}} + {{181,225},{69,69}} + textureRotated + + + 2031.png + + aliases + + spriteOffset + {0,0} + spriteSize + {76,58} + spriteSourceSize + {76,58} + textureRect + {{190,62},{76,58}} textureRotated - 1012.png + 2032.png aliases spriteOffset - {0,-8} + {0,0} spriteSize - {80,89} + {88,80} spriteSourceSize - {80,105} + {88,80} textureRect - {{106,91},{80,89}} + {{91,174},{88,80}} + textureRotated + + + 2051.png + + aliases + + spriteOffset + {0,0} + spriteSize + {85,76} + spriteSourceSize + {85,76} + textureRect + {{89,413},{85,76}} + textureRotated + + + 3021.png + + aliases + + spriteOffset + {0,0} + spriteSize + {79,81} + spriteSourceSize + {79,81} + textureRect + {{1,417},{79,81}} textureRotated - 1101.png + 3022.png aliases spriteOffset - {-1,-8} + {0,0} spriteSize - {76,89} + {84,88} spriteSourceSize - {80,105} + {84,88} textureRect - {{1,263},{76,89}} + {{1,90},{84,88}} textureRotated - 1102.png + 3023.png aliases spriteOffset - {-1,-8} + {0,0} spriteSize - {76,89} + {86,68} spriteSourceSize - {100,105} + {86,68} textureRect - {{92,263},{76,89}} + {{1,347},{86,68}} textureRotated - + - 1201.png + 4021.png aliases spriteOffset - {0,-4} + {0,0} spriteSize - {92,97} + {92,84} spriteSourceSize - {100,105} + {92,84} textureRect - {{1,169},{92,97}} + {{96,1},{92,84}} + textureRotated + + + 4031.png + + aliases + + spriteOffset + {0,0} + spriteSize + {87,81} + spriteSourceSize + {87,81} + textureRect + {{1,176},{87,81}} + textureRotated + + + 4061.png + + aliases + + spriteOffset + {0,0} + spriteSize + {86,86} + spriteSourceSize + {86,86} + textureRect + {{1,259},{86,86}} + textureRotated + + + 4062.png + + aliases + + spriteOffset + {0,0} + spriteSize + {86,73} + spriteSourceSize + {86,73} + textureRect + {{89,338},{86,73}} + textureRotated + + + 5061.png + + aliases + + spriteOffset + {0,0} + spriteSize + {90,85} + spriteSourceSize + {90,85} + textureRect + {{96,87},{90,85}} + textureRotated + + + 5062.png + + aliases + + spriteOffset + {0,0} + spriteSize + {87,80} + spriteSourceSize + {87,80} + textureRect + {{90,256},{87,80}} + textureRotated + + + 6061.png + + aliases + + spriteOffset + {0,0} + spriteSize + {87,93} + spriteSourceSize + {87,93} + textureRect + {{1,1},{87,93}} textureRotated @@ -136,9 +301,9 @@ realTextureFileName heros.png size - {196,340} + {251,506} smartupdate - $TexturePacker:SmartUpdate:ba9f8fd13a3d9a9d58ae0ea08aed506d:6db790d4ed1dcd0f40cb034a6b5f2ff7:757b9ddd41d3352a4ebb204a2b6924d3$ + $TexturePacker:SmartUpdate:f7eb906a6874f8a1493be27733527a47:cdbdcbbe2ff2dcdea2b1caac67f602ef:757b9ddd41d3352a4ebb204a2b6924d3$ textureFileName heros.png diff --git a/assets/resources/game/heros/hero/heros.plist.meta b/assets/resources/game/heros/hero/heros.plist.meta index f48ed33b..81688f2f 100644 --- a/assets/resources/game/heros/hero/heros.plist.meta +++ b/assets/resources/game/heros/hero/heros.plist.meta @@ -7,24 +7,346 @@ ".json" ], "subMetas": { - "b3f5a": { + "750c7": { "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@b3f5a", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@750c7", "displayName": "", - "id": "b3f5a", - "name": "1001", + "id": "750c7", + "name": "1011", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 190, + "trimY": 1, + "width": 59, + "height": 59, + "rawWidth": 59, + "rawHeight": 59, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "01d93": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@01d93", + "displayName": "", + "id": "01d93", + "name": "1021", "userData": { "trimType": "auto", "trimThreshold": 1, "rotated": true, "offsetX": 0, - "offsetY": -8, - "trimX": 106, - "trimY": 1, + "offsetY": 0, + "trimX": 179, + "trimY": 296, + "width": 74, + "height": 71, + "rawWidth": 74, + "rawHeight": 71, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a00d6": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a00d6", + "displayName": "", + "id": "a00d6", + "name": "1031", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 188, + "trimY": 140, + "width": 83, + "height": 62, + "rawWidth": 83, + "rawHeight": 62, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "d1e38": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@d1e38", + "displayName": "", + "id": "d1e38", + "name": "1041", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 177, + "trimY": 372, + "width": 70, + "height": 63, + "rawWidth": 70, + "rawHeight": 63, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "002f6": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@002f6", + "displayName": "", + "id": "002f6", + "name": "2021", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 176, + "trimY": 437, + "width": 68, + "height": 63, + "rawWidth": 68, + "rawHeight": 63, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "35bbe": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@35bbe", + "displayName": "", + "id": "35bbe", + "name": "2022", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 181, + "trimY": 225, + "width": 69, + "height": 69, + "rawWidth": 69, + "rawHeight": 69, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "8f20b": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@8f20b", + "displayName": "", + "id": "8f20b", + "name": "2031", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 190, + "trimY": 62, + "width": 76, + "height": 58, + "rawWidth": 76, + "rawHeight": 58, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "56e31": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@56e31", + "displayName": "", + "id": "56e31", + "name": "2032", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 91, + "trimY": 174, "width": 88, - "height": 89, - "rawWidth": 100, - "rawHeight": 105, + "height": 80, + "rawWidth": 88, + "rawHeight": 80, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -53,300 +375,484 @@ ], "subMetas": {} }, - "f8120": { + "a9007": { "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f8120", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a9007", "displayName": "", - "id": "f8120", - "name": "1002", + "id": "a9007", + "name": "2051", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 89, + "trimY": 413, + "width": 85, + "height": 76, + "rawWidth": 85, + "rawHeight": 76, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "942f4": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@942f4", + "displayName": "", + "id": "942f4", + "name": "3021", "userData": { "trimType": "auto", "trimThreshold": 1, "rotated": true, - "offsetX": -2, - "offsetY": -1, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 417, + "width": 79, + "height": 81, + "rawWidth": 79, + "rawHeight": 81, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "cc219": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@cc219", + "displayName": "", + "id": "cc219", + "name": "3022", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 90, + "width": 84, + "height": 88, + "rawWidth": 84, + "rawHeight": 88, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "00672": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@00672", + "displayName": "", + "id": "00672", + "name": "3023", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 347, + "width": 86, + "height": 68, + "rawWidth": 86, + "rawHeight": 68, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "ae33a": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@ae33a", + "displayName": "", + "id": "ae33a", + "name": "4021", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 96, + "trimY": 1, + "width": 92, + "height": 84, + "rawWidth": 92, + "rawHeight": 84, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "349a9": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@349a9", + "displayName": "", + "id": "349a9", + "name": "4031", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 176, + "width": 87, + "height": 81, + "rawWidth": 87, + "rawHeight": 81, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f3bd8": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f3bd8", + "displayName": "", + "id": "f3bd8", + "name": "4061", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 259, + "width": 86, + "height": 86, + "rawWidth": 86, + "rawHeight": 86, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a7006": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a7006", + "displayName": "", + "id": "a7006", + "name": "4062", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 89, + "trimY": 338, + "width": 86, + "height": 73, + "rawWidth": 86, + "rawHeight": 73, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f4033": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f4033", + "displayName": "", + "id": "f4033", + "name": "5061", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 96, + "trimY": 87, + "width": 90, + "height": 85, + "rawWidth": 90, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "09e77": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@09e77", + "displayName": "", + "id": "09e77", + "name": "5062", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 90, + "trimY": 256, + "width": 87, + "height": 80, + "rawWidth": 87, + "rawHeight": 80, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", + "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "a1225": { + "importer": "sprite-frame", + "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a1225", + "displayName": "", + "id": "a1225", + "name": "6061", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, "trimX": 1, "trimY": 1, - "width": 84, - "height": 103, - "rawWidth": 100, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "a59f6": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@a59f6", - "displayName": "", - "id": "a59f6", - "name": "1003", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": -1, - "trimX": 1, - "trimY": 87, - "width": 80, - "height": 103, - "rawWidth": 100, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f948a": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f948a", - "displayName": "", - "id": "f948a", - "name": "1004", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": -2, - "offsetY": -6, - "trimX": 100, - "trimY": 173, - "width": 80, + "width": 87, "height": 93, - "rawWidth": 100, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f58a6": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@f58a6", - "displayName": "", - "id": "f58a6", - "name": "1012", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": -8, - "trimX": 106, - "trimY": 91, - "width": 80, - "height": 89, - "rawWidth": 80, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c29c5": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@c29c5", - "displayName": "", - "id": "c29c5", - "name": "1101", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -8, - "trimX": 1, - "trimY": 263, - "width": 76, - "height": 89, - "rawWidth": 80, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c3a1e": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@c3a1e", - "displayName": "", - "id": "c3a1e", - "name": "1102", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": -1, - "offsetY": -8, - "trimX": 92, - "trimY": 263, - "width": 76, - "height": 89, - "rawWidth": 100, - "rawHeight": 105, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [], - "indexes": [], - "uv": [], - "nuv": [], - "minPos": [], - "maxPos": [] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "55b3f5b8-c97f-45fe-8971-b253ee5f4add@6c48a", - "atlasUuid": "8a791edd-743c-45ad-8991-81f589e8b598" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "7dd7d": { - "importer": "sprite-frame", - "uuid": "8a791edd-743c-45ad-8991-81f589e8b598@7dd7d", - "displayName": "", - "id": "7dd7d", - "name": "1201", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": -4, - "trimX": 1, - "trimY": 169, - "width": 92, - "height": 97, - "rawWidth": 100, - "rawHeight": 105, + "rawWidth": 87, + "rawHeight": 93, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/resources/game/heros/hero/heros.png b/assets/resources/game/heros/hero/heros.png index 19b5ef95..ea8a914e 100644 Binary files a/assets/resources/game/heros/hero/heros.png and b/assets/resources/game/heros/hero/heros.png differ diff --git a/assets/resources/game/heros/hero/heros.png.meta b/assets/resources/game/heros/hero/heros.png.meta index d2d03808..eb6e48bd 100644 --- a/assets/resources/game/heros/hero/heros.png.meta +++ b/assets/resources/game/heros/hero/heros.png.meta @@ -42,14 +42,14 @@ "trimType": "auto", "trimThreshold": 1, "rotated": false, - "offsetX": -1, + "offsetX": 0, "offsetY": 0, "trimX": 0, - "trimY": 2, - "width": 194, - "height": 336, - "rawWidth": 196, - "rawHeight": 340, + "trimY": 0, + "width": 251, + "height": 506, + "rawWidth": 251, + "rawHeight": 506, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -97, - -168, + -125.5, + -253, 0, - 97, - -168, + 125.5, + -253, 0, - -97, - 168, + -125.5, + 253, 0, - 97, - 168, + 125.5, + 253, 0 ], "indexes": [ @@ -84,32 +84,32 @@ ], "uv": [ 0, - 338, - 194, - 338, + 506, + 251, + 506, 0, - 2, - 194, - 2 + 0, + 251, + 0 ], "nuv": [ 0, - 0.0058823529411764705, - 0.9897959183673469, - 0.0058823529411764705, 0, - 0.9941176470588236, - 0.9897959183673469, - 0.9941176470588236 + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -97, - -168, + -125.5, + -253, 0 ], "maxPos": [ - 97, - 168, + 125.5, + 253, 0 ] }, diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 7493ba0b..38360b78 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -326,7 +326,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": -22.974, "z": 0 }, "_lrot": { @@ -572,7 +572,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": -16.518, - "y": 149.594, + "y": 140, "z": 0 }, "_lrot": { @@ -720,7 +720,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -285.585, + "y": -310, "z": 0 }, "_lrot": { @@ -964,8 +964,6 @@ "__id__": 0 }, "fileId": "9eQ9Op13lL5ZqF+H2E1cEl", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { diff --git a/assets/resources/gui/prefab/role_controller.prefab b/assets/resources/gui/prefab/role_controller.prefab index 62bdd1c5..431cc6cf 100644 --- a/assets/resources/gui/prefab/role_controller.prefab +++ b/assets/resources/gui/prefab/role_controller.prefab @@ -37,31 +37,37 @@ "__id__": 188 }, { - "__id__": 202 + "__id__": 196 }, { - "__id__": 226 + "__id__": 210 + }, + { + "__id__": 234 + }, + { + "__id__": 276 } ], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 304 }, { - "__id__": 270 + "__id__": 306 }, { - "__id__": 272 + "__id__": 308 } ], "_prefab": { - "__id__": 274 + "__id__": 310 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -360, + "y": -640, "z": 0 }, "_lrot": { @@ -123,8 +129,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -355, - "y": -25, + "x": 5, + "y": 490, "z": 0 }, "_lrot": { @@ -1065,7 +1071,7 @@ "_left": 5, "_right": 0, "_top": 774.7149999999999, - "_bottom": 615, + "_bottom": 490, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -1139,8 +1145,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -120, - "y": -25, + "x": 240, + "y": 490, "z": 0 }, "_lrot": { @@ -2448,7 +2454,7 @@ "_left": 240, "_right": 0, "_top": 779.934, - "_bottom": 615, + "_bottom": 490, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2516,8 +2522,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 115, - "y": -25, + "x": 475, + "y": 490, "z": 0 }, "_lrot": { @@ -2747,7 +2753,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 450, + "width": 470, "height": 130 }, "_anchorPoint": { @@ -3458,7 +3464,7 @@ "_left": 475, "_right": 68.59100000000001, "_top": 0, - "_bottom": 615, + "_bottom": 490, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3517,8 +3523,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -355, - "y": -390, + "x": 5, + "y": 140, "z": 0 }, "_lrot": { @@ -3609,7 +3615,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 1180, - "height": 450 + "height": 680 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3725,7 +3731,7 @@ "_left": 5, "_right": 0, "_top": 0, - "_bottom": 250, + "_bottom": 140, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3759,7 +3765,7 @@ }, { "__type__": "cc.Node", - "_name": "set", + "_name": "bag", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -3787,8 +3793,8 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 245, - "y": -500, + "x": 605, + "y": 140, "z": 0 }, "_lrot": { @@ -4163,6 +4169,181 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "shop", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 189 + }, + { + "__id__": 191 + }, + { + "__id__": 193 + } + ], + "_prefab": { + "__id__": 195 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 605, + "y": 370, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 190 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e5D+nCxytFVqqeO1wsgL4y" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 192 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "27c92e56-a5f9-4a91-a837-468ff584d119@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "adOs6NvgFIo4lxFUkvN00M" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 188 + }, + "_enabled": true, + "__prefab": { + "__id__": 194 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 370, + "_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": "d8FnZVRedDCYwMApPpPOIN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0rLwVSFBKXIgZtoDFBa0B", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "shuaxin", @@ -4173,28 +4354,28 @@ }, "_children": [ { - "__id__": 189 + "__id__": 197 } ], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 203 }, { - "__id__": 197 + "__id__": 205 }, { - "__id__": 199 + "__id__": 207 } ], "_prefab": { - "__id__": 201 + "__id__": 209 }, "_lpos": { "__type__": "cc.Vec3", - "x": 245, - "y": -615, + "x": 605, + "y": 25, "z": 0 }, "_lrot": { @@ -4226,20 +4407,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 188 + "__id__": 196 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 198 }, { - "__id__": 192 + "__id__": 200 } ], "_prefab": { - "__id__": 194 + "__id__": 202 }, "_lpos": { "__type__": "cc.Vec3", @@ -4276,11 +4457,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 199 }, "_contentSize": { "__type__": "cc.Size", @@ -4304,11 +4485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 189 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 193 + "__id__": 201 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4362,11 +4543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -4390,11 +4571,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 206 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4435,11 +4616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 188 + "__id__": 196 }, "_enabled": true, "__prefab": { - "__id__": 200 + "__id__": 208 }, "_alignFlags": 36, "_target": null, @@ -4488,25 +4669,25 @@ }, "_children": [ { - "__id__": 203 + "__id__": 211 } ], "_active": true, "_components": [ { - "__id__": 221 + "__id__": 229 }, { - "__id__": 223 + "__id__": 231 } ], "_prefab": { - "__id__": 225 + "__id__": 233 }, "_lpos": { "__type__": "cc.Vec3", - "x": -355, - "y": -635, + "x": 5, + "y": 5, "z": 0 }, "_lrot": { @@ -4538,33 +4719,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 202 + "__id__": 210 }, "_children": [ { - "__id__": 204 + "__id__": 212 } ], "_active": true, "_components": [ - { - "__id__": 210 - }, - { - "__id__": 212 - }, - { - "__id__": 214 - }, - { - "__id__": 216 - }, { "__id__": 218 + }, + { + "__id__": 220 + }, + { + "__id__": 222 + }, + { + "__id__": 224 + }, + { + "__id__": 226 } ], "_prefab": { - "__id__": 220 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4601,20 +4782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 203 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 213 }, { - "__id__": 207 + "__id__": 215 } ], "_prefab": { - "__id__": 209 + "__id__": 217 }, "_lpos": { "__type__": "cc.Vec3", @@ -4651,11 +4832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 214 }, "_contentSize": { "__type__": "cc.Size", @@ -4679,11 +4860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 204 + "__id__": 212 }, "_enabled": true, "__prefab": { - "__id__": 208 + "__id__": 216 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4737,11 +4918,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -4765,11 +4946,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 213 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4810,14 +4991,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 223 }, "_barSprite": { - "__id__": 207 + "__id__": 215 }, "_mode": 2, "_totalLength": 1, @@ -4835,11 +5016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 225 }, "controller": false, "watchPath": "", @@ -4863,11 +5044,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 203 + "__id__": 211 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 227 }, "_alignFlags": 4, "_target": null, @@ -4912,11 +5093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4940,11 +5121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 202 + "__id__": 210 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 232 }, "_alignFlags": 44, "_target": null, @@ -4993,40 +5174,40 @@ }, "_children": [ { - "__id__": 227 + "__id__": 235 }, { - "__id__": 233 + "__id__": 241 }, { - "__id__": 239 + "__id__": 247 }, { - "__id__": 245 + "__id__": 253 }, { - "__id__": 251 - }, - { - "__id__": 257 - } - ], - "_active": true, - "_components": [ - { - "__id__": 263 + "__id__": 259 }, { "__id__": 265 } ], + "_active": true, + "_components": [ + { + "__id__": 271 + }, + { + "__id__": 273 + } + ], "_prefab": { - "__id__": 267 + "__id__": 275 }, "_lpos": { "__type__": "cc.Vec3", - "x": -355, - "y": -615, + "x": 5, + "y": 25, "z": 0 }, "_lrot": { @@ -5058,20 +5239,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 228 + "__id__": 236 }, { - "__id__": 230 + "__id__": 238 } ], "_prefab": { - "__id__": 232 + "__id__": 240 }, "_lpos": { "__type__": "cc.Vec3", @@ -5108,11 +5289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -5136,11 +5317,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 235 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5194,20 +5375,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 234 + "__id__": 242 }, { - "__id__": 236 + "__id__": 244 } ], "_prefab": { - "__id__": 238 + "__id__": 246 }, "_lpos": { "__type__": "cc.Vec3", @@ -5244,11 +5425,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 243 }, "_contentSize": { "__type__": "cc.Size", @@ -5272,11 +5453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 233 + "__id__": 241 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 245 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5330,20 +5511,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 240 + "__id__": 248 }, { - "__id__": 242 + "__id__": 250 } ], "_prefab": { - "__id__": 244 + "__id__": 252 }, "_lpos": { "__type__": "cc.Vec3", @@ -5380,11 +5561,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 241 + "__id__": 249 }, "_contentSize": { "__type__": "cc.Size", @@ -5408,11 +5589,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 239 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 243 + "__id__": 251 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5466,20 +5647,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 246 + "__id__": 254 }, { - "__id__": 248 + "__id__": 256 } ], "_prefab": { - "__id__": 250 + "__id__": 258 }, "_lpos": { "__type__": "cc.Vec3", @@ -5516,11 +5697,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -5544,11 +5725,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 245 + "__id__": 253 }, "_enabled": true, "__prefab": { - "__id__": 249 + "__id__": 257 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5602,20 +5783,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": true, "_components": [ { - "__id__": 252 + "__id__": 260 }, { - "__id__": 254 + "__id__": 262 } ], "_prefab": { - "__id__": 256 + "__id__": 264 }, "_lpos": { "__type__": "cc.Vec3", @@ -5652,11 +5833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 253 + "__id__": 261 }, "_contentSize": { "__type__": "cc.Size", @@ -5680,11 +5861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 251 + "__id__": 259 }, "_enabled": true, "__prefab": { - "__id__": 255 + "__id__": 263 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5738,20 +5919,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 234 }, "_children": [], "_active": false, "_components": [ { - "__id__": 258 + "__id__": 266 }, { - "__id__": 260 + "__id__": 268 } ], "_prefab": { - "__id__": 262 + "__id__": 270 }, "_lpos": { "__type__": "cc.Vec3", @@ -5788,11 +5969,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -5816,11 +5997,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 257 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5874,11 +6055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 264 + "__id__": 272 }, "_contentSize": { "__type__": "cc.Size", @@ -5902,11 +6083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 234 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 274 }, "_alignFlags": 12, "_target": null, @@ -5945,6 +6126,610 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "suo", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 277 + }, + { + "__id__": 286 + } + ], + "_active": true, + "_components": [ + { + "__id__": 295 + }, + { + "__id__": 297 + }, + { + "__id__": 299 + }, + { + "__id__": 301 + } + ], + "_prefab": { + "__id__": 303 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 365, + "y": 25, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Button", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 276 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 278 + }, + { + "__id__": 280 + }, + { + "__id__": 282 + } + ], + "_prefab": { + "__id__": 285 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 57, + "y": 55, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 277 + }, + "_enabled": true, + "__prefab": { + "__id__": 279 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 63, + "height": 68 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e9/9jvxGhHzZ8y9w0GlL2G" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 277 + }, + "_enabled": true, + "__prefab": { + "__id__": 281 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "b94cb626-ecf4-4cee-bda5-1c63f22ef7de@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8e3f0mtr9MUZ/nV7FUMPjZ" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 277 + }, + "_enabled": true, + "__prefab": { + "__id__": 283 + }, + "clickEvents": [ + { + "__id__": 284 + } + ], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "b94cb626-ecf4-4cee-bda5-1c63f22ef7de@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 277 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6dzpLP0atNXLHpBpcg+j7G" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 276 + }, + "component": "", + "_componentId": "bcd8aBpUghL4YyOLO3ds4YK", + "handler": "onTouch", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a1sCjQDlRNCqhsh0C82SyP", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 276 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 287 + }, + { + "__id__": 289 + }, + { + "__id__": 291 + } + ], + "_prefab": { + "__id__": 294 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 177, + "y": 55, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 288 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 63, + "height": 68 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f5PE9loFxO0qmRZ44cyEzQ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 290 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "b94cb626-ecf4-4cee-bda5-1c63f22ef7de@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e6VSCPFeJILI9f+IaqKfi+" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 286 + }, + "_enabled": true, + "__prefab": { + "__id__": 292 + }, + "clickEvents": [ + { + "__id__": 293 + } + ], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "b94cb626-ecf4-4cee-bda5-1c63f22ef7de@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 286 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "96IyPsid1IPo+6ogH9Cbj7" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 276 + }, + "component": "", + "_componentId": "bcd8aBpUghL4YyOLO3ds4YK", + "handler": "onTouch", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "459JgOSSlPk7ID9Mui6Uz5", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 296 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 230, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a6yZ46onhB8rf1Pp/QhyBk" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 298 + }, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 25, + "_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": "77XT/JIehEwZOSVpRJWXWH" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 300 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b9UZ+ZSXhDkIEnSKrLofML" + }, + { + "__type__": "bcd8aBpUghL4YyOLO3ds4YK", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 276 + }, + "_enabled": true, + "__prefab": { + "__id__": 302 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a4mFm0DSVMNLwhxYCPBw28" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7dlyRg9w9HVo/CzFrOLh5Q", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "GameUI", @@ -5955,7 +6740,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 305 }, "_contentSize": { "__type__": "cc.Size", @@ -5964,8 +6749,8 @@ }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 + "x": 0, + "y": 0 }, "_id": "" }, @@ -5983,7 +6768,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 307 }, "_alignFlags": 45, "_target": null, @@ -6019,7 +6804,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 309 }, "_id": "" }, diff --git a/assets/script/Main.ts b/assets/script/Main.ts index 582afd7b..d8878409 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -25,12 +25,12 @@ export class Main extends Root { protected async run() { smc.initialize = ecs.getEntity(Initialize); smc.monsters = [ - {uuid:1102}, - {uuid:1102}, - {uuid:1102}, - {uuid:1201}, - {uuid:1201}, - {uuid:1201}, + {uuid:1011}, + {uuid:1021}, + {uuid:1031}, + {uuid:1041}, + {uuid:1041}, + {uuid:1041}, ] console.log("Game start"); diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 12a10f4a..53d031e9 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -31,6 +31,8 @@ export class SingletonModuleComp extends ecs.Comp { heros_dead = [] vm_data: any = { name : "数据测试", + /**宝石数量 */ + gems: 10, /** 当前等级 */ cards:{ level:1, @@ -42,7 +44,7 @@ export class SingletonModuleComp extends ecs.Comp { max:30 }, power: { - min: 0, + min: 10, max: 30 }, gold: { @@ -50,11 +52,11 @@ export class SingletonModuleComp extends ecs.Comp { max: 3, max_limit:10, time:0, - cd:15, + cd:10, }, shuaxin: { min: 0, - max: 15, + max: 5, speed:1, }, diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index d866cbd1..f911d459 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -9,40 +9,49 @@ export const CardType = { 2: "后排", } export const CardList={ - 1:[1001,1002,1003,1102], - 2:[1001,1002,1003,1004,1102,1201], - 3:[1001,1002,1003,1004,1102,1201], - 4:[1001,1002,1003,1004,1102,1201], - 5:[1001,1002,1003,1004,1102,1201], - 6:[1001,1002,1003,1004,1102,1201], + 1:[1011,1021,1031,1041], + 2:[1011,1021,1031,1041,2021,2022,2031,2032], + 3:[1011,1021,1031,1041,2021,2022,2031,2032], + 4:[1011,1021,1031,1041,2021,2022,2031,2032], + 5:[1011,1021,1031,1041,2021,2022,2031,2032], + 6:[1011,1021,1031,1041,2021,2022,2031,2032], } export const CardSet = { - 1001:{ - uuid:1001, name:'护盾战士', type:1, level:1,prefab_path:1001,atk:1,atk_cd:1.5, hp:20, power:50, speed:50, + 1011:{ + uuid:1011, name:'叽叽', type:1, level:1,prefab_path:1011,atk:1,atk_cd:0.5, hp:15, power:45, speed:80, skill:{ } }, - 1002:{ - uuid:1002, name:'无名法师', type:2, level:1,prefab_path:1002,atk:3,atk_cd:1.5, hp:10, power:50, speed:50, + 1021:{ + uuid:1021, name:'汪汪', type:1, level:1,prefab_path:1021,atk:2,atk_cd:1, hp:15, power:50, speed:50, skill:{ } }, - 1003:{ - uuid:1003, name:'无名战士', type:1, level:1,prefab_path:1003,atk:2, atk_cd:1.5, hp:15, power:50, speed:50, + 1031:{ + uuid:1031, name:'喵喵', type:1, level:1,prefab_path:1031,atk:1, atk_cd:0.5, hp:20, power:50, speed:50, skill:{ } }, - 1102:{ - uuid:1102, name:'骷髅士兵', type:1, level:1,prefab_path:1102,atk:2,atk_cd:1.5, hp:10, power:50, speed:50, + 1041:{ + uuid:1041, name:'胖大', type:2, level:1,prefab_path:1041,atk:4,atk_cd:1.5, hp:15, power:50, speed:50, skill:{ } }, - 1004:{ - uuid:1004, name:'火焰法师', type:2, level:2,prefab_path:1004,atk:4,atk_cd:1.5, hp:15, power:50, speed:50, + 2021:{ + uuid:2021, name:'汪汪[强]', type:1, level:2,prefab_path:2021,atk:6,atk_cd:1, hp:25, power:50, speed:50, skill:{ } }, - 1201:{ - uuid:1201, name:'猎寻狼', type:1, level:2,prefab_path:1201,atk:5,atk_cd:1.5, hp:20, power:100, speed:100, + 2022:{ + uuid:2022, name:'沃夫', type:1, level:2,prefab_path:2022,atk:6,atk_cd:1, hp:30, power:50, speed:50, skill:{ } }, + 2031:{ + uuid:2031, name:'泰哥', type:1, level:2,prefab_path:2031,atk:4,atk_cd:0.5, hp:25, power:50, speed:50, + skill:{ } + }, + 2032:{ + uuid:2032, name:'喵喵[厚]', type:1, level:2,prefab_path:2032,atk:2.5,atk_cd:0.5, hp:40, power:50, speed:50, + skill:{ } + }, + } \ No newline at end of file diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 61a841cf..74c50e8e 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -10,9 +10,9 @@ import { CardList } from "../common/config/CardSet"; const { ccclass, property } = _decorator; /** 视图层对象 */ -@ccclass('ControllerComp') -@ecs.register('Controller', false) -export class ControllerComp extends CCComp { +@ccclass('CardControllerComp') +@ecs.register('CardController', false) +export class CardControllerComp extends CCComp { card_level = 1; start() { this.load_cards() diff --git a/assets/script/game/map/Controller.ts b/assets/script/game/map/Controller.ts deleted file mode 100644 index 5413a34c..00000000 --- a/assets/script/game/map/Controller.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { _decorator } from "cc"; -import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; -import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; - -const { ccclass, property } = _decorator; - -/** 视图层对象 */ -@ccclass('CardControllerComp') -@ecs.register('CardController', false) -export class CardControllerComp extends CCComp { - /** 视图层逻辑代码分离演示 */ - start() { - // var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象 - // this.on(ModuleEvent.Cmd, this.onHandler, this); - } - - /** 全局消息逻辑处理 */ - // private onHandler(event: string, args: any) { - // switch (event) { - // case ModuleEvent.Cmd: - // break; - // } - // } - - /** 视图对象通过 ecs.Entity.remove(ControllerComp) 删除组件是触发组件处理自定义释放逻辑 */ - reset() { - this.node.destroy(); - } -} \ No newline at end of file diff --git a/assets/script/game/map/CsuoComp.ts b/assets/script/game/map/CsuoComp.ts new file mode 100644 index 00000000..0fda5c25 --- /dev/null +++ b/assets/script/game/map/CsuoComp.ts @@ -0,0 +1,73 @@ +import { _decorator,NodeEventType,EventTouch } from "cc"; +import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; +import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; +import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; +import { UIID } from "../common/config/GameUIConfig"; +import { smc } from "../common/SingletonModuleComp"; + +const { ccclass, property } = _decorator; + +/** 视图层对象 */ +@ccclass('CsuoComp') +@ecs.register('Csuo', false) +export class CsuoComp extends CCComp { + + protected onLoad() { + // this.node.on(NodeEventType.TOUCH_START, this.onTouch, this); + + } + onTouch() { + oops.gui.open( + UIID.Window, + { + 'title':'解锁', + 'content':'解锁解锁解锁解锁解锁解锁解锁解锁解锁解锁解锁解锁', + 'okWord':'ok', + 'okFunc':this.onOk(), + 'cancelWord':'解锁', + 'cancelFunc':this.oncancel(), + 'needCancel':true + } + ) + } + onOk(){ + + } + oncancel(){ + smc.vm_data.power.min=smc.vm_data.power.min+1; + this.node.active=false; + } + /** + * + * + * @param params 参数 + * { + * title: 标题 + * content: 内容 + * okWord: ok按钮上的文字 + * okFunc: 确认时执行的方法 + * cancelWord: 取消按钮的文字 + * cancelFunc: 取消时执行的方法 + * needCancel: 是否需要取消按钮 + * } + */ + + /** 视图层逻辑代码分离演示 */ + start() { + // var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象 + // this.on(ModuleEvent.Cmd, this.onHandler, this); + } + + /** 全局消息逻辑处理 */ + // private onHandler(event: string, args: any) { + // switch (event) { + // case ModuleEvent.Cmd: + // break; + // } + // } + + /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ + reset() { + this.node.destroy(); + } +} \ No newline at end of file diff --git a/assets/script/game/map/Controller.ts.meta b/assets/script/game/map/CsuoComp.ts.meta similarity index 70% rename from assets/script/game/map/Controller.ts.meta rename to assets/script/game/map/CsuoComp.ts.meta index e09902c9..dd1a7d87 100644 --- a/assets/script/game/map/Controller.ts.meta +++ b/assets/script/game/map/CsuoComp.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "7c495718-13bc-4f64-8ecc-27c210626d0a", + "uuid": "bcd8a069-5208-4be1-8c8e-2cedddb3860a", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/monster/HeroCard.ts b/assets/script/game/monster/HeroCard.ts index 639d4a0e..14d374b3 100644 --- a/assets/script/game/monster/HeroCard.ts +++ b/assets/script/game/monster/HeroCard.ts @@ -20,11 +20,9 @@ export class HeroCard extends ecs.Entity { // 视图层 - + protected init() { - // this.addComponents( - // MonsterModelComp); - + } destroy(): void { @@ -34,7 +32,7 @@ export class HeroCard extends ecs.Entity { /** 加载角色 */ load(pos: Vec3 = Vec3.ZERO,uuid:number=1001,parent:Node) { - console.log("load hero",uuid); + // console.log("load hero",uuid); // var path = "game/monster/"+prefab_path; var path = "game/heros/cards/hero_card"; var prefab: Prefab = oops.res.get(path, Prefab)!; diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index 8a33d51c..73826402 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -70,6 +70,7 @@ export class HeroCardViewComp extends CCComp { this.ent.destroy(); smc.vm_data.gold.min -= CardSet[this.card_uid].level; }else{ + oops.gui.toast("金币不够"); this.node.setPosition(this.pos_x,this.pos_y); } }