diff --git a/assets/resources/gui/gui/UI-16.png b/assets/resources/gui/gui/UI-16.png new file mode 100644 index 00000000..47703a8a Binary files /dev/null and b/assets/resources/gui/gui/UI-16.png differ diff --git a/assets/resources/gui/gui/UI-16.png.meta b/assets/resources/gui/gui/UI-16.png.meta new file mode 100644 index 00000000..44c657f5 --- /dev/null +++ b/assets/resources/gui/gui/UI-16.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "eac8f388-79c5-438f-9602-d9bdac7a5d12", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "eac8f388-79c5-438f-9602-d9bdac7a5d12@6c48a", + "displayName": "UI-16", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "eac8f388-79c5-438f-9602-d9bdac7a5d12", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "eac8f388-79c5-438f-9602-d9bdac7a5d12@f9941", + "displayName": "UI-16", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 197, + "height": 22, + "rawWidth": 197, + "rawHeight": 22, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 4, + "borderRight": 3, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -98.5, + -11, + 0, + 98.5, + -11, + 0, + -98.5, + 11, + 0, + 98.5, + 11, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 22, + 197, + 22, + 0, + 0, + 197, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -98.5, + -11, + 0 + ], + "maxPos": [ + 98.5, + 11, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "eac8f388-79c5-438f-9602-d9bdac7a5d12@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "eac8f388-79c5-438f-9602-d9bdac7a5d12@f9941" + } +} diff --git a/assets/resources/gui/gui/UI-17.png b/assets/resources/gui/gui/UI-17.png new file mode 100644 index 00000000..fb757901 Binary files /dev/null and b/assets/resources/gui/gui/UI-17.png differ diff --git a/assets/resources/gui/gui/UI-17.png.meta b/assets/resources/gui/gui/UI-17.png.meta new file mode 100644 index 00000000..d4e92c68 --- /dev/null +++ b/assets/resources/gui/gui/UI-17.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "9716cf6d-cc08-452b-8c72-13d63c89aac2", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "9716cf6d-cc08-452b-8c72-13d63c89aac2@6c48a", + "displayName": "UI-17", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "9716cf6d-cc08-452b-8c72-13d63c89aac2", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "9716cf6d-cc08-452b-8c72-13d63c89aac2@f9941", + "displayName": "UI-17", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 191, + "height": 16, + "rawWidth": 191, + "rawHeight": 16, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -95.5, + -8, + 0, + 95.5, + -8, + 0, + -95.5, + 8, + 0, + 95.5, + 8, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 16, + 191, + 16, + 0, + 0, + 191, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -95.5, + -8, + 0 + ], + "maxPos": [ + 95.5, + 8, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "9716cf6d-cc08-452b-8c72-13d63c89aac2@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "redirect": "9716cf6d-cc08-452b-8c72-13d63c89aac2@f9941" + } +} diff --git a/assets/resources/gui/gui/windws.png.meta b/assets/resources/gui/gui/windws.png.meta index 9958b32c..48540a1f 100644 --- a/assets/resources/gui/gui/windws.png.meta +++ b/assets/resources/gui/gui/windws.png.meta @@ -50,10 +50,10 @@ "height": 220, "rawWidth": 220, "rawHeight": 220, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 32, + "borderBottom": 32, + "borderLeft": 32, + "borderRight": 32, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, diff --git a/assets/resources/gui/prefab/role_controller.prefab b/assets/resources/gui/prefab/role_controller.prefab index c9fc99b0..138efeb4 100644 --- a/assets/resources/gui/prefab/role_controller.prefab +++ b/assets/resources/gui/prefab/role_controller.prefab @@ -29,22 +29,34 @@ }, { "__id__": 138 + }, + { + "__id__": 186 + }, + { + "__id__": 198 + }, + { + "__id__": 216 + }, + { + "__id__": 230 } ], "_active": true, "_components": [ { - "__id__": 198 + "__id__": 254 }, { - "__id__": 200 + "__id__": 256 }, { - "__id__": 202 + "__id__": 258 } ], "_prefab": { - "__id__": 204 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -78,7 +90,7 @@ { "__type__": "cc.Node", "_name": "life", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 @@ -141,7 +153,7 @@ { "__type__": "cc.Node", "_name": "life_bg", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 2 @@ -195,7 +207,7 @@ { "__type__": "cc.Node", "_name": "life2", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 3 @@ -417,7 +429,7 @@ { "__type__": "cc.Node", "_name": "hp_min", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 2 @@ -624,7 +636,7 @@ { "__type__": "cc.Node", "_name": "hp_lable", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 2 @@ -804,7 +816,7 @@ { "__type__": "cc.Node", "_name": "hp_max", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 2 @@ -1088,7 +1100,7 @@ { "__type__": "cc.Node", "_name": "exp", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 1 @@ -1151,7 +1163,7 @@ { "__type__": "cc.Node", "_name": "life_bg", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 48 @@ -1205,7 +1217,7 @@ { "__type__": "cc.Node", "_name": "magic", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 49 @@ -1427,7 +1439,7 @@ { "__type__": "cc.Node", "_name": "exp_min", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 48 @@ -1634,7 +1646,7 @@ { "__type__": "cc.Node", "_name": "exp_lable", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 48 @@ -1814,7 +1826,7 @@ { "__type__": "cc.Node", "_name": "exp_max", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 48 @@ -2434,7 +2446,7 @@ { "__type__": "cc.Node", "_name": "exp_min", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 94 @@ -2641,7 +2653,7 @@ { "__type__": "cc.Node", "_name": "exp_lable", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 94 @@ -2821,7 +2833,7 @@ { "__type__": "cc.Node", "_name": "exp_max", - "_objFlags": 512, + "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 94 @@ -3089,27 +3101,24 @@ }, { "__id__": 169 - }, - { - "__id__": 181 } ], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 181 }, { - "__id__": 195 + "__id__": 183 } ], "_prefab": { - "__id__": 197 + "__id__": 185 }, "_lpos": { "__type__": "cc.Vec3", "x": -355, - "y": -595, + "y": -615, "z": 0 }, "_lrot": { @@ -3599,7 +3608,7 @@ }, { "__type__": "cc.Node", - "_name": "suo", + "_name": "suo1", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -3875,7 +3884,7 @@ }, { "__type__": "cc.Node", - "_name": "suo", + "_name": "suo2", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -4095,20 +4104,147 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 138 + }, + "_enabled": true, + "__prefab": { + "__id__": 182 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f8Wc3CjyVFRKGt3+muqvFx" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 138 + }, + "_enabled": true, + "__prefab": { + "__id__": 184 + }, + "_alignFlags": 12, + "_target": null, + "_left": 5, + "_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": "cdqLJH1ixJOLTElVLVR7zr" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2bWbBQbDJGYK+P6RpJy4dz", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", - "_name": "shuaxin", + "_name": "info", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 138 + "__id__": 1 }, "_children": [ { - "__id__": 182 + "__id__": 187 } ], "_active": true, + "_components": [ + { + "__id__": 193 + }, + { + "__id__": 195 + } + ], + "_prefab": { + "__id__": 197 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -355, + "y": -500, + "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": "infobox", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 186 + }, + "_children": [], + "_active": true, "_components": [ { "__id__": 188 @@ -4122,7 +4258,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 600, + "x": 0, "y": 0, "z": 0 }, @@ -4133,6 +4269,632 @@ "z": 0, "w": 1 }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.5, + "y": 0.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__": 187 + }, + "_enabled": true, + "__prefab": { + "__id__": 189 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1180, + "height": 450 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c6wVrx7YhJ/5DuRt52a80C" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 187 + }, + "_enabled": true, + "__prefab": { + "__id__": 191 + }, + "_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": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0.2, + "_fillRange": 0.8, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c5UnppXHFFo7I9Nnl2pc3k" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7aqa+AsfJHSZxmeS5qo8WG", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 194 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8fJ+HVzEFKqYoIUKAnqS/B" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 186 + }, + "_enabled": true, + "__prefab": { + "__id__": 196 + }, + "_alignFlags": 12, + "_target": null, + "_left": 5, + "_right": 0, + "_top": 0, + "_bottom": 140, + "_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": "94BQdNziNG1bdXajFqQ/Ot" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b6q93+ZThEOpnIJa1+q3Yv", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "set", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 199 + }, + { + "__id__": 205 + } + ], + "_active": true, + "_components": [ + { + "__id__": 211 + }, + { + "__id__": 213 + } + ], + "_prefab": { + "__id__": 215 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 245, + "y": -500, + "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": "card1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 198 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 200 + }, + { + "__id__": 202 + } + ], + "_prefab": { + "__id__": 204 + }, + "_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": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 199 + }, + "_enabled": true, + "__prefab": { + "__id__": 201 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f5mVPd90dPOqv12RjT8Ava" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 199 + }, + "_enabled": true, + "__prefab": { + "__id__": 203 + }, + "_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": "26JOKtPGVIxol9HrMXuGJz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0f0Jy53UZNrqvxNb5jE6Du", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "card2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 198 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 206 + }, + { + "__id__": 208 + } + ], + "_prefab": { + "__id__": 210 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 115, + "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__": 205 + }, + "_enabled": true, + "__prefab": { + "__id__": 207 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 110 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cf8+aI6U5PrbZ8V0ub4Hgo" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 205 + }, + "_enabled": true, + "__prefab": { + "__id__": 209 + }, + "_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": "6famDrdyZOQJaR44fTKcou" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1dS3vIBcJGv7j8AFzk01vB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 198 + }, + "_enabled": true, + "__prefab": { + "__id__": 212 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 110, + "height": 225 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8400aci7pPmpNf2TePwnSi" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 198 + }, + "_enabled": true, + "__prefab": { + "__id__": 214 + }, + "_alignFlags": 36, + "_target": null, + "_left": 0, + "_right": 5, + "_top": 0, + "_bottom": 140, + "_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": "1fed5Fd11NIZOMIX4GGuBE" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fcT1m524FMVrsrLYg0iELa", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "shuaxin", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 217 + } + ], + "_active": true, + "_components": [ + { + "__id__": 223 + }, + { + "__id__": 225 + }, + { + "__id__": 227 + } + ], + "_prefab": { + "__id__": 229 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 245, + "y": -615, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, "_lscale": { "__type__": "cc.Vec3", "x": 1, @@ -4155,20 +4917,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 181 + "__id__": 216 }, "_children": [], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 218 }, { - "__id__": 185 + "__id__": 220 } ], "_prefab": { - "__id__": 187 + "__id__": 222 }, "_lpos": { "__type__": "cc.Vec3", @@ -4205,11 +4967,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 219 }, "_contentSize": { "__type__": "cc.Size", @@ -4233,11 +4995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 182 + "__id__": 217 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 221 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4291,11 +5053,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 224 }, "_contentSize": { "__type__": "cc.Size", @@ -4319,11 +5081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 181 + "__id__": 216 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 226 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4358,6 +5120,42 @@ "__type__": "cc.CompPrefabInfo", "fileId": "f1bTVR5PlHPouHSj2gWbtW" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 216 + }, + "_enabled": true, + "__prefab": { + "__id__": 228 + }, + "_alignFlags": 36, + "_target": null, + "_left": -5, + "_right": 5, + "_top": 0, + "_bottom": 25, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 110, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31TBZjSH1CsrWYpi2HbXlS" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -4367,24 +5165,193 @@ "__id__": 0 }, "fileId": "33mgkxyztG/IS7c+kJz2WK", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "sxp", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 231 + } + ], + "_active": true, + "_components": [ + { + "__id__": 249 + }, + { + "__id__": 251 + } + ], + "_prefab": { + "__id__": 253 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -355, + "y": -635, + "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": "pro_progress", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 230 + }, + "_children": [ + { + "__id__": 232 + } + ], + "_active": true, + "_components": [ + { + "__id__": 238 + }, + { + "__id__": 240 + }, + { + "__id__": 242 + }, + { + "__id__": 244 + }, + { + "__id__": 246 + } + ], + "_prefab": { + "__id__": 248 + }, + "_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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "pro_bar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 231 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 233 + }, + { + "__id__": 235 + } + ], + "_prefab": { + "__id__": 237 + }, + "_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": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", - "_name": "", + "_name": "Sprite", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 232 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 234 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 + "width": 710, + "height": 15 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4395,7 +5362,191 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "f8Wc3CjyVFRKGt3+muqvFx" + "fileId": "37ghf+9y1KibPINSUKT3dB" + }, + { + "__type__": "cc.Sprite", + "_name": "Sprite", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 232 + }, + "_enabled": true, + "__prefab": { + "__id__": 236 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "9716cf6d-cc08-452b-8c72-13d63c89aac2@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 3, + "_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": "044t35RnVF/YsSKSRZUpom" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e90jJBsWhE+bTC/rL0g+UF", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 231 + }, + "_enabled": true, + "__prefab": { + "__id__": 239 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 710, + "height": 15 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20u6NOuwJPfZ5t1CUYnIM1" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 231 + }, + "_enabled": true, + "__prefab": { + "__id__": 241 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "eac8f388-79c5-438f-9602-d9bdac7a5d12@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": "6cMZU/pLRNKYFwdlHONJrO" + }, + { + "__type__": "cc.ProgressBar", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 231 + }, + "_enabled": true, + "__prefab": { + "__id__": 243 + }, + "_barSprite": { + "__id__": 235 + }, + "_mode": 2, + "_totalLength": 1, + "_progress": 0, + "_reverse": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "fcQdWVTk9EB7j9/1WENjq6" + }, + { + "__type__": "2a50eqI7JZNV5Sh0y/Qd9C6", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 231 + }, + "_enabled": true, + "__prefab": { + "__id__": 245 + }, + "controller": false, + "watchPath": "", + "componentName": "cc.ProgressBar", + "componentProperty": "progress", + "refreshRate": 0.1, + "watchPathArr": [ + "data.shuaxin.min", + "data.shuaxin.max" + ], + "stringFormat": "", + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2aufDK2rtPG7YVEYv7Km03" }, { "__type__": "cc.Widget", @@ -4403,18 +5554,18 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 138 + "__id__": 231 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 247 }, - "_alignFlags": 12, + "_alignFlags": 4, "_target": null, - "_left": 5, + "_left": 0, "_right": 0, "_top": 0, - "_bottom": 45, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -4431,7 +5582,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cdqLJH1ixJOLTElVLVR7zr" + "fileId": "0cWeSHLKpP4JnkEQiBgw9E" }, { "__type__": "cc.PrefabInfo", @@ -4441,7 +5592,84 @@ "asset": { "__id__": 0 }, - "fileId": "2bWbBQbDJGYK+P6RpJy4dz", + "fileId": "f12gXQ9bFOkp51/ApkfbD7", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 230 + }, + "_enabled": true, + "__prefab": { + "__id__": 250 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1065, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "33jxE1PDJGr6sCHHPiHh90" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 230 + }, + "_enabled": true, + "__prefab": { + "__id__": 252 + }, + "_alignFlags": 44, + "_target": null, + "_left": 5, + "_right": -350, + "_top": 0, + "_bottom": 5, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "87lTRPigVLdqQlzbF88M+p" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "48c0kP20hBJLGVzQJucqoy", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -4456,7 +5684,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 255 }, "_contentSize": { "__type__": "cc.Size", @@ -4484,7 +5712,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 201 + "__id__": 257 }, "_alignFlags": 45, "_target": null, @@ -4520,7 +5748,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 259 }, "_id": "" }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index dd97e22f..38637bd1 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -38,7 +38,7 @@ export class SingletonModuleComp extends ecs.Comp { /** 下级经验 */ speed : 0, hp: { - min:30, + min:20, max:30 }, power: { @@ -49,6 +49,11 @@ export class SingletonModuleComp extends ecs.Comp { min: 0, max: 10 }, + shuaxin: { + min: 0, + max: 20, + speed:1, + }, }; vmAdd() { diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts index 2544f0c9..3215f9ab 100644 --- a/assets/script/game/map/view/MapViewComp.ts +++ b/assets/script/game/map/view/MapViewComp.ts @@ -28,9 +28,10 @@ export class MapViewComp extends CCComp { onLoad(){ // 监听全局事件 oops.message.on("monster_load", this.onMonsterLoaded, this); + this.addHero(); } private onMonsterLoaded(event: string, args: any) { - console.log('on_monster_load'); + // console.log('on_monster_load'); } reset(): void { @@ -43,16 +44,20 @@ export class MapViewComp extends CCComp { /** 转场 */ protected update(dt: number): void { - if (this.timer.update(dt)) { - // console.log('每2秒触发一次'); - this.addHero(); - } + + this.shuaxin(dt) } private mapLoaded() { } - + shuaxin(dt: number) { + smc.vm_data.shuaxin.min += smc.vm_data.shuaxin.speed*dt; + if (smc.vm_data.shuaxin.min >= smc.vm_data.shuaxin.max) { + smc.vm_data.shuaxin.min = 0; + this.addHero(); + } + } /** 添加玩家 */ private addHero() { this.scene.node.active = true