diff --git a/assets/resources/game/monster/hero.prefab b/assets/resources/game/monster/hero.prefab index 6ae5add6..f6826a47 100644 --- a/assets/resources/game/monster/hero.prefab +++ b/assets/resources/game/monster/hero.prefab @@ -26,31 +26,37 @@ }, { "__id__": 33 + }, + { + "__id__": 47 + }, + { + "__id__": 51 } ], "_active": true, "_components": [ - { - "__id__": 47 - }, - { - "__id__": 49 - }, - { - "__id__": 51 - }, - { - "__id__": 53 - }, { "__id__": 55 }, { "__id__": 57 + }, + { + "__id__": 59 + }, + { + "__id__": 61 + }, + { + "__id__": 63 + }, + { + "__id__": 65 } ], "_prefab": { - "__id__": 59 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -837,7 +843,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 14.6, + "y": 42.648, "z": 0 }, "_lrot": { @@ -1069,6 +1075,182 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "hp", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 48 + } + ], + "_prefab": { + "__id__": 50 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 47 + }, + "_enabled": true, + "__prefab": { + "__id__": 49 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31PQLKHbpCaItCKJa/V7Fg" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "37cfGWMPJD3Yt+XQailDiC", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "power", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 52 + } + ], + "_prefab": { + "__id__": 54 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 51 + }, + "_enabled": true, + "__prefab": { + "__id__": 53 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d33IX7nrNO4p5z9lyRW7ER" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5aKyeTmgxLY7DvluMWkBDR", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1079,7 +1261,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 48 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1107,7 +1289,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1149,7 +1331,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 60 }, "animator": { "__id__": 30 @@ -1170,7 +1352,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 62 }, "_id": "" }, @@ -1188,7 +1370,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 64 }, "tag": 0, "_group": 2, @@ -1222,7 +1404,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 66 }, "enabledContactListener": true, "bullet": true, @@ -1255,6 +1437,7 @@ "__id__": 0 }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/gui/gui/bar_1.png b/assets/resources/gui/gui/bar_1.png deleted file mode 100644 index 4eb21af5..00000000 Binary files a/assets/resources/gui/gui/bar_1.png and /dev/null differ diff --git a/assets/resources/gui/gui/bar_1.png.meta b/assets/resources/gui/gui/bar_1.png.meta deleted file mode 100644 index d732894a..00000000 --- a/assets/resources/gui/gui/bar_1.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "ae481f05-3fdb-4329-bfb0-21ebf2907b69", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "ae481f05-3fdb-4329-bfb0-21ebf2907b69@6c48a", - "displayName": "bar_1", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "ae481f05-3fdb-4329-bfb0-21ebf2907b69", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "ae481f05-3fdb-4329-bfb0-21ebf2907b69@f9941", - "displayName": "bar_1", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 327, - "height": 34, - "rawWidth": 327, - "rawHeight": 34, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -163.5, - -17, - 0, - 163.5, - -17, - 0, - -163.5, - 17, - 0, - 163.5, - 17, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 34, - 327, - 34, - 0, - 0, - 327, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -163.5, - -17, - 0 - ], - "maxPos": [ - 163.5, - 17, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "ae481f05-3fdb-4329-bfb0-21ebf2907b69@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "ae481f05-3fdb-4329-bfb0-21ebf2907b69@f9941" - } -} diff --git a/assets/resources/gui/gui/bar_2.png b/assets/resources/gui/gui/bar_2.png deleted file mode 100644 index 6446be16..00000000 Binary files a/assets/resources/gui/gui/bar_2.png and /dev/null differ diff --git a/assets/resources/gui/gui/bar_2.png.meta b/assets/resources/gui/gui/bar_2.png.meta deleted file mode 100644 index 85716a46..00000000 --- a/assets/resources/gui/gui/bar_2.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "b4d6596e-0d98-4077-97c7-9f7152f064aa", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "b4d6596e-0d98-4077-97c7-9f7152f064aa@6c48a", - "displayName": "bar_2", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "b4d6596e-0d98-4077-97c7-9f7152f064aa", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "b4d6596e-0d98-4077-97c7-9f7152f064aa@f9941", - "displayName": "bar_2", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 327, - "height": 34, - "rawWidth": 327, - "rawHeight": 34, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -163.5, - -17, - 0, - 163.5, - -17, - 0, - -163.5, - 17, - 0, - 163.5, - 17, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 34, - 327, - 34, - 0, - 0, - 327, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -163.5, - -17, - 0 - ], - "maxPos": [ - 163.5, - 17, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "b4d6596e-0d98-4077-97c7-9f7152f064aa@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "b4d6596e-0d98-4077-97c7-9f7152f064aa@f9941" - } -} diff --git a/assets/resources/gui/gui/bar_3.png b/assets/resources/gui/gui/bar_3.png deleted file mode 100644 index 28b338f1..00000000 Binary files a/assets/resources/gui/gui/bar_3.png and /dev/null differ diff --git a/assets/resources/gui/gui/bar_4.png b/assets/resources/gui/gui/bar_4.png deleted file mode 100644 index 66b9a3fa..00000000 Binary files a/assets/resources/gui/gui/bar_4.png and /dev/null differ diff --git a/assets/resources/gui/gui/bar_4.png.meta b/assets/resources/gui/gui/bar_4.png.meta deleted file mode 100644 index 31a7d479..00000000 --- a/assets/resources/gui/gui/bar_4.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "ede971c5-e28a-4458-bf9f-4addf25fa9df", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "ede971c5-e28a-4458-bf9f-4addf25fa9df@6c48a", - "displayName": "bar_4", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "ede971c5-e28a-4458-bf9f-4addf25fa9df", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "ede971c5-e28a-4458-bf9f-4addf25fa9df@f9941", - "displayName": "bar_4", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 327, - "height": 34, - "rawWidth": 327, - "rawHeight": 34, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -163.5, - -17, - 0, - 163.5, - -17, - 0, - -163.5, - 17, - 0, - 163.5, - 17, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 34, - 327, - 34, - 0, - 0, - 327, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -163.5, - -17, - 0 - ], - "maxPos": [ - 163.5, - 17, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "ede971c5-e28a-4458-bf9f-4addf25fa9df@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "ede971c5-e28a-4458-bf9f-4addf25fa9df@f9941" - } -} diff --git a/assets/resources/gui/gui/bg_bar.png b/assets/resources/gui/gui/bg_bar.png deleted file mode 100644 index d6a3c916..00000000 Binary files a/assets/resources/gui/gui/bg_bar.png and /dev/null differ diff --git a/assets/resources/gui/gui/bg_bar.png.meta b/assets/resources/gui/gui/bg_bar.png.meta deleted file mode 100644 index ae009ac9..00000000 --- a/assets/resources/gui/gui/bg_bar.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "ea61fa55-a662-44f2-950b-4eb9550debba", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "ea61fa55-a662-44f2-950b-4eb9550debba@6c48a", - "displayName": "bg_bar", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "ea61fa55-a662-44f2-950b-4eb9550debba", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "ea61fa55-a662-44f2-950b-4eb9550debba@f9941", - "displayName": "bg_bar", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 385, - "height": 44, - "rawWidth": 385, - "rawHeight": 44, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -192.5, - -22, - 0, - 192.5, - -22, - 0, - -192.5, - 22, - 0, - 192.5, - 22, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 44, - 385, - 44, - 0, - 0, - 385, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -192.5, - -22, - 0 - ], - "maxPos": [ - 192.5, - 22, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "ea61fa55-a662-44f2-950b-4eb9550debba@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "ea61fa55-a662-44f2-950b-4eb9550debba@f9941" - } -} diff --git a/assets/resources/gui/gui/button_quick.png b/assets/resources/gui/gui/button_quick.png deleted file mode 100644 index 3d3e305a..00000000 Binary files a/assets/resources/gui/gui/button_quick.png and /dev/null differ diff --git a/assets/resources/gui/gui/button_quick.png.meta b/assets/resources/gui/gui/button_quick.png.meta deleted file mode 100644 index e5795d2f..00000000 --- a/assets/resources/gui/gui/button_quick.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "f46cc9db-620d-4992-9bbf-86bea38a6c14", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "f46cc9db-620d-4992-9bbf-86bea38a6c14@6c48a", - "displayName": "button_quick", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "f46cc9db-620d-4992-9bbf-86bea38a6c14", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "f46cc9db-620d-4992-9bbf-86bea38a6c14@f9941", - "displayName": "button_quick", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 176, - "height": 175, - "rawWidth": 176, - "rawHeight": 175, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -88, - -87.5, - 0, - 88, - -87.5, - 0, - -88, - 87.5, - 0, - 88, - 87.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 175, - 176, - 175, - 0, - 0, - 176, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -88, - -87.5, - 0 - ], - "maxPos": [ - 88, - 87.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "f46cc9db-620d-4992-9bbf-86bea38a6c14@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "f46cc9db-620d-4992-9bbf-86bea38a6c14@f9941" - } -} diff --git a/assets/resources/gui/gui/button_start.png b/assets/resources/gui/gui/button_start.png deleted file mode 100644 index c05b5a74..00000000 Binary files a/assets/resources/gui/gui/button_start.png and /dev/null differ diff --git a/assets/resources/gui/gui/button_start.png.meta b/assets/resources/gui/gui/button_start.png.meta deleted file mode 100644 index eb111347..00000000 --- a/assets/resources/gui/gui/button_start.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "c9b14ec0-3630-42a9-821a-60dc09fa612a", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "c9b14ec0-3630-42a9-821a-60dc09fa612a@6c48a", - "displayName": "button_start", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "c9b14ec0-3630-42a9-821a-60dc09fa612a", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "c9b14ec0-3630-42a9-821a-60dc09fa612a@f9941", - "displayName": "button_start", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 176, - "height": 175, - "rawWidth": 176, - "rawHeight": 175, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -88, - -87.5, - 0, - 88, - -87.5, - 0, - -88, - 87.5, - 0, - 88, - 87.5, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 175, - 176, - 175, - 0, - 0, - 176, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -88, - -87.5, - 0 - ], - "maxPos": [ - 88, - 87.5, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "c9b14ec0-3630-42a9-821a-60dc09fa612a@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": false, - "redirect": "c9b14ec0-3630-42a9-821a-60dc09fa612a@f9941" - } -} diff --git a/assets/resources/gui/gui/gold1.png b/assets/resources/gui/gui/gold1.png new file mode 100644 index 00000000..d8cdc455 Binary files /dev/null and b/assets/resources/gui/gui/gold1.png differ diff --git a/assets/resources/gui/uis/star.png.meta b/assets/resources/gui/gui/gold1.png.meta similarity index 73% rename from assets/resources/gui/uis/star.png.meta rename to assets/resources/gui/gui/gold1.png.meta index 6f372e76..c1b372e2 100644 --- a/assets/resources/gui/uis/star.png.meta +++ b/assets/resources/gui/gui/gold1.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "2b7465b9-b186-4c03-9303-6a62631f7a80", + "uuid": "362c5052-743d-42d9-8bbb-e39919667c9b", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "2b7465b9-b186-4c03-9303-6a62631f7a80@6c48a", - "displayName": "star", + "uuid": "362c5052-743d-42d9-8bbb-e39919667c9b@6c48a", + "displayName": "gold1", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "2b7465b9-b186-4c03-9303-6a62631f7a80", + "imageUuidOrDatabaseUri": "362c5052-743d-42d9-8bbb-e39919667c9b", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "2b7465b9-b186-4c03-9303-6a62631f7a80@f9941", - "displayName": "star", + "uuid": "362c5052-743d-42d9-8bbb-e39919667c9b@f9941", + "displayName": "gold1", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 38, - "height": 38, - "rawWidth": 38, - "rawHeight": 38, + "width": 76, + "height": 76, + "rawWidth": 76, + "rawHeight": 76, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -19, - -19, + -38, + -38, 0, - 19, - -19, + 38, + -38, 0, - -19, - 19, + -38, + 38, 0, - 19, - 19, + 38, + 38, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 38, - 38, - 38, + 76, + 76, + 76, 0, 0, - 38, + 76, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -19, - -19, + -38, + -38, 0 ], "maxPos": [ - 19, - 19, + 38, + 38, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "2b7465b9-b186-4c03-9303-6a62631f7a80@6c48a", + "imageUuidOrDatabaseUri": "362c5052-743d-42d9-8bbb-e39919667c9b@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "2b7465b9-b186-4c03-9303-6a62631f7a80@f9941" + "redirect": "362c5052-743d-42d9-8bbb-e39919667c9b@f9941" } } diff --git a/assets/resources/gui/gui/heart.png b/assets/resources/gui/gui/heart.png deleted file mode 100644 index b1272996..00000000 Binary files a/assets/resources/gui/gui/heart.png and /dev/null differ diff --git a/assets/resources/gui/gui/life.png b/assets/resources/gui/gui/life.png new file mode 100644 index 00000000..3a8f0a44 Binary files /dev/null and b/assets/resources/gui/gui/life.png differ diff --git a/assets/resources/gui/uis/s_window.png.meta b/assets/resources/gui/gui/life.png.meta similarity index 72% rename from assets/resources/gui/uis/s_window.png.meta rename to assets/resources/gui/gui/life.png.meta index 16a09d96..42875e07 100644 --- a/assets/resources/gui/uis/s_window.png.meta +++ b/assets/resources/gui/gui/life.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "ab055ea7-3dc3-4968-a0d3-5390035093c5", + "uuid": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "ab055ea7-3dc3-4968-a0d3-5390035093c5@6c48a", - "displayName": "s_window", + "uuid": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e@6c48a", + "displayName": "life", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "ab055ea7-3dc3-4968-a0d3-5390035093c5", + "imageUuidOrDatabaseUri": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "ab055ea7-3dc3-4968-a0d3-5390035093c5@f9941", - "displayName": "s_window", + "uuid": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e@f9941", + "displayName": "life", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 124, - "height": 124, - "rawWidth": 124, - "rawHeight": 124, + "width": 62, + "height": 53, + "rawWidth": 62, + "rawHeight": 53, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -62, - -62, + -31, + -26.5, 0, - 62, - -62, + 31, + -26.5, 0, - -62, - 62, + -31, + 26.5, 0, - 62, - 62, + 31, + 26.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 124, - 124, - 124, + 53, + 62, + 53, 0, 0, - 124, + 62, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -62, - -62, + -31, + -26.5, 0 ], "maxPos": [ - 62, - 62, + 31, + 26.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "ab055ea7-3dc3-4968-a0d3-5390035093c5@6c48a", + "imageUuidOrDatabaseUri": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "ab055ea7-3dc3-4968-a0d3-5390035093c5@f9941" + "redirect": "1f5a7b1c-c403-4799-8ea3-8d7e66c97b9e@f9941" } } diff --git a/assets/resources/gui/gui/life2.png b/assets/resources/gui/gui/life2.png new file mode 100644 index 00000000..818ce20e Binary files /dev/null and b/assets/resources/gui/gui/life2.png differ diff --git a/assets/resources/gui/gui/heart.png.meta b/assets/resources/gui/gui/life2.png.meta similarity index 61% rename from assets/resources/gui/gui/heart.png.meta rename to assets/resources/gui/gui/life2.png.meta index bf32d7b0..9a5051ce 100644 --- a/assets/resources/gui/gui/heart.png.meta +++ b/assets/resources/gui/gui/life2.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "d1725c3b-1a12-42f0-848f-064c074add70", + "uuid": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "d1725c3b-1a12-42f0-848f-064c074add70@6c48a", - "displayName": "heart", + "uuid": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c@6c48a", + "displayName": "life2", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "d1725c3b-1a12-42f0-848f-064c074add70", + "imageUuidOrDatabaseUri": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "d1725c3b-1a12-42f0-848f-064c074add70@f9941", - "displayName": "heart", + "uuid": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c@f9941", + "displayName": "life2", "id": "f9941", "name": "spriteFrame", "userData": { @@ -44,12 +44,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 37, - "height": 33, - "rawWidth": 37, - "rawHeight": 33, + "trimX": 2, + "trimY": 3, + "width": 73, + "height": 66, + "rawWidth": 77, + "rawHeight": 72, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -18.5, - -16.5, + -36.5, + -33, 0, - 18.5, - -16.5, + 36.5, + -33, 0, - -18.5, - 16.5, + -36.5, + 33, 0, - 18.5, - 16.5, + 36.5, + 33, 0 ], "indexes": [ @@ -83,38 +83,38 @@ 3 ], "uv": [ - 0, - 33, - 37, - 33, - 0, - 0, - 37, - 0 + 2, + 69, + 75, + 69, + 2, + 3, + 75, + 3 ], "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 + 0.025974025974025976, + 0.041666666666666664, + 0.974025974025974, + 0.041666666666666664, + 0.025974025974025976, + 0.9583333333333334, + 0.974025974025974, + 0.9583333333333334 ], "minPos": [ - -18.5, - -16.5, + -36.5, + -33, 0 ], "maxPos": [ - 18.5, - 16.5, + 36.5, + 33, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "d1725c3b-1a12-42f0-848f-064c074add70@6c48a", + "imageUuidOrDatabaseUri": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "d1725c3b-1a12-42f0-848f-064c074add70@f9941" + "redirect": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c@f9941" } } diff --git a/assets/resources/gui/gui/life_bg.png b/assets/resources/gui/gui/life_bg.png new file mode 100644 index 00000000..d794411a Binary files /dev/null and b/assets/resources/gui/gui/life_bg.png differ diff --git a/assets/resources/gui/uis/zip.png.meta b/assets/resources/gui/gui/life_bg.png.meta similarity index 66% rename from assets/resources/gui/uis/zip.png.meta rename to assets/resources/gui/gui/life_bg.png.meta index e0f4a30e..bc67769b 100644 --- a/assets/resources/gui/uis/zip.png.meta +++ b/assets/resources/gui/gui/life_bg.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "dec04f73-2faf-4a01-bea0-6546f3d475b3", + "uuid": "d30607b0-f1aa-4080-ad66-37408fe2f933", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "dec04f73-2faf-4a01-bea0-6546f3d475b3@6c48a", - "displayName": "zip", + "uuid": "d30607b0-f1aa-4080-ad66-37408fe2f933@6c48a", + "displayName": "life_bg", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "dec04f73-2faf-4a01-bea0-6546f3d475b3", + "imageUuidOrDatabaseUri": "d30607b0-f1aa-4080-ad66-37408fe2f933", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "dec04f73-2faf-4a01-bea0-6546f3d475b3@f9941", - "displayName": "zip", + "uuid": "d30607b0-f1aa-4080-ad66-37408fe2f933@f9941", + "displayName": "life_bg", "id": "f9941", "name": "spriteFrame", "userData": { @@ -43,13 +43,13 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0.5, - "offsetY": 0, + "offsetY": -0.5, "trimX": 1, - "trimY": 0, - "width": 33, - "height": 44, - "rawWidth": 34, - "rawHeight": 44, + "trimY": 1, + "width": 499, + "height": 130, + "rawWidth": 500, + "rawHeight": 131, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -16.5, - -22, + -249.5, + -65, 0, - 16.5, - -22, + 249.5, + -65, 0, - -16.5, - 22, + -249.5, + 65, 0, - 16.5, - 22, + 249.5, + 65, 0 ], "indexes": [ @@ -84,37 +84,37 @@ ], "uv": [ 1, - 44, - 34, - 44, + 130, + 500, + 130, 1, 0, - 34, + 500, 0 ], "nuv": [ - 0.029411764705882353, + 0.002, 0, 1, 0, - 0.029411764705882353, + 0.002, + 0.9923664122137404, 1, - 1, - 1 + 0.9923664122137404 ], "minPos": [ - -16.5, - -22, + -249.5, + -65, 0 ], "maxPos": [ - 16.5, - 22, + 249.5, + 65, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "dec04f73-2faf-4a01-bea0-6546f3d475b3@6c48a", + "imageUuidOrDatabaseUri": "d30607b0-f1aa-4080-ad66-37408fe2f933@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "dec04f73-2faf-4a01-bea0-6546f3d475b3@f9941" + "redirect": "d30607b0-f1aa-4080-ad66-37408fe2f933@f9941" } } diff --git a/assets/resources/gui/gui/magic.png b/assets/resources/gui/gui/magic.png new file mode 100644 index 00000000..f2812679 Binary files /dev/null and b/assets/resources/gui/gui/magic.png differ diff --git a/assets/resources/gui/gui/bar_3.png.meta b/assets/resources/gui/gui/magic.png.meta similarity index 70% rename from assets/resources/gui/gui/bar_3.png.meta rename to assets/resources/gui/gui/magic.png.meta index 995924de..8fe9dc81 100644 --- a/assets/resources/gui/gui/bar_3.png.meta +++ b/assets/resources/gui/gui/magic.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "baadf0be-192c-4023-a120-fa0508b6af3c", + "uuid": "6558d905-0d5a-4278-b42f-0e69ec2f02d5", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "baadf0be-192c-4023-a120-fa0508b6af3c@6c48a", - "displayName": "bar_3", + "uuid": "6558d905-0d5a-4278-b42f-0e69ec2f02d5@6c48a", + "displayName": "magic", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "baadf0be-192c-4023-a120-fa0508b6af3c", + "imageUuidOrDatabaseUri": "6558d905-0d5a-4278-b42f-0e69ec2f02d5", "visible": false }, "ver": "1.0.22", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "baadf0be-192c-4023-a120-fa0508b6af3c@f9941", - "displayName": "bar_3", + "uuid": "6558d905-0d5a-4278-b42f-0e69ec2f02d5@f9941", + "displayName": "magic", "id": "f9941", "name": "spriteFrame", "userData": { @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 327, - "height": 34, - "rawWidth": 327, - "rawHeight": 34, + "width": 67, + "height": 53, + "rawWidth": 67, + "rawHeight": 53, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -163.5, - -17, + -33.5, + -26.5, 0, - 163.5, - -17, + 33.5, + -26.5, 0, - -163.5, - 17, + -33.5, + 26.5, 0, - 163.5, - 17, + 33.5, + 26.5, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 34, - 327, - 34, + 53, + 67, + 53, 0, 0, - 327, + 67, 0 ], "nuv": [ @@ -103,18 +103,18 @@ 1 ], "minPos": [ - -163.5, - -17, + -33.5, + -26.5, 0 ], "maxPos": [ - 163.5, - 17, + 33.5, + 26.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "baadf0be-192c-4023-a120-fa0508b6af3c@6c48a", + "imageUuidOrDatabaseUri": "6558d905-0d5a-4278-b42f-0e69ec2f02d5@6c48a", "atlasUuid": "" }, "ver": "1.0.12", @@ -129,6 +129,6 @@ "hasAlpha": true, "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, - "redirect": "baadf0be-192c-4023-a120-fa0508b6af3c@f9941" + "redirect": "6558d905-0d5a-4278-b42f-0e69ec2f02d5@f9941" } } diff --git a/assets/resources/gui/prefab/role_controller.prefab b/assets/resources/gui/prefab/role_controller.prefab index 7d00cf00..9583bf85 100644 --- a/assets/resources/gui/prefab/role_controller.prefab +++ b/assets/resources/gui/prefab/role_controller.prefab @@ -22,26 +22,26 @@ "__id__": 2 }, { - "__id__": 60 + "__id__": 48 }, { - "__id__": 118 + "__id__": 94 } ], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 138 }, { - "__id__": 124 + "__id__": 140 }, { - "__id__": 126 + "__id__": 142 } ], "_prefab": { - "__id__": 128 + "__id__": 144 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,34 +85,31 @@ "__id__": 3 }, { - "__id__": 19 + "__id__": 15 }, { - "__id__": 27 + "__id__": 25 }, { - "__id__": 37 - }, - { - "__id__": 47 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 55 + "__id__": 43 }, { - "__id__": 57 + "__id__": 45 } ], "_prefab": { - "__id__": 59 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", - "x": -290, - "y": 570, + "x": -238.082, + "y": -184.71499999999992, "z": 0 }, "_lrot": { @@ -140,7 +137,7 @@ }, { "__type__": "cc.Node", - "_name": "pro_progress", + "_name": "life_bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -158,21 +155,15 @@ }, { "__id__": 12 - }, - { - "__id__": 14 - }, - { - "__id__": 16 } ], "_prefab": { - "__id__": 18 + "__id__": 14 }, "_lpos": { "__type__": "cc.Vec3", - "x": 324.895, - "y": 1.8350000000000009, + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -184,12 +175,12 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.5, + "y": 0.5, "z": 1 }, "_mobility": 0, - "_layer": 33554432, + "_layer": 1073741824, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -200,7 +191,7 @@ }, { "__type__": "cc.Node", - "_name": "pro_bar", + "_name": "life2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -221,7 +212,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -158.342, "y": 0, "z": 0 }, @@ -239,7 +230,7 @@ "z": 1 }, "_mobility": 0, - "_layer": 33554432, + "_layer": 1073741824, "_euler": { "__type__": "cc.Vec3", "x": 0, @@ -250,7 +241,7 @@ }, { "__type__": "cc.UITransform", - "_name": "Sprite", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { @@ -262,8 +253,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 550, - "height": 48 + "width": 73, + "height": 66 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -274,11 +265,11 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "6dr9ZT//lDQ58S3+5ujsQ3" + "fileId": "fcFBveUQxDdq2kTB5VT/Yp" }, { "__type__": "cc.Sprite", - "_name": "Sprite", + "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { @@ -299,12 +290,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ede971c5-e28a-4458-bf9f-4addf25fa9df@f9941", + "__uuid__": "2d7a9cac-2be6-4adc-8cd8-12c0253e541c@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 3, + "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -319,7 +310,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "ceSrS3QF9KAI10DlxXdHEO" + "fileId": "60wgGqUvNNM5LeSLrjjd4R" }, { "__type__": "cc.PrefabInfo", @@ -329,7 +320,7 @@ "asset": { "__id__": 0 }, - "fileId": "77uMDS4SpH2r8gHK+KDTGZ", + "fileId": "6aSHCijiFBD6efnt0C0Kt2", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -348,8 +339,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 560, - "height": 50 + "width": 450, + "height": 130 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -360,7 +351,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "bbiTs1+s9NFrR+q1S9KttP" + "fileId": "cbHvAcuQpG9bg6Obd1AH4k" }, { "__type__": "cc.Sprite", @@ -385,7 +376,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ea61fa55-a662-44f2-950b-4eb9550debba@f9941", + "__uuid__": "d30607b0-f1aa-4080-ad66-37408fe2f933@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -405,60 +396,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b27apV7D9Ps7V0UJ+Xxnmt" - }, - { - "__type__": "cc.ProgressBar", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "_barSprite": { - "__id__": 7 - }, - "_mode": 2, - "_totalLength": 1, - "_progress": 0, - "_reverse": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "04qao5lmRMMLwcM/Pg/04y" - }, - { - "__type__": "2a50eqI7JZNV5Sh0y/Qd9C6", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 3 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "controller": false, - "watchPath": "", - "componentName": "cc.ProgressBar", - "componentProperty": "progress", - "refreshRate": 0.1, - "watchPathArr": [ - "data.hp.min", - "data.hp.max" - ], - "stringFormat": "", - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "bcZMianM1AcKmJI2rncnij" + "fileId": "fbejZG/rVBzrEiDaMXE1c1" }, { "__type__": "cc.PrefabInfo", @@ -468,182 +406,7 @@ "asset": { "__id__": 0 }, - "fileId": "07UFdzXyJILYGVf0L5Sk7b", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "heart", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 20 - }, - { - "__id__": 22 - }, - { - "__id__": 24 - } - ], - "_prefab": { - "__id__": 26 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1.5, - "y": 1.5, - "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__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 37, - "height": 33 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cbdswAIKVABrBWrPlB/Srk" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 23 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "d1725c3b-1a12-42f0-848f-064c074add70@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "80CnLh/WBLypyIOdC1SsDQ" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 19 - }, - "_enabled": true, - "__prefab": { - "__id__": 25 - }, - "_alignFlags": 9, - "_target": null, - "_left": 22.25, - "_right": 0, - "_top": 25.25, - "_bottom": 0, - "_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": "c9FscjgllC35bO35IhMXhw" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "79YoPauqBJ4ISntKecRn+W", + "fileId": "15mfuPQQhHkY4lL9bdPfx1", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -660,25 +423,25 @@ "_active": true, "_components": [ { - "__id__": 28 + "__id__": 16 }, { - "__id__": 30 + "__id__": 18 }, { - "__id__": 32 + "__id__": 20 }, { - "__id__": 34 + "__id__": 22 } ], "_prefab": { - "__id__": 36 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", - "x": 296.692, - "y": 2.067, + "x": -7.525, + "y": 0, "z": 0 }, "_lrot": { @@ -710,11 +473,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -738,11 +501,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 19 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -806,11 +569,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 21 }, "_id": "" }, @@ -824,11 +587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 15 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 23 }, "templateMode": false, "watchPath": "data.hp.min", @@ -855,213 +618,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_name": "hp_max", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 38 - }, - { - "__id__": 40 - }, - { - "__id__": 42 - }, - { - "__id__": 44 - } - ], - "_prefab": { - "__id__": 46 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 350.407, - "y": 2.066, - "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": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "lab_progress", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 37 - }, - "_enabled": true, - "__prefab": { - "__id__": 39 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 52.0537109375, - "height": 39.8 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "59cZuFUsdO1rJER/6ba48n" - }, - { - "__type__": "cc.Label", - "_name": "lab_progress