diff --git a/.DS_Store b/.DS_Store index df5456b..e1c746a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.creator/default-meta.json b/.creator/default-meta.json index 7bbbd06..abb1239 100644 --- a/.creator/default-meta.json +++ b/.creator/default-meta.json @@ -1,5 +1,5 @@ { "image": { - "type": "texture" + "type": "sprite-frame" } } diff --git a/.gitignore b/.gitignore index a231b3f..9c87d20 100644 --- a/.gitignore +++ b/.gitignore @@ -11,14 +11,4 @@ native #////////////////////////// # NPM #////////////////////////// -node_modules/ - -#////////////////////////// -# VSCode -#////////////////////////// -.vscode/ - -#////////////////////////// -# WebStorm -#////////////////////////// -.idea/ \ No newline at end of file +node_modules/ \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..f021dc9 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,62 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..79ee123 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..7c4836f --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/jdt-fish-client.iml b/.idea/jdt-fish-client.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/jdt-fish-client.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..d23208f --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml new file mode 100644 index 0000000..541945b --- /dev/null +++ b/.idea/jsLinters/eslint.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..79c0440 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..9efdf9f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml new file mode 100644 index 0000000..b0c1c68 --- /dev/null +++ b/.idea/prettier.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/assets/.DS_Store b/assets/.DS_Store index 0a47bfe..09aba25 100644 Binary files a/assets/.DS_Store and b/assets/.DS_Store differ diff --git a/assets/FishSingle/.DS_Store b/assets/FishSingle/.DS_Store index 77f7ab5..c4f6b2b 100644 Binary files a/assets/FishSingle/.DS_Store and b/assets/FishSingle/.DS_Store differ diff --git a/assets/FishSingle/animation/Click Effect.prefab b/assets/FishSingle/animation/Click Effect.prefab index 096b3d6..8fb2620 100644 --- a/assets/FishSingle/animation/Click Effect.prefab +++ b/assets/FishSingle/animation/Click Effect.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Click Effect", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Click Effect", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -55,6 +55,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -62,15 +63,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -79,9 +78,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -104,9 +103,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "7f560c03-1db2-49db-abb7-65e14eed3ef5" - }, + "_atlas": null, "_id": "" }, { @@ -117,6 +114,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -127,11 +125,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "71a28c77-5924-40de-9a2e-df84682de9a6" + "__uuid__": "71a28c77-5924-40de-9a2e-df84682de9a6", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "71a28c77-5924-40de-9a2e-df84682de9a6" + "__uuid__": "71a28c77-5924-40de-9a2e-df84682de9a6", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -143,6 +143,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -150,7 +151,8 @@ "__prefab": { "__id__": 7 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -160,6 +162,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -167,7 +170,6 @@ "__prefab": { "__id__": 9 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 40, @@ -177,7 +179,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -191,6 +194,8 @@ "asset": { "__id__": 0 }, - "fileId": "04Iog1bgRF3oo4bMCXFBTg" + "fileId": "04Iog1bgRF3oo4bMCXFBTg", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/.DS_Store b/assets/FishSingle/fish/.DS_Store index b43d722..f548dd3 100644 Binary files a/assets/FishSingle/fish/.DS_Store and b/assets/FishSingle/fish/.DS_Store differ diff --git a/assets/FishSingle/fish/pic/.DS_Store b/assets/FishSingle/fish/pic/.DS_Store new file mode 100644 index 0000000..a6b920b Binary files /dev/null and b/assets/FishSingle/fish/pic/.DS_Store differ diff --git a/assets/FishSingle/fish/pic/weapon_level_3_0.png b/assets/FishSingle/fish/pic/weapon_level_3_0.png new file mode 100644 index 0000000..aa81f00 Binary files /dev/null and b/assets/FishSingle/fish/pic/weapon_level_3_0.png differ diff --git a/assets/FishSingle/fish/pic/weapon_level_3_0.png.meta b/assets/FishSingle/fish/pic/weapon_level_3_0.png.meta new file mode 100644 index 0000000..005b081 --- /dev/null +++ b/assets/FishSingle/fish/pic/weapon_level_3_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd@6c48a", + "displayName": "weapon_level_3_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd@f9941", + "displayName": "weapon_level_3_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 51, + "height": 69, + "rawWidth": 51, + "rawHeight": 69, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -25.5, + -34.5, + 0, + 25.5, + -34.5, + 0, + -25.5, + 34.5, + 0, + 25.5, + 34.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 69, + 51, + 69, + 0, + 0, + 51, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -25.5, + -34.5, + 0 + ], + "maxPos": [ + 25.5, + 34.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd@f9941" + } +} diff --git a/assets/FishSingle/fish/pic/weapon_level_4_0.png b/assets/FishSingle/fish/pic/weapon_level_4_0.png new file mode 100644 index 0000000..010dd08 Binary files /dev/null and b/assets/FishSingle/fish/pic/weapon_level_4_0.png differ diff --git a/assets/FishSingle/fish/pic/weapon_level_4_0.png.meta b/assets/FishSingle/fish/pic/weapon_level_4_0.png.meta new file mode 100644 index 0000000..4031370 --- /dev/null +++ b/assets/FishSingle/fish/pic/weapon_level_4_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60@6c48a", + "displayName": "weapon_level_4_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60@f9941", + "displayName": "weapon_level_4_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 54, + "height": 71, + "rawWidth": 54, + "rawHeight": 71, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -27, + -35.5, + 0, + 27, + -35.5, + 0, + -27, + 35.5, + 0, + 27, + 35.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 71, + 54, + 71, + 0, + 0, + 54, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -27, + -35.5, + 0 + ], + "maxPos": [ + 27, + 35.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60@f9941" + } +} diff --git a/assets/FishSingle/fish/pic/weapon_level_5_0.png b/assets/FishSingle/fish/pic/weapon_level_5_0.png new file mode 100644 index 0000000..ae7accc Binary files /dev/null and b/assets/FishSingle/fish/pic/weapon_level_5_0.png differ diff --git a/assets/FishSingle/fish/pic/weapon_level_5_0.png.meta b/assets/FishSingle/fish/pic/weapon_level_5_0.png.meta new file mode 100644 index 0000000..277316d --- /dev/null +++ b/assets/FishSingle/fish/pic/weapon_level_5_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "c6812ce7-61f0-40f9-aa8f-d1121cc713df", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "c6812ce7-61f0-40f9-aa8f-d1121cc713df@6c48a", + "displayName": "weapon_level_5_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "c6812ce7-61f0-40f9-aa8f-d1121cc713df", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "c6812ce7-61f0-40f9-aa8f-d1121cc713df@f9941", + "displayName": "weapon_level_5_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 57, + "height": 75, + "rawWidth": 57, + "rawHeight": 75, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -28.5, + -37.5, + 0, + 28.5, + -37.5, + 0, + -28.5, + 37.5, + 0, + 28.5, + 37.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 75, + 57, + 75, + 0, + 0, + 57, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -28.5, + -37.5, + 0 + ], + "maxPos": [ + 28.5, + 37.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "c6812ce7-61f0-40f9-aa8f-d1121cc713df@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "c6812ce7-61f0-40f9-aa8f-d1121cc713df@f9941" + } +} diff --git a/assets/FishSingle/fish/pic/weapon_level_6_0.png b/assets/FishSingle/fish/pic/weapon_level_6_0.png new file mode 100644 index 0000000..ca37626 Binary files /dev/null and b/assets/FishSingle/fish/pic/weapon_level_6_0.png differ diff --git a/assets/FishSingle/fish/pic/weapon_level_6_0.png.meta b/assets/FishSingle/fish/pic/weapon_level_6_0.png.meta new file mode 100644 index 0000000..2be5bd0 --- /dev/null +++ b/assets/FishSingle/fish/pic/weapon_level_6_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "62538856-6491-4ae4-a146-7a5d73c776e6", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "62538856-6491-4ae4-a146-7a5d73c776e6@6c48a", + "displayName": "weapon_level_6_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "62538856-6491-4ae4-a146-7a5d73c776e6", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "62538856-6491-4ae4-a146-7a5d73c776e6@f9941", + "displayName": "weapon_level_6_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 59, + "height": 80, + "rawWidth": 59, + "rawHeight": 80, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -29.5, + -40, + 0, + 29.5, + -40, + 0, + -29.5, + 40, + 0, + 29.5, + 40, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 80, + 59, + 80, + 0, + 0, + 59, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -29.5, + -40, + 0 + ], + "maxPos": [ + 29.5, + 40, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "62538856-6491-4ae4-a146-7a5d73c776e6@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "62538856-6491-4ae4-a146-7a5d73c776e6@f9941" + } +} diff --git a/assets/FishSingle/fish/pic/weapon_level_7_0.png b/assets/FishSingle/fish/pic/weapon_level_7_0.png new file mode 100644 index 0000000..620bb99 Binary files /dev/null and b/assets/FishSingle/fish/pic/weapon_level_7_0.png differ diff --git a/assets/FishSingle/fish/pic/weapon_level_7_0.png.meta b/assets/FishSingle/fish/pic/weapon_level_7_0.png.meta new file mode 100644 index 0000000..87babdf --- /dev/null +++ b/assets/FishSingle/fish/pic/weapon_level_7_0.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5@6c48a", + "displayName": "weapon_level_7_0", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5@f9941", + "displayName": "weapon_level_7_0", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 63, + "height": 87, + "rawWidth": 63, + "rawHeight": 87, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -31.5, + -43.5, + 0, + 31.5, + -43.5, + 0, + -31.5, + 43.5, + 0, + 31.5, + 43.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 87, + 63, + 87, + 0, + 0, + 63, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -31.5, + -43.5, + 0 + ], + "maxPos": [ + 31.5, + 43.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5@f9941" + } +} diff --git a/assets/FishSingle/fish/prefab/fish/Fish1.prefab b/assets/FishSingle/fish/prefab/fish/Fish1.prefab index b34e22e..1637002 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish1.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish1.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish1", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish1", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "93c2f724-ed94-4f0c-a8ca-7f6a303c15be@9755b" + "__uuid__": "93c2f724-ed94-4f0c-a8ca-7f6a303c15be@9755b", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "93c2f724-ed94-4f0c-a8ca-7f6a303c15be" + "__uuid__": "93c2f724-ed94-4f0c-a8ca-7f6a303c15be", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "f0d73212-6204-4066-a320-9f69893989cd" + "__uuid__": "f0d73212-6204-4066-a320-9f69893989cd", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "f0d73212-6204-4066-a320-9f69893989cd" + "__uuid__": "f0d73212-6204-4066-a320-9f69893989cd", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 1, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 1, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 72, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish10.prefab b/assets/FishSingle/fish/prefab/fish/Fish10.prefab index d6ce11a..7ed1165 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish10.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish10.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish10", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish10", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d2126827-fe71-4739-9c2e-eead63785b23@e6f1d" + "__uuid__": "d2126827-fe71-4739-9c2e-eead63785b23@e6f1d", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "d2126827-fe71-4739-9c2e-eead63785b23" + "__uuid__": "d2126827-fe71-4739-9c2e-eead63785b23", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "e17a527d-4428-40a7-9683-7ad523432897" + "__uuid__": "e17a527d-4428-40a7-9683-7ad523432897", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "e17a527d-4428-40a7-9683-7ad523432897" + "__uuid__": "e17a527d-4428-40a7-9683-7ad523432897", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 10, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 10, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 118, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish11.prefab b/assets/FishSingle/fish/prefab/fish/Fish11.prefab index 587fa3a..e460696 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish11.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish11.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish11", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish11", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 11, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 11, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish12.prefab b/assets/FishSingle/fish/prefab/fish/Fish12.prefab index b8d6e6e..5d4d1da 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish12.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish12.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish12", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish12", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2e4e01b9-8a30-4d74-8aed-1b2704a795cc@f3e0e" + "__uuid__": "2e4e01b9-8a30-4d74-8aed-1b2704a795cc@f3e0e", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "2e4e01b9-8a30-4d74-8aed-1b2704a795cc" + "__uuid__": "2e4e01b9-8a30-4d74-8aed-1b2704a795cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "71cb744b-ea83-4d5a-8516-215e397dfdaa" + "__uuid__": "71cb744b-ea83-4d5a-8516-215e397dfdaa", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "71cb744b-ea83-4d5a-8516-215e397dfdaa" + "__uuid__": "71cb744b-ea83-4d5a-8516-215e397dfdaa", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 12, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 12, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 140, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish13.prefab b/assets/FishSingle/fish/prefab/fish/Fish13.prefab index aae53ac..8f07077 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish13.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish13.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish13", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish13", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "352c9803-6c53-4d8f-ba10-deec62a91cda@11aa1" + "__uuid__": "352c9803-6c53-4d8f-ba10-deec62a91cda@11aa1", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "352c9803-6c53-4d8f-ba10-deec62a91cda" + "__uuid__": "352c9803-6c53-4d8f-ba10-deec62a91cda", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "42b329aa-ff32-47cd-8b3c-88b068c0dfb3" + "__uuid__": "42b329aa-ff32-47cd-8b3c-88b068c0dfb3", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "42b329aa-ff32-47cd-8b3c-88b068c0dfb3" + "__uuid__": "42b329aa-ff32-47cd-8b3c-88b068c0dfb3", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 13, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 13, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 187, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish14.prefab b/assets/FishSingle/fish/prefab/fish/Fish14.prefab index 2563575..223280c 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish14.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish14.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish14", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish14", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48@40c7c" + "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48@40c7c", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48" + "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1" + "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1" + "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 14, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 14, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 72, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish15.prefab b/assets/FishSingle/fish/prefab/fish/Fish15.prefab index fc77253..979119c 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish15.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish15.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish15", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish15", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e42f83bb-200e-445e-a9b5-7dbb8a331f57@4cf03" + "__uuid__": "e42f83bb-200e-445e-a9b5-7dbb8a331f57@4cf03", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "e42f83bb-200e-445e-a9b5-7dbb8a331f57" + "__uuid__": "e42f83bb-200e-445e-a9b5-7dbb8a331f57", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "69f18979-51b5-47d3-bfb1-0d7df4592a44" + "__uuid__": "69f18979-51b5-47d3-bfb1-0d7df4592a44", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "69f18979-51b5-47d3-bfb1-0d7df4592a44" + "__uuid__": "69f18979-51b5-47d3-bfb1-0d7df4592a44", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 15, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 15, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 280, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish16.prefab b/assets/FishSingle/fish/prefab/fish/Fish16.prefab index ea95154..90ee262 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish16.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish16.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish16", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish16", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "5be2479e-33c7-4c76-93be-e25b5f6dc729@942cf" + "__uuid__": "5be2479e-33c7-4c76-93be-e25b5f6dc729@942cf", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "5be2479e-33c7-4c76-93be-e25b5f6dc729" + "__uuid__": "5be2479e-33c7-4c76-93be-e25b5f6dc729", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "71c51c0e-ec84-453b-8eec-797c3380f73c" + "__uuid__": "71c51c0e-ec84-453b-8eec-797c3380f73c", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "71c51c0e-ec84-453b-8eec-797c3380f73c" + "__uuid__": "71c51c0e-ec84-453b-8eec-797c3380f73c", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 16, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 16, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 340, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish17.prefab b/assets/FishSingle/fish/prefab/fish/Fish17.prefab index 50713b5..a7727f8 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish17.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish17.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish17", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish17", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [ { @@ -76,10 +76,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.5, + "y": 1.5, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -87,15 +88,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Node", "_name": "Aura Tail", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -134,6 +133,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -141,15 +141,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -158,9 +156,9 @@ "__id__": 4 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -171,7 +169,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -186,7 +185,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -198,6 +198,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -205,7 +206,8 @@ "__prefab": { "__id__": 6 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -215,6 +217,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -222,7 +225,6 @@ "__prefab": { "__id__": 8 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 128, @@ -232,7 +234,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -246,12 +249,16 @@ "asset": { "__id__": 0 }, - "fileId": "e9KE2M+HlNGLuowgNFtVvB" + "fileId": "e9KE2M+HlNGLuowgNFtVvB", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Aura Middle", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -290,6 +297,7 @@ "y": 1.4, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -297,15 +305,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -314,9 +320,9 @@ "__id__": 12 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -327,7 +333,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -342,7 +349,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -354,6 +362,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -361,7 +370,8 @@ "__prefab": { "__id__": 14 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -371,6 +381,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -378,7 +389,6 @@ "__prefab": { "__id__": 16 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 128, @@ -388,7 +398,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -402,12 +413,16 @@ "asset": { "__id__": 0 }, - "fileId": "e8yB5mEDdNLacMF2+YdPE2" + "fileId": "e8yB5mEDdNLacMF2+YdPE2", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Aura Head", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -446,6 +461,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -453,15 +469,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -470,9 +484,9 @@ "__id__": 20 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -483,7 +497,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@bd0d8", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -498,7 +513,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -510,6 +526,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -517,7 +534,8 @@ "__prefab": { "__id__": 22 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -527,6 +545,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -534,7 +553,6 @@ "__prefab": { "__id__": 24 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 128, @@ -544,7 +562,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -558,12 +577,16 @@ "asset": { "__id__": 0 }, - "fileId": "c8pMDib3FCu60byqzGdcvX" + "fileId": "c8pMDib3FCu60byqzGdcvX", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish Tail", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -605,6 +628,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -612,15 +636,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -629,9 +651,9 @@ "__id__": 28 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -642,7 +664,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -657,7 +680,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -669,6 +693,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -679,11 +704,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -695,6 +722,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -702,7 +730,8 @@ "__prefab": { "__id__": 32 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -712,6 +741,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -719,7 +749,6 @@ "__prefab": { "__id__": 34 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -729,7 +758,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -743,12 +773,16 @@ "asset": { "__id__": 0 }, - "fileId": "d7fdXt81lDULlkr6FtD9cc" + "fileId": "d7fdXt81lDULlkr6FtD9cc", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish Middle", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -790,6 +824,7 @@ "y": 2.2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -797,15 +832,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 36 }, @@ -814,9 +847,9 @@ "__id__": 38 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -827,7 +860,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48@40c7c" + "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48@40c7c", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -842,7 +876,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48" + "__uuid__": "3b3e5578-dce9-43ce-a813-9a37e0d45e48", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -854,6 +889,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 36 }, @@ -864,11 +900,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1" + "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1" + "__uuid__": "9c12558b-de44-410f-b49f-5853230941b1", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -880,6 +918,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 36 }, @@ -887,7 +926,8 @@ "__prefab": { "__id__": 42 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -897,6 +937,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 36 }, @@ -904,7 +945,6 @@ "__prefab": { "__id__": 44 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 72, @@ -914,7 +954,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -928,12 +969,16 @@ "asset": { "__id__": 0 }, - "fileId": "0aJ104ErlOB7J60SIDGmL0" + "fileId": "0aJ104ErlOB7J60SIDGmL0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish Head", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -975,6 +1020,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -982,15 +1028,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 46 }, @@ -999,9 +1043,9 @@ "__id__": 48 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -1012,7 +1056,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1027,7 +1072,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -1039,6 +1085,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 46 }, @@ -1049,11 +1096,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1065,6 +1114,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 46 }, @@ -1072,7 +1122,8 @@ "__prefab": { "__id__": 52 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1082,6 +1133,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 46 }, @@ -1089,7 +1141,6 @@ "__prefab": { "__id__": 54 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -1099,7 +1150,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1113,12 +1165,16 @@ "asset": { "__id__": 0 }, - "fileId": "2cGbGc0mNJp6NBBV1eaSjV" + "fileId": "2cGbGc0mNJp6NBBV1eaSjV", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1129,11 +1185,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "d634b6d3-5dbf-48c9-a0bc-61977878c8e7" + "__uuid__": "d634b6d3-5dbf-48c9-a0bc-61977878c8e7", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "d634b6d3-5dbf-48c9-a0bc-61977878c8e7" + "__uuid__": "d634b6d3-5dbf-48c9-a0bc-61977878c8e7", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1145,6 +1203,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1178,16 +1237,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 17, - "speed": 3, - "_id": "", "__prefab": { "__id__": 61 - } + }, + "fishType": 17, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1197,14 +1257,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 63 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1214,6 +1275,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1221,7 +1283,8 @@ "__prefab": { "__id__": 65 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1231,6 +1294,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1238,7 +1302,6 @@ "__prefab": { "__id__": 67 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 390, @@ -1248,7 +1311,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1262,6 +1326,8 @@ "asset": { "__id__": 0 }, - "fileId": "16XB8pfHBIELcPmfMvv/nD" + "fileId": "16XB8pfHBIELcPmfMvv/nD", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish18.prefab b/assets/FishSingle/fish/prefab/fish/Fish18.prefab index 0def64c..14adf7f 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish18.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish18.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish18", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish18", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "91a85e7e-2d0a-4294-8cb0-53478537bc55@6e2fd" + "__uuid__": "91a85e7e-2d0a-4294-8cb0-53478537bc55@6e2fd", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "91a85e7e-2d0a-4294-8cb0-53478537bc55" + "__uuid__": "91a85e7e-2d0a-4294-8cb0-53478537bc55", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "2485429c-f56b-4248-b865-ed51e490c8a8" + "__uuid__": "2485429c-f56b-4248-b865-ed51e490c8a8", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "2485429c-f56b-4248-b865-ed51e490c8a8" + "__uuid__": "2485429c-f56b-4248-b865-ed51e490c8a8", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 18, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 18, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 160, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish19.prefab b/assets/FishSingle/fish/prefab/fish/Fish19.prefab index 8b34675..26641e9 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish19.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish19.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish19", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish19", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [ { @@ -85,10 +85,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -96,15 +97,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Node", "_name": "Aura2", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -143,6 +142,7 @@ "y": 0.6, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -150,15 +150,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -167,9 +165,9 @@ "__id__": 4 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -180,7 +178,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -195,7 +194,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -207,6 +207,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -214,7 +215,8 @@ "__prefab": { "__id__": 6 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -224,6 +226,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -231,7 +234,6 @@ "__prefab": { "__id__": 8 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 236, @@ -241,7 +243,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -255,12 +258,16 @@ "asset": { "__id__": 0 }, - "fileId": "e06THoZYdLIIO6nEcaoZdT" + "fileId": "e06THoZYdLIIO6nEcaoZdT", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Aura3", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -299,6 +306,7 @@ "y": 0.6, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -306,15 +314,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -323,9 +329,9 @@ "__id__": 12 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -336,7 +342,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -351,7 +358,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -363,6 +371,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -370,7 +379,8 @@ "__prefab": { "__id__": 14 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -380,6 +390,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 10 }, @@ -387,7 +398,6 @@ "__prefab": { "__id__": 16 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 236, @@ -397,7 +407,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -411,12 +422,16 @@ "asset": { "__id__": 0 }, - "fileId": "17gL13SS1G+Zx+0QPTCmrj" + "fileId": "17gL13SS1G+Zx+0QPTCmrj", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Aura1", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -455,6 +470,7 @@ "y": 0.6, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -462,15 +478,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -479,9 +493,9 @@ "__id__": 20 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -492,7 +506,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -507,7 +522,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -519,6 +535,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -526,7 +543,8 @@ "__prefab": { "__id__": 22 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -536,6 +554,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 18 }, @@ -543,7 +562,6 @@ "__prefab": { "__id__": 24 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 236, @@ -553,7 +571,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -567,12 +586,16 @@ "asset": { "__id__": 0 }, - "fileId": "b3E4Jlg5JMZ5KpwKpILYbx" + "fileId": "b3E4Jlg5JMZ5KpwKpILYbx", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Aura4", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -611,6 +634,7 @@ "y": 0.6, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -618,15 +642,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -635,9 +657,9 @@ "__id__": 28 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -648,7 +670,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b@6efe6", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -663,7 +686,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b" + "__uuid__": "21b441a6-ca90-4dad-a919-b3a4524d720b", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -675,6 +699,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -682,7 +707,8 @@ "__prefab": { "__id__": 30 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -692,6 +718,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 26 }, @@ -699,7 +726,6 @@ "__prefab": { "__id__": 32 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 236, @@ -709,7 +735,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -723,12 +750,16 @@ "asset": { "__id__": 0 }, - "fileId": "4aOpwYuLZOEbmehYL6Q+QR" + "fileId": "4aOpwYuLZOEbmehYL6Q+QR", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish2", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -770,6 +801,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -777,15 +809,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 34 }, @@ -794,9 +824,9 @@ "__id__": 36 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -807,7 +837,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -822,7 +853,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -834,6 +866,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 34 }, @@ -844,11 +877,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -860,6 +895,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 34 }, @@ -867,7 +903,8 @@ "__prefab": { "__id__": 40 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -877,6 +914,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 34 }, @@ -884,7 +922,6 @@ "__prefab": { "__id__": 42 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -894,7 +931,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -908,12 +946,16 @@ "asset": { "__id__": 0 }, - "fileId": "33Y6CY48lH6r1sNhZukL62" + "fileId": "33Y6CY48lH6r1sNhZukL62", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish3", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -955,6 +997,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -962,15 +1005,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 44 }, @@ -979,9 +1020,9 @@ "__id__": 46 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -992,7 +1033,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1007,7 +1049,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -1019,6 +1062,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 44 }, @@ -1029,11 +1073,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1045,6 +1091,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 44 }, @@ -1052,7 +1099,8 @@ "__prefab": { "__id__": 50 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1062,6 +1110,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 44 }, @@ -1069,7 +1118,6 @@ "__prefab": { "__id__": 52 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -1079,7 +1127,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1093,12 +1142,16 @@ "asset": { "__id__": 0 }, - "fileId": "2bxNTtFatJJLMf+plVpDBQ" + "fileId": "2bxNTtFatJJLMf+plVpDBQ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish1", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -1140,6 +1193,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -1147,15 +1201,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 54 }, @@ -1164,9 +1216,9 @@ "__id__": 56 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -1177,7 +1229,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1192,7 +1245,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -1204,6 +1258,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 54 }, @@ -1214,11 +1269,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1230,6 +1287,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 54 }, @@ -1237,7 +1295,8 @@ "__prefab": { "__id__": 60 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1247,6 +1306,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 54 }, @@ -1254,7 +1314,6 @@ "__prefab": { "__id__": 62 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -1264,7 +1323,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1278,12 +1338,16 @@ "asset": { "__id__": 0 }, - "fileId": "851FCVHcxGUbDWB0tc9Ykg" + "fileId": "851FCVHcxGUbDWB0tc9Ykg", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Node", "_name": "Fish4", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -1325,6 +1389,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -1332,15 +1397,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 64 }, @@ -1349,9 +1412,9 @@ "__id__": 66 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -1362,7 +1425,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc@5a942", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -1377,7 +1441,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc" + "__uuid__": "065231ca-a207-4363-bba0-7786e89733cc", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -1389,6 +1454,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 64 }, @@ -1399,11 +1465,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337" + "__uuid__": "5d6f772a-d206-41b3-88d7-af08f2a9c337", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1415,6 +1483,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 64 }, @@ -1422,7 +1491,8 @@ "__prefab": { "__id__": 70 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1432,6 +1502,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 64 }, @@ -1439,7 +1510,6 @@ "__prefab": { "__id__": 72 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -1449,7 +1519,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1463,12 +1534,16 @@ "asset": { "__id__": 0 }, - "fileId": "caIm6MPgBH+bwu9j/O8Xi0" + "fileId": "caIm6MPgBH+bwu9j/O8Xi0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1479,11 +1554,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "d6d4dc61-7fcc-44b5-88a6-b54b48798e4c" + "__uuid__": "d6d4dc61-7fcc-44b5-88a6-b54b48798e4c", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "d6d4dc61-7fcc-44b5-88a6-b54b48798e4c" + "__uuid__": "d6d4dc61-7fcc-44b5-88a6-b54b48798e4c", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -1495,6 +1572,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1528,6 +1606,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1561,16 +1640,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 19, - "speed": 3, - "_id": "", "__prefab": { "__id__": 81 - } + }, + "fishType": 19, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1580,14 +1660,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 83 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1597,6 +1678,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1604,7 +1686,8 @@ "__prefab": { "__id__": 85 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1614,6 +1697,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -1621,7 +1705,6 @@ "__prefab": { "__id__": 87 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 320, @@ -1631,7 +1714,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -1645,6 +1729,8 @@ "asset": { "__id__": 0 }, - "fileId": "f7Bu1JvFVBN4iilKrUv6bE" + "fileId": "f7Bu1JvFVBN4iilKrUv6bE", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish2.prefab b/assets/FishSingle/fish/prefab/fish/Fish2.prefab index 8ddffff..894eddc 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish2.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish2.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish2", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish2", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9db8c528-dae8-4e5a-a35b-43406ae12486@a9841" + "__uuid__": "9db8c528-dae8-4e5a-a35b-43406ae12486@a9841", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "9db8c528-dae8-4e5a-a35b-43406ae12486" + "__uuid__": "9db8c528-dae8-4e5a-a35b-43406ae12486", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "3d05305d-6627-4e0c-9511-cd01676d144c" + "__uuid__": "3d05305d-6627-4e0c-9511-cd01676d144c", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "3d05305d-6627-4e0c-9511-cd01676d144c" + "__uuid__": "3d05305d-6627-4e0c-9511-cd01676d144c", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 2, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 2, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 82, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish20.prefab b/assets/FishSingle/fish/prefab/fish/Fish20.prefab index d3d73c2..22eb83b 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish20.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish20.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish20", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish20", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "4c39bae7-e304-433f-90d1-b01f8ce1f50d@53e28" + "__uuid__": "4c39bae7-e304-433f-90d1-b01f8ce1f50d@53e28", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "4c39bae7-e304-433f-90d1-b01f8ce1f50d" + "__uuid__": "4c39bae7-e304-433f-90d1-b01f8ce1f50d", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "27e6df97-4896-42ca-abe6-34554eee08fc" + "__uuid__": "27e6df97-4896-42ca-abe6-34554eee08fc", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "27e6df97-4896-42ca-abe6-34554eee08fc" + "__uuid__": "27e6df97-4896-42ca-abe6-34554eee08fc", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 20, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 20, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 380, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish24.prefab b/assets/FishSingle/fish/prefab/fish/Fish24.prefab index 59e1dc0..39c5d86 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish24.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish24.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish24", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish24", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [ { @@ -65,6 +65,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -72,15 +73,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Node", "_name": "Sprite", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 1 }, @@ -119,6 +118,7 @@ "y": 1, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -126,15 +126,13 @@ "y": 0, "z": 90 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -143,9 +141,9 @@ "__id__": 4 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -156,7 +154,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "e0530ef6-394e-4c6c-9615-375bc9a13a21@5abcb" + "__uuid__": "e0530ef6-394e-4c6c-9615-375bc9a13a21@5abcb", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -171,7 +170,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "e0530ef6-394e-4c6c-9615-375bc9a13a21" + "__uuid__": "e0530ef6-394e-4c6c-9615-375bc9a13a21", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -183,6 +183,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -190,7 +191,8 @@ "__prefab": { "__id__": 6 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -200,6 +202,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 2 }, @@ -207,7 +210,6 @@ "__prefab": { "__id__": 8 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 160, @@ -217,7 +219,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -231,12 +234,16 @@ "asset": { "__id__": 0 }, - "fileId": "2eGfPyradLS4VS8RlEF/Fb" + "fileId": "2eGfPyradLS4VS8RlEF/Fb", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null }, { "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -270,6 +277,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -280,11 +288,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "063d7bdc-6650-4b40-a7f7-9afc4a3deb4a" + "__uuid__": "063d7bdc-6650-4b40-a7f7-9afc4a3deb4a", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "063d7bdc-6650-4b40-a7f7-9afc4a3deb4a" + "__uuid__": "063d7bdc-6650-4b40-a7f7-9afc4a3deb4a", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -296,16 +306,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 24, - "speed": 3, - "_id": "", "__prefab": { "__id__": 15 - } + }, + "fishType": 24, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -315,14 +326,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 17 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -332,6 +344,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -339,7 +352,8 @@ "__prefab": { "__id__": 19 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -349,6 +363,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -356,7 +371,6 @@ "__prefab": { "__id__": 21 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 72, @@ -366,7 +380,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -380,6 +395,8 @@ "asset": { "__id__": 0 }, - "fileId": "275EqqIrVC+IeN9rlHGt2L" + "fileId": "275EqqIrVC+IeN9rlHGt2L", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish3.prefab b/assets/FishSingle/fish/prefab/fish/Fish3.prefab index d4609d0..e83d9d6 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish3.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish3.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish3", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish3", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "32f9df4c-ff0f-447a-92f1-3d3aa53e8ff0@0dd99" + "__uuid__": "32f9df4c-ff0f-447a-92f1-3d3aa53e8ff0@0dd99", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "32f9df4c-ff0f-447a-92f1-3d3aa53e8ff0" + "__uuid__": "32f9df4c-ff0f-447a-92f1-3d3aa53e8ff0", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "b62b9130-675a-45a9-b65e-1b55c5814675" + "__uuid__": "b62b9130-675a-45a9-b65e-1b55c5814675", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "b62b9130-675a-45a9-b65e-1b55c5814675" + "__uuid__": "b62b9130-675a-45a9-b65e-1b55c5814675", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 3, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 3, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 48, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish4.prefab b/assets/FishSingle/fish/prefab/fish/Fish4.prefab index a1a3fa8..1317d75 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish4.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish4.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish4", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish4", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "3ccc1345-0250-41f6-8000-e754061ee84d@2ef7d" + "__uuid__": "3ccc1345-0250-41f6-8000-e754061ee84d@2ef7d", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "3ccc1345-0250-41f6-8000-e754061ee84d" + "__uuid__": "3ccc1345-0250-41f6-8000-e754061ee84d", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "d8996496-648c-4ab9-9268-c561e3f70bcc" + "__uuid__": "d8996496-648c-4ab9-9268-c561e3f70bcc", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "d8996496-648c-4ab9-9268-c561e3f70bcc" + "__uuid__": "d8996496-648c-4ab9-9268-c561e3f70bcc", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 4, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 4, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 60, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish5.prefab b/assets/FishSingle/fish/prefab/fish/Fish5.prefab index 4e4babf..5d79b69 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish5.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish5.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish5", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish5", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "ffdb3623-e0fd-4c59-aef5-acdfd6a09d44@43452" + "__uuid__": "ffdb3623-e0fd-4c59-aef5-acdfd6a09d44@43452", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "ffdb3623-e0fd-4c59-aef5-acdfd6a09d44" + "__uuid__": "ffdb3623-e0fd-4c59-aef5-acdfd6a09d44", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "cdf46818-beeb-4fa6-9de0-03dbb80970d6" + "__uuid__": "cdf46818-beeb-4fa6-9de0-03dbb80970d6", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "cdf46818-beeb-4fa6-9de0-03dbb80970d6" + "__uuid__": "cdf46818-beeb-4fa6-9de0-03dbb80970d6", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 5, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 5, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 62, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish6.prefab b/assets/FishSingle/fish/prefab/fish/Fish6.prefab index 381ac4f..96913bf 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish6.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish6.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish6", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish6", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a@3ad0e", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a" + "__uuid__": "1992ce6d-8279-48be-a1dd-2f9c3d9e7d6a", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd" + "__uuid__": "42335d8d-2042-4204-8772-6f3f241cbdbd", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 6, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 6, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 88, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish7.prefab b/assets/FishSingle/fish/prefab/fish/Fish7.prefab index ceb0d5c..1646baa 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish7.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish7.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish7", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish7", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.5, + "y": 1.5, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "0021d952-9879-45ad-a76b-30b82e1c6104@d1ecd" + "__uuid__": "0021d952-9879-45ad-a76b-30b82e1c6104@d1ecd", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "0021d952-9879-45ad-a76b-30b82e1c6104" + "__uuid__": "0021d952-9879-45ad-a76b-30b82e1c6104", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "4fa328b7-7054-4430-b113-7bab95ac94b3" + "__uuid__": "4fa328b7-7054-4430-b113-7bab95ac94b3", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "4fa328b7-7054-4430-b113-7bab95ac94b3" + "__uuid__": "4fa328b7-7054-4430-b113-7bab95ac94b3", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 7, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 7, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 106, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish8.prefab b/assets/FishSingle/fish/prefab/fish/Fish8.prefab index ec408da..8f9bd7c 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish8.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish8.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish8", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish8", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 3, + "y": 3, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "0190f1af-d5b4-4053-8850-ab0e2e0b0bf2@acc0d" + "__uuid__": "0190f1af-d5b4-4053-8850-ab0e2e0b0bf2@acc0d", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "0190f1af-d5b4-4053-8850-ab0e2e0b0bf2" + "__uuid__": "0190f1af-d5b4-4053-8850-ab0e2e0b0bf2", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "b21b52a9-08e5-4869-89dd-6e1bd2b82ca2" + "__uuid__": "b21b52a9-08e5-4869-89dd-6e1bd2b82ca2", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "b21b52a9-08e5-4869-89dd-6e1bd2b82ca2" + "__uuid__": "b21b52a9-08e5-4869-89dd-6e1bd2b82ca2", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 8, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 8, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 78, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/prefab/fish/Fish9.prefab b/assets/FishSingle/fish/prefab/fish/Fish9.prefab index 34aaf3d..e755c20 100644 --- a/assets/FishSingle/fish/prefab/fish/Fish9.prefab +++ b/assets/FishSingle/fish/prefab/fish/Fish9.prefab @@ -3,19 +3,19 @@ "__type__": "cc.Prefab", "_name": "Fish9", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "data": { "__id__": 1 }, "optimizationPolicy": 0, - "asyncLoadAssets": false, - "readonly": false, "persistent": false }, { "__type__": "cc.Node", "_name": "Fish9", "_objFlags": 0, + "__editorExtras__": {}, "_parent": null, "_children": [], "_active": true, @@ -60,10 +60,11 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 1.5, + "y": 1.5, "z": 1 }, + "_mobility": 0, "_layer": 1, "_euler": { "__type__": "cc.Vec3", @@ -71,15 +72,13 @@ "y": 0, "z": 0 }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, "_id": "" }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -88,9 +87,9 @@ "__id__": 3 }, "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8" + "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", + "__expectedType__": "cc.Material" }, - "_visFlags": 0, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -101,7 +100,8 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "aed1f5f3-0643-4ad1-8536-65d1294b7db1@5f735" + "__uuid__": "aed1f5f3-0643-4ad1-8536-65d1294b7db1@5f735", + "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, @@ -116,7 +116,8 @@ "_isTrimmedMode": true, "_useGrayscale": false, "_atlas": { - "__uuid__": "aed1f5f3-0643-4ad1-8536-65d1294b7db1" + "__uuid__": "aed1f5f3-0643-4ad1-8536-65d1294b7db1", + "__expectedType__": "cc.SpriteAtlas" }, "_id": "" }, @@ -128,6 +129,7 @@ "__type__": "cc.BoxCollider2D", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -161,6 +163,7 @@ "__type__": "cc.Animation", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -171,11 +174,13 @@ "playOnLoad": false, "_clips": [ { - "__uuid__": "b1e4a822-98c1-4dcd-8f46-dd524fad6381" + "__uuid__": "b1e4a822-98c1-4dcd-8f46-dd524fad6381", + "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "b1e4a822-98c1-4dcd-8f46-dd524fad6381" + "__uuid__": "b1e4a822-98c1-4dcd-8f46-dd524fad6381", + "__expectedType__": "cc.AnimationClip" }, "_id": "" }, @@ -187,16 +192,17 @@ "__type__": "bcf7fDIJDhKnaxGPja2YnSj", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "fishType": 9, - "speed": 3, - "_id": "", "__prefab": { "__id__": 9 - } + }, + "fishType": 9, + "speed": 3, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -206,14 +212,15 @@ "__type__": "ce1d8SdoYxBMoB8LPTW6b6l", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, "_enabled": true, - "_id": "", "__prefab": { "__id__": 11 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -223,6 +230,7 @@ "__type__": "cc.UIOpacity", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -230,7 +238,8 @@ "__prefab": { "__id__": 13 }, - "_opacity": 255 + "_opacity": 255, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -240,6 +249,7 @@ "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, + "__editorExtras__": {}, "node": { "__id__": 1 }, @@ -247,7 +257,6 @@ "__prefab": { "__id__": 15 }, - "_priority": 0, "_contentSize": { "__type__": "cc.Size", "width": 126, @@ -257,7 +266,8 @@ "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 - } + }, + "_id": "" }, { "__type__": "cc.CompPrefabInfo", @@ -271,6 +281,8 @@ "asset": { "__id__": 0 }, - "fileId": "famL4PhGRFkopG4SNLzIh+" + "fileId": "famL4PhGRFkopG4SNLzIh+", + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/FishSingle/fish/script/FishBase.ts b/assets/FishSingle/fish/script/FishBase.ts index 4613dfd..596bbdc 100644 --- a/assets/FishSingle/fish/script/FishBase.ts +++ b/assets/FishSingle/fish/script/FishBase.ts @@ -1,31 +1,37 @@ -import { _decorator, Component, Tween, tween } from 'cc' -const { ccclass, property } = _decorator +import { Component, Tween, _decorator, tween } from 'cc' +import { FishInfo } from '../../script/game/config/FishInfo' import { FishPathInfo } from '../../script/game/config/FishPathInfo' import FishManager from '../../script/game/manager/FishManager' -import { FishInfo } from '../../script/game/config/FishInfo' +import WsManager from '../../script/game/manager/WsManager' + +const { ccclass, property } = _decorator @ccclass('FishBase') export default class FishBase extends Component { - public fishInfo: FishInfo - public fishType: number = 1 - public blood: number = 1 - public fishPathInfo: FishPathInfo - public isDead: boolean - onLoad() {} - start() {} - public playDeadMv() { - this.isDead = true - this.scheduleOnce(() => { - FishManager.instance.killFish(this) - }, 1.5) - tween(this.node) - .repeatForever(tween().by(0.6, { angle: -360 })) - .start() - } - onDisable() { - //this.node.stopAllActions(); - Tween.stopAllByTarget(this.node) - this.unscheduleAllCallbacks() - } + public fishInfo: FishInfo + public fishType: number = 1 + public fishId: string = '' + public fishPathInfo: FishPathInfo + public isDead: number = 2 + + onLoad() {} + + start() {} + + // 播放死亡动画 + public playDeadMv(res: any) { + this.isDead = 1 + this.scheduleOnce(() => { + FishManager.instance.killFish(res) + }, 1) + tween(this.node) + .repeatForever(tween().by(0.6, { angle: -360 })) + .start() + } + + onDisable() { + Tween.stopAllByTarget(this.node) + this.unscheduleAllCallbacks() + } } diff --git a/assets/FishSingle/fish/script/FishBulletBase.ts b/assets/FishSingle/fish/script/FishBulletBase.ts index 86ce4c8..c2e5b71 100644 --- a/assets/FishSingle/fish/script/FishBulletBase.ts +++ b/assets/FishSingle/fish/script/FishBulletBase.ts @@ -1,85 +1,76 @@ -import { - _decorator, - Component, - Vec2, - Node, - Vec3, - error, - Collider2D, - Contact2DType, - IPhysics2DContact, -} from 'cc' -const { ccclass, property } = _decorator +import { Collider2D, Component, Contact2DType, IPhysics2DContact, Vec2, Vec3, _decorator } from 'cc' + +import BulletManager from '../../script/game/manager/BulletManager' +import FishNetManager from '../../script/game/manager/FishNetManager' import FishBase from './FishBase' -import FishNetManager from '../../script/game/manager/FishNetManager' -import BulletManager from '../../script/game/manager/BulletManager' +import WsManager from '../../script/game/manager/WsManager' +import CannonManager from '../../script/game/manager/CannonManager' +import FishUI from './FishUI' +import FishManager from '../../script/game/manager/FishManager' + +const { ccclass, property } = _decorator @ccclass('FishBulletBase') export default class FishBulletBase extends Component { - public bulletType: number = 0 - public targetP: Vec2 - public _cacheVec2: Vec2 = new Vec2() - public _cacheVec3: Vec3 = new Vec3() - private _collider: Collider2D - onLoad() { - this._collider = this.getComponent(Collider2D) - this._collider.sensor = true - //this._collider.on(Contact2DType.PRE_SOLVE, this.onBeginContact, this); - // PhysicsSystem2D.instance.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); - } - start() {} + public bulletType: number = 0 - onEnable() { - this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this) - //this._collider.on(Contact2DType.END_CONTACT, this.onBeginContact, this); - } + public targetP: Vec2 - onDisable() { - this._collider.off(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this) - //this._collider.off(Contact2DType.END_CONTACT, this.onBeginContact, this); - } + public _cacheVec2: Vec2 = new Vec2() - onBeginContact( - selfCollider: Collider2D, - other: Collider2D, - contact: IPhysics2DContact | null - ) { - // 只在两个碰撞体开始接触时被调用一次 - if (other) { - let fish: FishBase = other.getComponent(FishBase) - if (fish && !fish.isDead) { - this.node.getPosition(this._cacheVec3) - this._cacheVec2.x = this._cacheVec3.x - this._cacheVec2.y = this._cacheVec3.y - FishNetManager.instance.addFishNet(this.bulletType, this._cacheVec2) - BulletManager.instance.killBullet(this) - fish.blood -= this.bulletType + 1 - // fish.blood -= 100 - if (fish.blood <= 0) { - fish.playDeadMv() - } - } - } - } + public _cacheVec3: Vec3 = new Vec3() - //v2.4代码 - onCollisionEnter(other: Node, self: Node) { - error('onCollisionEnter=FishBulletBase=', other, self) - if (other) { - let fish: FishBase = other.getComponent(FishBase) - if (fish && !fish.isDead) { - this.node.getPosition(this._cacheVec3) - this._cacheVec2.x = this._cacheVec3.x - this._cacheVec2.y = this._cacheVec3.y - FishNetManager.instance.addFishNet(this.bulletType, this._cacheVec2) - BulletManager.instance.killBullet(this) - fish.blood -= this.bulletType + 1 - // fish.blood -= 100 - if (fish.blood <= 0) { - fish.playDeadMv() - } - } - } - } + private _collider: Collider2D | null = null + + private currFish: FishBase | null = null + + onLoad() { + WsManager.instance.on(5, this.handelMsg, this) + this._collider = this.getComponent(Collider2D) + if (this._collider) { + this._collider.sensor = true + this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this) + } + } + + start() {} + + onEnable() { + if (this._collider) this._collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this) + } + + onDisable() { + if (this._collider) this._collider.off(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this) + } + + // 处理碰撞 + private handleFishCollision(fish: FishBase | null, contact: IPhysics2DContact | null) { + if (fish && fish.isDead === 2) { + this.node.getPosition(this._cacheVec3) + this._cacheVec2.x = this._cacheVec3.x + this._cacheVec2.y = this._cacheVec3.y + FishNetManager.instance.addFishNet(this.bulletType, this._cacheVec2) + BulletManager.instance.killBullet(this) + } + } + + // 碰撞检测 + onBeginContact(selfCollider: Collider2D, other: Collider2D, contact: IPhysics2DContact | null) { + const fish: FishBase | null = other.getComponent(FishBase) + WsManager.instance.onSend({ + fish_id: fish.fishId, + cannon_id: CannonManager.instance.cannonType, + }) + this.handleFishCollision(fish, contact) + } + + handelMsg(res: any) { + FishUI.instance.refreshScore(res) + if (res.fish_status === 1) { + FishManager.instance.killFish(res) + } + } + + protected onDestroy(): void {} } diff --git a/assets/FishSingle/fish/script/FishMover.ts b/assets/FishSingle/fish/script/FishMover.ts index 2bf7237..dc49cc5 100644 --- a/assets/FishSingle/fish/script/FishMover.ts +++ b/assets/FishSingle/fish/script/FishMover.ts @@ -1,164 +1,134 @@ -import { - _decorator, - Component, - CCInteger, - CCFloat, - Vec2, - Animation, - Vec3, -} from 'cc' +import { Animation, CCFloat, CCInteger, Component, Vec2, Vec3, _decorator, log } from 'cc' -const {ccclass, property} = _decorator +import { Logger } from '../../script/engine/utils/Logger' +import MathUtils from '../../script/engine/utils/MathUtils' +import TimeHelper from '../../script/game/utils/TimeHelper' import FishBase from './FishBase' -import MathUtils from '../../script/engine/utils/MathUtils' -import {Logger} from '../../script/engine/utils/Logger' -import TimeHelper from '../../script/game/utils/TimeHelper' + +const { ccclass, property } = _decorator @ccclass('FishMover') export default class FishMover extends Component { - //鱼类型 - @property({type: CCInteger}) - public fishType: number = 1 - //鱼移动速度 - @property({type: CCFloat}) - public speed: number = 3 - //下个位置移动点 - private targetMoveIndex: number = 0 - //鱼移动位置 - public movePList: Array = [] - //贝萨尔曲线 - public bezierPList: Array = [] - public isMoving: boolean = false - private minSpeed: number = 0.1 - private moveCount: number = 1 - private totalTimes: number = 60 * 2 - private _vec3Cahce: Vec3 = new Vec3() + // 鱼类型 + @property({ type: CCInteger }) + public fishType: number = 1 - public startMove() { - this.targetMoveIndex = 0 - this.isMoving = true - //this.node.getComponent(Animation).play()//v3 当前帧 不能播放 - TimeHelper.exeNextFrame(this.node, () => - this.node.getComponent(Animation).play() - ) + // 鱼移动速度 + @property({ type: CCFloat }) + public speed: number = 3 + + // 下个位置移动点 + private targetMoveIndex: number = 0 + // 鱼移动位置 + public movePList: Array = [] + // 贝萨尔曲线 + public bezierPList: Array = [] + public isMoving: boolean = false + private minSpeed: number = 0.1 + private moveCount: number = 1 + private totalTimes: number = 60 * 2 + private _vec3Cahce: Vec3 = new Vec3() + + public startMove() { + this.targetMoveIndex = 0 + this.isMoving = true + // this.node.getComponent(Animation).play()//v3 当前帧 不能播放 + TimeHelper.exeNextFrame(this.node, () => this.node.getComponent(Animation).play()) + } + + update(dt) { + // this.moveFish(); + this.checkMoveBezier() + } + + // 检测是否到达目标点 + private checkMoveBezier() { + if (this.isMoving && this.getComponent(FishBase).isDead === 2) { + this.moveCount++ + if (this.moveCount >= this.totalTimes) this.moveCount = this.totalTimes + this.moveBezier() } + } - update(dt) { - // this.moveFish(); - this.checkMoveBezier() - } - - private checkMoveBezier() { - if (this.isMoving && !this.getComponent(FishBase).isDead) { - this.moveCount++ - if (this.moveCount >= this.totalTimes) { - this.moveCount = this.totalTimes - } - this.moveBezier() + // 贝塞尔曲线移动 + public moveBezier() { + if (this.bezierPList.length > this.targetMoveIndex + 2) { + const p0: Vec2 = this.bezierPList[this.targetMoveIndex] + const p1: Vec2 = this.bezierPList[this.targetMoveIndex + 1] + const p2: Vec2 = this.bezierPList[this.targetMoveIndex + 2] + const t: number = this.moveCount / this.totalTimes + const mx: number = (1 - t) ** 2 * p0.x + 2 * t * (1 - t) * p1.x + t ** 2 * p2.x + const my: number = (1 - t) ** 2 * p0.y + 2 * t * (1 - t) * p1.y + t ** 2 * p2.y + this.node.getPosition(this._vec3Cahce) + const rad: number = MathUtils.p2pRad( + new Vec2(this._vec3Cahce.x, this._vec3Cahce.y), + new Vec2(mx, my), + ) + const rot111: number = MathUtils.radiansToDegrees(rad) + const rot: number = MathUtils.rotation2Fish(rot111) + if (this.fishType === 7 || this.fishType === 27 || this.fishType === 29) { + if (rot > 90 || rot < -90) { + this.node.getScale(this._vec3Cahce) + if (this._vec3Cahce.x > 0) { + this._vec3Cahce.x = -1 * this._vec3Cahce.x + this.node.setScale(this._vec3Cahce) + } } - } - - public moveBezier() { - // [warn] [[-632,-230],[-444,-117],[-264,-242]] - // let p0: cc.Vec2 = cc.v2(-632, -230) - // let p1: cc.Vec2 = cc.v2(-444, -117) - // let p2: cc.Vec2 = cc.v2(-264, -242) - if (this.bezierPList.length > this.targetMoveIndex + 2) { - let p0: Vec2 = this.bezierPList[this.targetMoveIndex] - let p1: Vec2 = this.bezierPList[this.targetMoveIndex + 1] - let p2: Vec2 = this.bezierPList[this.targetMoveIndex + 2] - let t: number = this.moveCount / this.totalTimes - let mx: number = - Math.pow(1 - t, 2) * p0.x + - 2 * t * (1 - t) * p1.x + - Math.pow(t, 2) * p2.x - let my: number = - Math.pow(1 - t, 2) * p0.y + - 2 * t * (1 - t) * p1.y + - Math.pow(t, 2) * p2.y - this.node.getPosition(this._vec3Cahce) - let rad: number = MathUtils.p2pRad( - new Vec2(this._vec3Cahce.x, this._vec3Cahce.y), - new Vec2(mx, my) - ) - let rot111: number = MathUtils.radiansToDegrees(rad) - let rot: number = MathUtils.rotation2Fish(rot111) - if (this.fishType == 7 || this.fishType == 27 || this.fishType == 29) { - if (rot > 90 || rot < -90) { - this.node.getScale(this._vec3Cahce) - if (this._vec3Cahce.x > 0) { - this._vec3Cahce.x = -1 * this._vec3Cahce.x - this.node.setScale(this._vec3Cahce) - } - } else { - this.node.getScale(this._vec3Cahce) - if (this._vec3Cahce.x < 0) { - this._vec3Cahce.x = -1 * this._vec3Cahce.x - this.node.setScale(this._vec3Cahce) - } - } - } else if ( - this.fishType == 9 || - this.fishType == 10 || - this.fishType == 21 || - this.fishType == 28 - ) { - } else { - // this.node.rotation = rot; //过时 - this.node.angle = -rot - } - // Logger.log("moveBezier====", rad, rot111, this.fishType, rot) - let moveTimes: number = Math.round(this.speed / this.minSpeed) - for (let i = 0; i < moveTimes; i++) { - let speedX: number = this.minSpeed * Math.cos(rad) - let speedY: number = this.minSpeed * Math.sin(rad) - this.node.getPosition(this._vec3Cahce) - this._vec3Cahce.x += speedX - this._vec3Cahce.y += speedY - this.node.setPosition(this._vec3Cahce) - if ( - MathUtils.distance(this._vec3Cahce.x, this._vec3Cahce.y, mx, my) <= - this.minSpeed - ) { - this.node.setPosition(mx, my) - break - } - if ( - MathUtils.distance( - this._vec3Cahce.x, - this._vec3Cahce.y, - p2.x, - p2.y - ) <= - this.minSpeed * 2 - ) { - this.node.setPosition(p2.x, p2.y) - this.targetMoveIndex += 2 - this.moveCount = 0 - break - } - } - } else { - this.isMoving = false + } else if ( + this.fishType === 9 || + this.fishType === 10 || + this.fishType === 21 || + this.fishType === 28 + ) { + } else { + this.node.angle = -rot + } + // Logger.log("moveBezier====", rad, rot111, this.fishType, rot) + const moveTimes: number = Math.round(this.speed / this.minSpeed) + for (let i = 0; i < moveTimes; i++) { + const speedX: number = this.minSpeed * Math.cos(rad) + const speedY: number = this.minSpeed * Math.sin(rad) + this.node.getPosition(this._vec3Cahce) + this._vec3Cahce.x += speedX + this._vec3Cahce.y += speedY + this.node.setPosition(this._vec3Cahce) + if (MathUtils.distance(this._vec3Cahce.x, this._vec3Cahce.y, mx, my) <= this.minSpeed) { + this.node.setPosition(mx, my) + break } - } - - onDisable() { - this.isMoving = false - } - - public exportBezierConfig() { - Logger.warn('exportBezierConfig=') - let tempConfig: Array> = [] - for (let i = 0; i < this.bezierPList.length; i++) { - tempConfig[i] = [] - tempConfig[i].push(Math.floor(this.bezierPList[i].x)) - tempConfig[i].push(Math.floor(this.bezierPList[i].y)) + if ( + MathUtils.distance(this._vec3Cahce.x, this._vec3Cahce.y, p2.x, p2.y) <= + this.minSpeed * 2 + ) { + this.node.setPosition(p2.x, p2.y) + this.targetMoveIndex += 2 + this.moveCount = 0 + break } - Logger.warn('fishtype', this.fishType) - Logger.warn('speed', this.speed) - Logger.warn('scale', this.node.scale) - Logger.warn(JSON.stringify(tempConfig)) + } + } else { + Logger.log('moveBezier====', 'end') + this.isMoving = false } + } + + onDisable() { + this.isMoving = false + } + + // 导出贝塞尔曲线配置 + public exportBezierConfig() { + Logger.warn('exportBezierConfig=') + const tempConfig: Array> = [] + for (let i = 0; i < this.bezierPList.length; i++) { + tempConfig[i] = [] + tempConfig[i].push(Math.floor(this.bezierPList[i].x)) + tempConfig[i].push(Math.floor(this.bezierPList[i].y)) + } + Logger.warn('fishtype', this.fishType) + Logger.warn('speed', this.speed) + Logger.warn('scale', this.node.scale) + Logger.warn(JSON.stringify(tempConfig)) + } } diff --git a/assets/FishSingle/fish/script/FishNetBase.ts b/assets/FishSingle/fish/script/FishNetBase.ts index 2a05ce4..90ab9fe 100644 --- a/assets/FishSingle/fish/script/FishNetBase.ts +++ b/assets/FishSingle/fish/script/FishNetBase.ts @@ -1,27 +1,29 @@ -import { _decorator, Component, Tween, tween, Vec3, Vec2 } from 'cc' -const { ccclass, property } = _decorator +import { Component, Tween, Vec3, _decorator, tween } from 'cc' import FishNetManager from '../../script/game/manager/FishNetManager' +const { ccclass, property } = _decorator + @ccclass('FishNetBase') export default class FishNetBase extends Component { - public netType: number = 0 + public netType: number = 0 - private tween: Tween - private static vec3: Vec3 = new Vec3(2, 2, 1) - public playMv() { - this.node.setScale(Vec3.ZERO) - this.tween = tween(this.node) - .to(0.2, { scale: FishNetBase.vec3 }) - .delay(0.3) - .call(() => { - FishNetManager.instance.destroyFishNet(this) - }) - .start() - } - onDestroy() { - if (this.tween) { - this.tween.stop() - } - } + private tween: Tween + private static vec3: Vec3 = new Vec3(2, 2, 1) + + // 销毁渔网 + public playMv() { + this.node.setScale(Vec3.ZERO) + this.tween = tween(this.node) + .to(0.2, { scale: FishNetBase.vec3 }) + .delay(0.3) + .call(() => { + FishNetManager.instance.destroyFishNet(this) + }) + .start() + } + + onDestroy() { + if (this.tween) this.tween.stop() + } } diff --git a/assets/FishSingle/fish/script/FishSetting.ts b/assets/FishSingle/fish/script/FishSetting.ts index dd14638..6881093 100644 --- a/assets/FishSingle/fish/script/FishSetting.ts +++ b/assets/FishSingle/fish/script/FishSetting.ts @@ -1,67 +1,55 @@ -import { _decorator, Slider, Node, Canvas, instantiate, director } from 'cc' -const { ccclass, property } = _decorator +import { Node, Slider, _decorator, instantiate } from 'cc' -import EventManager from '../../script/engine/utils/EventManager' import DialogBase from '../../script/engine/uicomponent/DialogBase' import MusicPrefab from '../../script/engine/uicomponent/MusicPrefab' import SoundPrefab from '../../script/engine/uicomponent/SoundPrefab' +import EventManager from '../../script/engine/utils/EventManager' import PrefabLoader from '../../script/engine/utils/PrefabLoader' import { GameConfig } from '../../script/game/config/GameConfig' +const { ccclass, property } = _decorator + @ccclass('FishSetting') export default class FishSetting extends DialogBase { - @property({ type: Slider }) - private musicSlider: Slider | null = null - @property({ type: Slider }) - private soundSlider: Slider | null = null + @property({ type: Slider }) + private musicSlider: Slider | null = null - onLoadMe() { - EventManager.instance.addSliderEvent( - this.node, - this.musicSlider.node, - 'onMusicSlider', - 0 - ) - EventManager.instance.addSliderEvent( - this.node, - this.soundSlider.node, - 'onSoundSlider', - 0 - ) - this.refresh() - } + @property({ type: Slider }) + private soundSlider: Slider | null = null - private onMusicSlider(slider: Slider, customEventData) { - let percent: number = Number(slider.progress.toFixed(3)) - // let maxMoney: number = Math.max(UserInfoModel.userScore - 10, 0) - // this.nowExchangeNum = Math.floor(maxMoney * this.nowPercent); - // this.refresh(); - MusicPrefab.changeVolumn(percent) - this.refresh() - } + onLoadMe() { + EventManager.instance.addSliderEvent(this.node, this.musicSlider.node, 'onMusicSlider', 0) + EventManager.instance.addSliderEvent(this.node, this.soundSlider.node, 'onSoundSlider', 0) + this.refresh() + } - private onSoundSlider(slider: Slider, customEventData) { - let percent: number = Number(slider.progress.toFixed(3)) - SoundPrefab.changeVolumn(percent) - this.refresh() - } + // 音乐 + private onMusicSlider(slider: Slider, customEventData) { + const percent: number = Number(slider.progress.toFixed(3)) + MusicPrefab.changeVolumn(percent) + this.refresh() + } - private refresh() { - this.musicSlider.progress = MusicPrefab.musicVolumn - this.soundSlider.progress = SoundPrefab.soundVolumn - } + // 声音 + private onSoundSlider(slider: Slider, customEventData) { + const percent: number = Number(slider.progress.toFixed(3)) + SoundPrefab.changeVolumn(percent) + this.refresh() + } - public static show(parentNode: Node = null) { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'game/dialog/FishSetting', - (loadedResource) => { - if (!parentNode) { - parentNode = DialogBase.GetRootCanvas() - } - let node: Node = instantiate(loadedResource) - parentNode.addChild(node) - node.setPosition(0, 0) - } - ) - } + // 刷新音乐和声音 + private refresh() { + this.musicSlider.progress = MusicPrefab.musicVolumn + this.soundSlider.progress = SoundPrefab.soundVolumn + } + + public static show(parentNode: Node = null) { + PrefabLoader.loadPrefab(`${GameConfig.GameName}/game/dialog/FishSetting`, (loadedResource) => { + if (!parentNode) parentNode = DialogBase.GetRootCanvas() + + const node: Node = instantiate(loadedResource) + parentNode.addChild(node) + node.setPosition(0, 0) + }) + } } diff --git a/assets/FishSingle/fish/script/FishUI.ts b/assets/FishSingle/fish/script/FishUI.ts index 99ebb1a..c7fe217 100644 --- a/assets/FishSingle/fish/script/FishUI.ts +++ b/assets/FishSingle/fish/script/FishUI.ts @@ -1,106 +1,109 @@ -import { - _decorator, - Component, - Label, - Animation, - Node, - Vec2, - Tween, - tween, - Vec3, -} from 'cc' -const { ccclass, property } = _decorator +import { Animation, Component, Label, Node, Tween, Vec2, Vec3, _decorator, find, tween } from 'cc' + +import CannonManager from '../../script/game/manager/CannonManager' +import FishManager from '../../script/game/manager/FishManager' import FishSetting from './FishSetting' -import FishManager from '../../script/game/manager/FishManager' -import CannonManager from '../../script/game/manager/CannonManager' +import WsManager from '../../script/game/manager/WsManager' + +const { ccclass, property } = _decorator @ccclass('FishUI') export default class FishUI extends Component { - public static instance: FishUI = null - @property({ type: Label }) - private dzScore: Label | null = null - @property({ type: Label }) - private jfScore: Label | null = null - @property({ type: Animation }) - private clickEffect: Animation | null = null - @property({ type: Node }) - private waveEffect: Node | null = null - // 豆子 - public dz_score: number = 100 - // 积分 - public jf_score: number = 0 - private _vec3Cache: Vec3 - onLoad() { - FishUI.instance = this - this._vec3Cache = new Vec3() - this.clickEffect.node.active = false - this.waveEffect.active = false - this.dzScore = this.node - .getChildByName('dzScore') - .getComponent(Label) as Label - this.jfScore = this.node - .getChildByName('jfScore') - .getComponent(Label) as Label - } + public static instance: FishUI = null + @property({ type: Label }) + private dzScore: Label | null = null - start() { - this.refreshScore() - // setTimeout(()=>{ - // this.playWaveEffect(); - // }, 5000) - } + @property({ type: Label }) + private jfScore: Label | null = null - public playClickEffect(p: Vec2) { - this._vec3Cache.x = p.x - this._vec3Cache.y = p.y - this._vec3Cache.z = 0 - this.clickEffect.node.setPosition(this._vec3Cache) - this.clickEffect.node.active = true - this.clickEffect.play() - } + @property({ type: Animation }) + private clickEffect: Animation | null = null - public playWaveEffect() { - this.waveEffect.active = true - this.waveEffect.setPosition(1292.703, 0) + @property({ type: Node }) + private waveEffect: Node | null = null - FishManager.instance.playFishMap() - tween(this.waveEffect) - .to(2, { position: new Vec3(-1319.969, 0, 0) }) - .call(() => { - this.waveEffect.active = false - FishManager.instance.startFishMap() - }) - .start() - } + // 豆子 + public dz_score: number = 0 + // 积分 + public jf_score: number = 0 + private _vec3Cache: Vec3 - private onClickPre() { - if (CannonManager.instance.cannonType > 1) { - CannonManager.instance.cannonType-- - CannonManager.instance.refreshCannon() - } - } + onLoad() { + FishUI.instance = this + this._vec3Cache = new Vec3() + this.clickEffect.node.active = false + this.waveEffect.active = false + this.dzScore = this.node + .getChildByName('userInfo') + .getChildByName('info') + .getChildByName('dz_fillet') + .getChildByName('dz_text') + .getComponent(Label) as Label + this.jfScore = this.node + .getChildByName('userInfo') + .getChildByName('info') + .getChildByName('jf_fillet') + .getChildByName('jf_text') + .getComponent(Label) as Label + } - private onClickNext() { - if (CannonManager.instance.cannonType < 7) { - CannonManager.instance.cannonType++ - CannonManager.instance.refreshCannon() - } - } + start() { + // this.refreshScore() + } - public refreshScore() { - this.dzScore.string = this.dz_score + '' - this.jfScore.string = this.jf_score + '' - } + public playClickEffect(p: Vec2) { + this._vec3Cache.x = p.x + this._vec3Cache.y = p.y + this._vec3Cache.z = 0 + this.clickEffect.node.setPosition(this._vec3Cache) + this.clickEffect.node.active = true + this.clickEffect.play() + } - private onClickSetting() { - FishSetting.show() - } + public playWaveEffect() { + this.waveEffect.active = true + this.waveEffect.setPosition(1292.703, 0) - onDestroy() { - FishUI.instance = null - this.unscheduleAllCallbacks() - Tween.stopAllByTarget(this.node) - //this.node.stopAllActions(); - } + FishManager.instance.playFishMap() + tween(this.waveEffect) + .to(2, { position: new Vec3(-1319.969, 0, 0) }) + .call(() => { + this.waveEffect.active = false + FishManager.instance.startFishMap() + }) + .start() + } + + private onClickPre() { + if (CannonManager.instance.cannonType > 1) { + CannonManager.instance.cannonType-- + CannonManager.instance.refreshCannon() + } + } + + private onClickNext() { + if (CannonManager.instance.cannonType < 7) { + CannonManager.instance.cannonType++ + CannonManager.instance.refreshCannon() + } + } + + public refreshScore(res: any) { + this.dz_score = res.pulse + this.jf_score = res.integral + this.dzScore.string = `${this.dz_score}` + this.jfScore.string = `${this.jf_score}` + } + + private onClickSetting() { + FishSetting.show() + } + + onDestroy() { + FishUI.instance = null + this.unscheduleAllCallbacks() + Tween.stopAllByTarget(this.node) + // this.node.stopAllActions(); + } } diff --git a/assets/FishSingle/fish/script/FishWiki.ts b/assets/FishSingle/fish/script/FishWiki.ts index 35cc7e3..e02b2fe 100644 --- a/assets/FishSingle/fish/script/FishWiki.ts +++ b/assets/FishSingle/fish/script/FishWiki.ts @@ -1,13 +1,4 @@ -import { - _decorator, - ScrollView, - Prefab, - Node, - instantiate, - Label, - Vec3, - Animation, -} from 'cc' +import { _decorator, ScrollView, Prefab, Node, instantiate, Label, Vec3, Animation } from 'cc' const { ccclass, property } = _decorator import FishBase from './FishBase' @@ -21,70 +12,62 @@ import TimeHelper from '../../script/game/utils/TimeHelper' @ccclass('FishWiki') export default class FishWiki extends DialogBase { - @property({ type: ScrollView }) - private scrollView: ScrollView | null = null - @property({ type: Prefab }) - private wikiItemPrefab: Prefab | null = null + @property({ type: ScrollView }) + private scrollView: ScrollView | null = null + @property({ type: Prefab }) + private wikiItemPrefab: Prefab | null = null - private _vec3Cache: Vec3 - onLoadMe() { - this._vec3Cache = new Vec3(1, 1, 1) - this.init() - } + private _vec3Cache: Vec3 + onLoadMe() { + this._vec3Cache = new Vec3(1, 1, 1) + this.init() + } - private init() { - this.scrollView.content.removeAllChildren() - this.initOne(0) - } + private init() { + this.scrollView.content.removeAllChildren() + this.initOne(0) + } - private initOne(index: number) { - if (index < FishConfig.config.length) { - let itemNode: Node = instantiate(this.wikiItemPrefab) + private initOne(index: number) { + if (index < FishConfig.config.length) { + let itemNode: Node = instantiate(this.wikiItemPrefab) - this.scrollView.content.addChild(itemNode) - let fishInfo: FishInfo = FishConfig.config[index] - let txtName: Label = itemNode - .getChildByName('txtName') - .getComponent(Label) - txtName.string = fishInfo.name - let txtLife: Label = itemNode - .getChildByName('txtLife') - .getComponent(Label) - txtLife.string = 'life:' + fishInfo.blood + '' - let view: Node = itemNode.getChildByName('view') - view.removeAllChildren() + this.scrollView.content.addChild(itemNode) + let fishInfo: FishInfo = FishConfig.config[index] + let txtName: Label = itemNode.getChildByName('txtName').getComponent(Label) + txtName.string = fishInfo.name + let txtLife: Label = itemNode.getChildByName('txtLife').getComponent(Label) + txtLife.string = '积分:' + fishInfo.blood + '' + let view: Node = itemNode.getChildByName('view') + view.removeAllChildren() - let fish: FishBase = FishManager.instance.createFishByType( - fishInfo.fishType - ) - view.addChild(fish.node) - fish.node.setPosition(0, 0) + let fish: FishBase = FishManager.instance.createFishByType(fishInfo.fishType) + view.addChild(fish.node) + fish.node.setPosition(0, 0) - //缩放有bug - //Vec3.multiplyScalar(this._vec3Cache, this._vec3Cache, fishInfo.wikiScale); - //fish.node.setScale(this._vec3Cache); + //缩放有bug + //Vec3.multiplyScalar(this._vec3Cache, this._vec3Cache, fishInfo.wikiScale); + //fish.node.setScale(this._vec3Cache); - //fish.node.getComponent(Animation).play(); //v3 当前帧 不能播放 - TimeHelper.exeNextFrame(this.node, () => - fish.node.getComponent(Animation).play() - ) - this.scheduleOnce(() => { - this.initOne(index + 1) - }, 0.05) - } - } + //fish.node.getComponent(Animation).play(); //v3 当前帧 不能播放 + TimeHelper.exeNextFrame(this.node, () => fish.node.getComponent(Animation).play()) + this.scheduleOnce(() => { + this.initOne(index + 1) + }, 0.05) + } + } - public static show(parentNode: Node = null) { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'game/dialog/FishWiki', - (loadedResource) => { - if (!parentNode) { - parentNode = DialogBase.GetRootCanvas() - } - let node: Node = instantiate(loadedResource) - parentNode.addChild(node) - node.setPosition(0, 0) - } - ) - } + public static show(parentNode: Node = null) { + PrefabLoader.loadPrefab( + GameConfig.GameName + '/' + 'game/dialog/FishWiki', + (loadedResource) => { + if (!parentNode) { + parentNode = DialogBase.GetRootCanvas() + } + let node: Node = instantiate(loadedResource) + parentNode.addChild(node) + node.setPosition(0, 0) + }, + ) + } } diff --git a/assets/FishSingle/pictures/.DS_Store b/assets/FishSingle/pictures/.DS_Store new file mode 100644 index 0000000..04f756b Binary files /dev/null and b/assets/FishSingle/pictures/.DS_Store differ diff --git a/assets/FishSingle/pictures/haobuyu/.DS_Store b/assets/FishSingle/pictures/haobuyu/.DS_Store new file mode 100644 index 0000000..8842988 Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/.DS_Store differ diff --git a/assets/FishSingle/pictures/haobuyu/avatar.png b/assets/FishSingle/pictures/haobuyu/avatar.png new file mode 100755 index 0000000..6bbb8d2 Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/avatar.png differ diff --git a/assets/FishSingle/pictures/haobuyu/avatar.png.meta b/assets/FishSingle/pictures/haobuyu/avatar.png.meta new file mode 100644 index 0000000..31d42f2 --- /dev/null +++ b/assets/FishSingle/pictures/haobuyu/avatar.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3@6c48a", + "displayName": "avatar", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3@f9941", + "displayName": "avatar", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 74, + "height": 77, + "rawWidth": 74, + "rawHeight": 77, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -37, + -38.5, + 0, + 37, + -38.5, + 0, + -37, + 38.5, + 0, + 37, + 38.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 77, + 74, + 77, + 0, + 0, + 74, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -37, + -38.5, + 0 + ], + "maxPos": [ + 37, + 38.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3@f9941" + } +} diff --git a/assets/FishSingle/pictures/haobuyu/dz.png b/assets/FishSingle/pictures/haobuyu/dz.png new file mode 100755 index 0000000..c477c0d Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/dz.png differ diff --git a/assets/FishSingle/pictures/haobuyu/dz.png.meta b/assets/FishSingle/pictures/haobuyu/dz.png.meta new file mode 100644 index 0000000..0d1427e --- /dev/null +++ b/assets/FishSingle/pictures/haobuyu/dz.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "962c910f-069b-4a38-9099-4596ed34e91e", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "962c910f-069b-4a38-9099-4596ed34e91e@6c48a", + "displayName": "dz", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "962c910f-069b-4a38-9099-4596ed34e91e", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "962c910f-069b-4a38-9099-4596ed34e91e@f9941", + "displayName": "dz", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 45, + "height": 42, + "rawWidth": 45, + "rawHeight": 42, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -22.5, + -21, + 0, + 22.5, + -21, + 0, + -22.5, + 21, + 0, + 22.5, + 21, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 42, + 45, + 42, + 0, + 0, + 45, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -22.5, + -21, + 0 + ], + "maxPos": [ + 22.5, + 21, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "962c910f-069b-4a38-9099-4596ed34e91e@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": true, + "redirect": "962c910f-069b-4a38-9099-4596ed34e91e@f9941" + } +} diff --git a/assets/FishSingle/pictures/haobuyu/fillet.png b/assets/FishSingle/pictures/haobuyu/fillet.png new file mode 100755 index 0000000..f325d7f Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/fillet.png differ diff --git a/assets/FishSingle/pictures/haobuyu/fillet.png.meta b/assets/FishSingle/pictures/haobuyu/fillet.png.meta new file mode 100644 index 0000000..f4dfaf4 --- /dev/null +++ b/assets/FishSingle/pictures/haobuyu/fillet.png.meta @@ -0,0 +1,137 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "38ef2cdf-a945-429d-b703-3c9536058498", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "38ef2cdf-a945-429d-b703-3c9536058498@6c48a", + "displayName": "fillet", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "38ef2cdf-a945-429d-b703-3c9536058498", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "38ef2cdf-a945-429d-b703-3c9536058498@f9941", + "displayName": "fillet", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0.5, + "offsetY": 0, + "trimX": 1, + "trimY": 0, + "width": 166, + "height": 36, + "rawWidth": 167, + "rawHeight": 36, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 15, + "borderRight": 15, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -83, + -18, + 0, + 83, + -18, + 0, + -83, + 18, + 0, + 83, + 18, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 1, + 36, + 167, + 36, + 1, + 0, + 167, + 0 + ], + "nuv": [ + 0.005988023952095809, + 0, + 1, + 0, + 0.005988023952095809, + 1, + 1, + 1 + ], + "minPos": [ + -83, + -18, + 0 + ], + "maxPos": [ + 83, + 18, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "38ef2cdf-a945-429d-b703-3c9536058498@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "38ef2cdf-a945-429d-b703-3c9536058498@f9941", + "compressSettings": { + "useCompressTexture": false + } + } +} diff --git a/assets/FishSingle/pictures/haobuyu/fishbackground.jpg b/assets/FishSingle/pictures/haobuyu/fishbackground.jpg index 94aba25..f79aa9e 100644 Binary files a/assets/FishSingle/pictures/haobuyu/fishbackground.jpg and b/assets/FishSingle/pictures/haobuyu/fishbackground.jpg differ diff --git a/assets/FishSingle/pictures/haobuyu/fishbackground.jpg.meta b/assets/FishSingle/pictures/haobuyu/fishbackground.jpg.meta index 85b85eb..2d11453 100644 --- a/assets/FishSingle/pictures/haobuyu/fishbackground.jpg.meta +++ b/assets/FishSingle/pictures/haobuyu/fishbackground.jpg.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1920, - "height": 1080, - "rawWidth": 1920, - "rawHeight": 1080, + "width": 1334, + "height": 750, + "rawWidth": 1334, + "rawHeight": 750, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -64,17 +64,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -960, - -540, + -667, + -375, 0, - 960, - -540, + 667, + -375, 0, - -960, - 540, + -667, + 375, 0, - 960, - 540, + 667, + 375, 0 ], "indexes": [ @@ -87,12 +87,12 @@ ], "uv": [ 0, - 1080, - 1920, - 1080, + 750, + 1334, + 750, 0, 0, - 1920, + 1334, 0 ], "nuv": [ @@ -106,13 +106,13 @@ 1 ], "minPos": [ - -960, - -540, + -667, + -375, 0 ], "maxPos": [ - 960, - 540, + 667, + 375, 0 ] } diff --git a/assets/FishSingle/pictures/haobuyu/fishbg1.jpg b/assets/FishSingle/pictures/haobuyu/fishbg1.jpg old mode 100644 new mode 100755 index 4761710..491c9b7 Binary files a/assets/FishSingle/pictures/haobuyu/fishbg1.jpg and b/assets/FishSingle/pictures/haobuyu/fishbg1.jpg differ diff --git a/assets/FishSingle/pictures/haobuyu/fishbg1.jpg.meta b/assets/FishSingle/pictures/haobuyu/fishbg1.jpg.meta index 659f9d1..bcab4cf 100644 --- a/assets/FishSingle/pictures/haobuyu/fishbg1.jpg.meta +++ b/assets/FishSingle/pictures/haobuyu/fishbg1.jpg.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "66d28bb4-7926-457a-bfdd-352fbdff0612", + "uuid": "30514d45-db3b-4904-9e84-5269572856f6", "files": [ ".jpg", ".json" @@ -10,20 +10,20 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "66d28bb4-7926-457a-bfdd-352fbdff0612@6c48a", + "uuid": "30514d45-db3b-4904-9e84-5269572856f6@6c48a", "displayName": "fishbg1", "id": "6c48a", "name": "texture", "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "30514d45-db3b-4904-9e84-5269572856f6", + "isUuid": true, + "visible": false, "minfilter": "linear", "magfilter": "linear", - "wrapModeT": "clamp-to-edge", - "wrapModeS": "clamp-to-edge", "mipfilter": "none", - "imageUuidOrDatabaseUri": "66d28bb4-7926-457a-bfdd-352fbdff0612", - "anisotropy": 0, - "isUuid": true, - "visible": false + "anisotropy": 0 }, "ver": "1.0.22", "imported": true, @@ -34,7 +34,7 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "66d28bb4-7926-457a-bfdd-352fbdff0612@f9941", + "uuid": "30514d45-db3b-4904-9e84-5269572856f6@f9941", "displayName": "fishbg1", "id": "f9941", "name": "spriteFrame", @@ -46,35 +46,32 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 941, - "height": 529, - "rawWidth": 941, - "rawHeight": 529, + "width": 1280, + "height": 720, + "rawWidth": 1280, + "rawHeight": 720, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, "borderRight": 0, - "imageUuidOrDatabaseUri": "66d28bb4-7926-457a-bfdd-352fbdff0612@6c48a", "packable": true, - "isUuid": true, - "atlasUuid": "", "pixelsToUnit": 100, "pivotX": 0.5, "pivotY": 0.5, "meshType": 0, "vertices": { "rawPosition": [ - -470.5, - -264.5, + -640, + -360, 0, - 470.5, - -264.5, + 640, + -360, 0, - -470.5, - 264.5, + -640, + 360, 0, - 470.5, - 264.5, + 640, + 360, 0 ], "indexes": [ @@ -87,12 +84,12 @@ ], "uv": [ 0, - 529, - 941, - 529, + 720, + 1280, + 720, 0, 0, - 941, + 1280, 0 ], "nuv": [ @@ -106,16 +103,19 @@ 1 ], "minPos": [ - -470.5, - -264.5, + -640, + -360, 0 ], "maxPos": [ - 470.5, - 264.5, + 640, + 360, 0 ] - } + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "30514d45-db3b-4904-9e84-5269572856f6@6c48a", + "atlasUuid": "" }, "ver": "1.0.12", "imported": true, @@ -128,7 +128,7 @@ "userData": { "type": "sprite-frame", "hasAlpha": false, - "redirect": "66d28bb4-7926-457a-bfdd-352fbdff0612@f9941", - "fixAlphaTransparencyArtifacts": false + "fixAlphaTransparencyArtifacts": false, + "redirect": "30514d45-db3b-4904-9e84-5269572856f6@f9941" } } diff --git a/assets/FishSingle/pictures/haobuyu/jf.png b/assets/FishSingle/pictures/haobuyu/jf.png new file mode 100755 index 0000000..92b33ee Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/jf.png differ diff --git a/assets/FishSingle/pictures/haobuyu/jf.png.meta b/assets/FishSingle/pictures/haobuyu/jf.png.meta new file mode 100644 index 0000000..abf2fb5 --- /dev/null +++ b/assets/FishSingle/pictures/haobuyu/jf.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "667dae90-8327-4fd8-b314-c95c92ed1420", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "667dae90-8327-4fd8-b314-c95c92ed1420@6c48a", + "displayName": "jf", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "667dae90-8327-4fd8-b314-c95c92ed1420", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "667dae90-8327-4fd8-b314-c95c92ed1420@f9941", + "displayName": "jf", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 36, + "height": 36, + "rawWidth": 36, + "rawHeight": 36, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -18, + -18, + 0, + 18, + -18, + 0, + -18, + 18, + 0, + 18, + 18, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 36, + 36, + 36, + 0, + 0, + 36, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -18, + -18, + 0 + ], + "maxPos": [ + 18, + 18, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "667dae90-8327-4fd8-b314-c95c92ed1420@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "667dae90-8327-4fd8-b314-c95c92ed1420@f9941" + } +} diff --git a/assets/FishSingle/pictures/haobuyu/userbg.png b/assets/FishSingle/pictures/haobuyu/userbg.png new file mode 100755 index 0000000..b9450a4 Binary files /dev/null and b/assets/FishSingle/pictures/haobuyu/userbg.png differ diff --git a/assets/FishSingle/pictures/haobuyu/userbg.png.meta b/assets/FishSingle/pictures/haobuyu/userbg.png.meta new file mode 100644 index 0000000..cd05eb3 --- /dev/null +++ b/assets/FishSingle/pictures/haobuyu/userbg.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "f9fc17ee-6006-40dd-8429-f46040b4d56c", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "f9fc17ee-6006-40dd-8429-f46040b4d56c@6c48a", + "displayName": "userbg", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "f9fc17ee-6006-40dd-8429-f46040b4d56c", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "f9fc17ee-6006-40dd-8429-f46040b4d56c@f9941", + "displayName": "userbg", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 262, + "height": 90, + "rawWidth": 264, + "rawHeight": 92, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -131, + -45, + 0, + 131, + -45, + 0, + -131, + 45, + 0, + 131, + 45, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 1, + 91, + 263, + 91, + 1, + 1, + 263, + 1 + ], + "nuv": [ + 0.003787878787878788, + 0.010869565217391304, + 0.9962121212121212, + 0.010869565217391304, + 0.003787878787878788, + 0.9891304347826086, + 0.9962121212121212, + 0.9891304347826086 + ], + "minPos": [ + -131, + -45, + 0 + ], + "maxPos": [ + 131, + 45, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "f9fc17ee-6006-40dd-8429-f46040b4d56c@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "hasAlpha": true, + "fixAlphaTransparencyArtifacts": false, + "redirect": "f9fc17ee-6006-40dd-8429-f46040b4d56c@f9941" + } +} diff --git a/assets/FishSingle/prefab/ProgressPrefab.prefab b/assets/FishSingle/prefab/ProgressPrefab.prefab index 7d3445b..d43c440 100644 --- a/assets/FishSingle/prefab/ProgressPrefab.prefab +++ b/assets/FishSingle/prefab/ProgressPrefab.prefab @@ -487,7 +487,6 @@ "_batchAsBitmap": false, "_id": "", "_enableOutline": true, - "_outlineWidth": 3, "_outlineColor": { "__type__": "cc.Color", "r": 0, diff --git a/assets/FishSingle/prefab/game/fish/FishWikiItem.prefab b/assets/FishSingle/prefab/game/fish/FishWikiItem.prefab index eaf1459..fc1d2ed 100644 --- a/assets/FishSingle/prefab/game/fish/FishWikiItem.prefab +++ b/assets/FishSingle/prefab/game/fish/FishWikiItem.prefab @@ -549,12 +549,11 @@ "_styleFlags": 0, "_id": "", "_enableOutline": true, - "_outlineWidth": 3, "_outlineColor": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 } }, @@ -736,12 +735,11 @@ "_styleFlags": 0, "_id": "", "_enableOutline": true, - "_outlineWidth": 3, "_outlineColor": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 } }, diff --git a/assets/FishSingle/prefab/score/ScorePrefab.prefab b/assets/FishSingle/prefab/score/ScorePrefab.prefab index b331aec..c4e7e6a 100644 --- a/assets/FishSingle/prefab/score/ScorePrefab.prefab +++ b/assets/FishSingle/prefab/score/ScorePrefab.prefab @@ -173,16 +173,14 @@ "_batchAsBitmap": false, "_id": "", "_enableOutline": true, - "_outlineWidth": 2, "_outlineColor": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, "_enableShadow": true, - "_shadowBlur": 2, "_shadowOffset": { "__type__": "cc.Vec2", "x": 2, @@ -190,9 +188,9 @@ }, "_shadowColor": { "__type__": "cc.Color", - "r": 250, - "g": 250, - "b": 250, + "r": 0, + "g": 0, + "b": 0, "a": 255 } }, diff --git a/assets/FishSingle/scene/FishGameScene.scene b/assets/FishSingle/scene/FishGameScene.scene index 34c9f07..f53c915 100644 --- a/assets/FishSingle/scene/FishGameScene.scene +++ b/assets/FishSingle/scene/FishGameScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 153 + "__id__": 168 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 158 + "__id__": 173 }, "_id": "49f37487-196e-48a5-ad7e-0f3f4fcc8496" }, @@ -89,34 +89,34 @@ "__id__": 31 }, { - "__id__": 131 - }, - { - "__id__": 135 - }, - { - "__id__": 86 - }, - { - "__id__": 144 - } - ], - "_active": true, - "_components": [ - { - "__id__": 148 - }, - { - "__id__": 149 + "__id__": 146 }, { "__id__": 150 }, { - "__id__": 151 + "__id__": 101 }, { - "__id__": 152 + "__id__": 159 + } + ], + "_active": true, + "_components": [ + { + "__id__": 163 + }, + { + "__id__": 164 + }, + { + "__id__": 165 + }, + { + "__id__": 166 + }, + { + "__id__": 167 } ], "_prefab": null, @@ -214,7 +214,7 @@ "_priority": -1, "_fov": 60, "_fovAxis": 0, - "_orthoHeight": 621, + "_orthoHeight": 709.6600234466589, "_near": 1, "_far": 4096, "_color": { @@ -362,7 +362,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "66d28bb4-7926-457a-bfdd-352fbdff0612@f9941", + "__uuid__": "30514d45-db3b-4904-9e84-5269572856f6@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1062,27 +1062,18 @@ }, { "__id__": 65 - }, - { - "__id__": 70 - }, - { - "__id__": 75 - }, - { - "__id__": 80 } ], "_active": true, "_components": [ { - "__id__": 85 + "__id__": 100 }, { - "__id__": 129 + "__id__": 144 }, { - "__id__": 130 + "__id__": 145 } ], "_prefab": null, @@ -1762,7 +1753,7 @@ "__id__": 31 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 52 @@ -1909,7 +1900,9 @@ "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, - "_target": null, + "_target": { + "__id__": 51 + }, "_id": "15fxVBbndMKaNb15VUzP38" }, { @@ -2229,18 +2222,73 @@ }, { "__type__": "cc.Node", - "_name": "dz-button", + "_name": "userInfo", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 31 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 66 }, + { + "__id__": 70 + } + ], + "_active": true, + "_components": [ + { + "__id__": 97 + }, + { + "__id__": 98 + }, + { + "__id__": 99 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -401.5715, + "y": 14.551499999999976, + "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": "77CjrwwsxJF7KY7wh69TAz" + }, + { + "__type__": "cc.Node", + "_name": "avatar", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 65 + }, + "_children": [], + "_active": true, + "_components": [ { "__id__": 67 }, @@ -2254,8 +2302,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -394.0715, - "y": -5.448500000000024, + "x": -62.5, + "y": 0, "z": 0 }, "_lrot": { @@ -2279,7 +2327,29 @@ "y": 0, "z": 0 }, - "_id": "d0rxn7bhtPnL6b6zabR77O" + "_id": "3cBYwPupZJfrKwoDZhmgxe" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 66 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 74, + "height": 77 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "6e8q9rYntBlrACoWjabBd7" }, { "__type__": "cc.Sprite", @@ -2287,14 +2357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 66 }, "_enabled": true, "__prefab": null, - "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", - "__expectedType__": "cc.Material" - }, + "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -2305,12 +2372,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "22eaab96-f558-48fc-bd44-75f2629b62a4@e93b0", + "__uuid__": "cda62680-32c9-4bf8-bdf5-341b6d6f41c3@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2320,46 +2387,8 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "22eaab96-f558-48fc-bd44-75f2629b62a4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "3aV4Tj1P1N+ot260pgcAYo" - }, - { - "__type__": "cc.UIOpacity", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": null, - "_opacity": 255, - "_id": "6f++R0mztCs46VdTfF5Y8P" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 65 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "f03vL+lqlA86rAG7DPLof5" + "_atlas": null, + "_id": "c1kFf/WWBBV4v4+kFBKEPc" }, { "__type__": "cc.Widget", @@ -2367,18 +2396,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 65 + "__id__": 66 }, "_enabled": true, "__prefab": null, - "_alignFlags": 12, - "_target": { - "__id__": 2 - }, - "_left": 50, + "_alignFlags": 10, + "_target": null, + "_left": 8, "_right": 0, "_top": 0, - "_bottom": 20, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2391,37 +2418,38 @@ "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, - "_id": "d2Q0WEe3FDlYm14F/C9b7k" + "_id": "a0ZuNy5sJKx5EeTuLr47N2" }, { "__type__": "cc.Node", - "_name": "dzScore", + "_name": "info", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 31 + "__id__": 65 }, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 71 }, { - "__id__": 72 + "__id__": 83 + } + ], + "_active": true, + "_components": [ + { + "__id__": 95 }, { - "__id__": 73 - }, - { - "__id__": 74 + "__id__": 96 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -393.1315, - "y": -5.448500000000024, + "x": 40, + "y": 0, "z": 0 }, "_lrot": { @@ -2445,22 +2473,150 @@ "y": 0, "z": 0 }, - "_id": "9eN4yYEntAnI4jRBgfOzYA" + "_id": "e0iN0QSdVB3Jjl92onj3fT" }, { - "__type__": "cc.Label", + "__type__": "cc.Node", + "_name": "dz_fillet", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 70 + }, + "_children": [ + { + "__id__": 72 + }, + { + "__id__": 76 + } + ], + "_active": true, + "_components": [ + { + "__id__": 80 + }, + { + "__id__": 81 + }, + { + "__id__": 82 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -20, + "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": "f7OfDDZZVBMaAiMlo056CJ" + }, + { + "__type__": "cc.Node", + "_name": "dz", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 71 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 73 + }, + { + "__id__": 74 + }, + { + "__id__": 75 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -42.5, + "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": "034vakvflEjqTEyVt3j5le" + }, + { + "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": null, - "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", - "__expectedType__": "cc.Material" + "_contentSize": { + "__type__": "cc.Size", + "width": 45, + "height": 42 }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "58dW0fJKhHgasedn9MnDfn" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 72 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -2470,85 +2626,24 @@ "b": 255, "a": 255 }, - "_string": "99999999999", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": { - "__uuid__": "1211e573-316a-4495-8f42-3cbbf205c898", - "__expectedType__": "cc.BitmapFont" + "_spriteFrame": { + "__uuid__": "962c910f-069b-4a38-9099-4596ed34e91e@f9941", + "__expectedType__": "cc.SpriteFrame" }, - "_isSystemFontUsed": false, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 0, - "_cacheMode": 0, - "_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": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { "__type__": "cc.Vec2", - "x": 2, - "y": 2 + "x": 0, + "y": 0 }, - "_shadowBlur": 2, - "_id": "69g21/srlL+rvgenMfODQr" - }, - { - "__type__": "cc.UIOpacity", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "_opacity": 255, - "_id": "d0RZHeM/dMzaS8rCLT3okf" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 171.88, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "c8BqmSbLtJd6jo80/VucSp" + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "190iGacAVKB4IB7VvvDI/Y" }, { "__type__": "cc.Widget", @@ -2556,18 +2651,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 72 }, "_enabled": true, "__prefab": null, - "_alignFlags": 12, - "_target": { - "__id__": 2 - }, - "_left": 80, + "_alignFlags": 8, + "_target": null, + "_left": -5, "_right": 0, "_top": 0, - "_bottom": 20, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2580,22 +2673,19 @@ "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, - "_id": "a2zzcNJH1GxbeopVerjBkH" + "_id": "bf+wx1S0lFjaUyo5L55xTv" }, { "__type__": "cc.Node", - "_name": "jf-button", + "_name": "dz_text", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 31 + "__id__": 71 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 76 - }, { "__id__": 77 }, @@ -2609,8 +2699,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": -394.0715, - "y": 44.551499999999976, + "x": 10.5322265625, + "y": 0, "z": 0 }, "_lrot": { @@ -2634,65 +2724,7 @@ "y": 0, "z": 0 }, - "_id": "7eR48HjvhI3YysHoI+kgfz" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 75 - }, - "_enabled": true, - "__prefab": null, - "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", - "__expectedType__": "cc.Material" - }, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "22eaab96-f558-48fc-bd44-75f2629b62a4@e93b0", - "__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": { - "__uuid__": "22eaab96-f558-48fc-bd44-75f2629b62a4", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "062jVElshHq40ysaXmDqp3" - }, - { - "__type__": "cc.UIOpacity", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 75 - }, - "_enabled": true, - "__prefab": null, - "_opacity": 255, - "_id": "d9ffuATJpPbpB9YeCbwz78" + "_id": "59LhR6VU9IAbfH3XjA95+6" }, { "__type__": "cc.UITransform", @@ -2700,107 +2732,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 76 }, "_enabled": true, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 40 + "width": 48.935546875, + "height": 30 }, "_anchorPoint": { "__type__": "cc.Vec2", "x": 0.5, "y": 0.5 }, - "_id": "feYHFxMhdMVZu1qbRTsUF+" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 75 - }, - "_enabled": true, - "__prefab": null, - "_alignFlags": 12, - "_target": { - "__id__": 2 - }, - "_left": 50, - "_right": 0, - "_top": 0, - "_bottom": 120, - "_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": "c7p7b2Go5Gqo5nTi99A9dc" - }, - { - "__type__": "cc.Node", - "_name": "jfScore", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 31 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 81 - }, - { - "__id__": 82 - }, - { - "__id__": 83 - }, - { - "__id__": 84 - } - ], - "_prefab": null, - "_lpos": { - "__type__": "cc.Vec3", - "x": -393.1315, - "y": 44.551499999999976, - "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": "dfwpdEKmBFcJGTt7vBpRAU" + "_id": "a9+kYGJdlHgI7sRVqSI1UI" }, { "__type__": "cc.Label", @@ -2808,14 +2754,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 76 }, "_enabled": true, "__prefab": null, - "_customMaterial": { - "__uuid__": "fda095cb-831d-4601-ad94-846013963de8", - "__expectedType__": "cc.Material" - }, + "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { @@ -2825,25 +2768,22 @@ "b": 255, "a": 255 }, - "_string": "99999999999", + "_string": "0", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, "_fontSize": 20, "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": { - "__uuid__": "1211e573-316a-4495-8f42-3cbbf205c898", - "__expectedType__": "cc.BitmapFont" - }, - "_isSystemFontUsed": false, + "_lineHeight": 0, + "_overflow": 2, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_isItalic": false, "_isBold": false, "_isUnderline": false, - "_underlineHeight": 0, + "_underlineHeight": 2, "_cacheMode": 0, "_enableOutline": false, "_outlineColor": { @@ -2868,42 +2808,7 @@ "y": 2 }, "_shadowBlur": 2, - "_id": "1aVjIr+c5DiYxTapJqAaxc" - }, - { - "__type__": "cc.UIOpacity", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 80 - }, - "_enabled": true, - "__prefab": null, - "_opacity": 255, - "_id": "f4CDl6rhRAxLFW8RiLvOvj" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 80 - }, - "_enabled": true, - "__prefab": null, - "_contentSize": { - "__type__": "cc.Size", - "width": 171.88, - "height": 40 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "0fBltxmgdLSqrbv5kM6aPc" + "_id": "9b5WvbvapLt7Lbg6ZCOikM" }, { "__type__": "cc.Widget", @@ -2911,18 +2816,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 80 + "__id__": 76 }, "_enabled": true, "__prefab": null, - "_alignFlags": 12, - "_target": { - "__id__": 2 - }, - "_left": 80, - "_right": 0, + "_alignFlags": 34, + "_target": null, + "_left": 0, + "_right": 25, "_top": 0, - "_bottom": 120, + "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -2935,7 +2838,699 @@ "_originalHeight": 0, "_alignMode": 2, "_lockFlags": 0, - "_id": "0eHv8Z/+pClqxnyR8aJteQ" + "_id": "b9eRq189JNCLufDoLYKOSi" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 30 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "a32rpoMgpCB6cOLqTQMEM3" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "38ef2cdf-a945-429d-b703-3c9536058498@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": "659VbxxHVATL7ovG+uJG5F" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 71 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 4, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 15, + "_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": "17rXnioZ9PQrYTDiisG3bk" + }, + { + "__type__": "cc.Node", + "_name": "jf_fillet", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 70 + }, + "_children": [ + { + "__id__": 84 + }, + { + "__id__": 88 + } + ], + "_active": true, + "_components": [ + { + "__id__": 92 + }, + { + "__id__": 93 + }, + { + "__id__": 94 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 20, + "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": "63xP0FtWxHSJBfklTuhfG+" + }, + { + "__type__": "cc.Node", + "_name": "jf", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 85 + }, + { + "__id__": 86 + }, + { + "__id__": 87 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": -44, + "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": "32x7dMf/5PRaedQUjjYOdN" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 36, + "height": 36 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "75OUK5tflKIb81Mk/x5i+R" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "667dae90-8327-4fd8-b314-c95c92ed1420@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": "5fXI9C6SFFkqjv1tbcv6jI" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 84 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 8, + "_target": null, + "_left": -2, + "_right": 0, + "_top": 0, + "_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": "f1XT/gxI1DXa0K2QMI9ees" + }, + { + "__type__": "cc.Node", + "_name": "jf_text", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 83 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 89 + }, + { + "__id__": 90 + }, + { + "__id__": 91 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 10.5322265625, + "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": "fcGYzGL0NDMrsvERqBxKAH" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 48.935546875, + "height": 30 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "deVBMbNZFM968P/XvcagkY" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 0, + "_overflow": 2, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_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": "6697WZUXhDx4VPVzWP82mu" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 88 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 34, + "_target": null, + "_left": 0, + "_right": 25, + "_top": 0, + "_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": "36hK7kLqlAjbyg0LBvoKSw" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 83 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 120, + "height": 30 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "dcuylZ8+dGuLdkpyQfNLQX" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 83 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "38ef2cdf-a945-429d-b703-3c9536058498@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": "7fTuz5LlRNlbF8P9keXTmK" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 83 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 15, + "_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": "0eUFqN9vNHqKpD3W3I2MK+" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 125, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "ee9ld4u9hEDogAmVGo7PJ3" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 70 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 32, + "_target": null, + "_left": 0, + "_right": 5, + "_top": 0, + "_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": "edvzNLxJdFzob3B2CddOIy" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 65 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 215, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "84G5DSAxxGppLGN3aBfbid" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 65 + }, + "_enabled": true, + "__prefab": null, + "_alignFlags": 12, + "_target": { + "__id__": 2 + }, + "_left": 20, + "_right": 0, + "_top": 0, + "_bottom": 10, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 12, + "_id": "9dpcvas2JGxbwCFxEBnJbH" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 65 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f9fc17ee-6006-40dd-8429-f46040b4d56c@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": "22m+aiSfNA14RzAhhSplPe" }, { "__type__": "47604c854NMlIvb9bkfIwNK", @@ -2951,7 +3546,7 @@ "jfScore": null, "clickEffect": null, "waveEffect": { - "__id__": 86 + "__id__": 101 }, "_id": "ecYf8z281HPYqMzFlh71IL" }, @@ -2962,14 +3557,14 @@ "__id__": 2 }, "_prefab": { - "__id__": 87 + "__id__": 102 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 86 + "__id__": 101 }, "asset": { "__uuid__": "f54c348d-0c47-4d0d-84c0-6f3ba50e83cd", @@ -2977,7 +3572,7 @@ }, "fileId": "72rT9g30NI9I3xQCX6hAX8", "instance": { - "__id__": 88 + "__id__": 103 }, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -2990,64 +3585,64 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 89 + "__id__": 104 }, { - "__id__": 91 + "__id__": 106 }, { - "__id__": 93 + "__id__": 108 }, { - "__id__": 95 + "__id__": 110 }, { - "__id__": 97 + "__id__": 112 }, { - "__id__": 99 + "__id__": 114 }, { - "__id__": 101 + "__id__": 116 }, { - "__id__": 103 + "__id__": 118 }, { - "__id__": 105 + "__id__": 120 }, { - "__id__": 107 + "__id__": 122 }, { - "__id__": 109 + "__id__": 124 }, { - "__id__": 111 + "__id__": 126 }, { - "__id__": 113 + "__id__": 128 }, { - "__id__": 115 + "__id__": 130 }, { - "__id__": 117 + "__id__": 132 }, { - "__id__": 119 + "__id__": 134 }, { - "__id__": 121 + "__id__": 136 }, { - "__id__": 123 + "__id__": 138 }, { - "__id__": 125 + "__id__": 140 }, { - "__id__": 127 + "__id__": 142 } ], "removedComponents": [] @@ -3055,7 +3650,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 90 + "__id__": 105 }, "propertyPath": [ "position" @@ -3076,7 +3671,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 92 + "__id__": 107 }, "propertyPath": [ "_customMaterial" @@ -3095,7 +3690,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 94 + "__id__": 109 }, "propertyPath": [ "_customMaterial" @@ -3114,7 +3709,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 96 + "__id__": 111 }, "propertyPath": [ "_customMaterial" @@ -3133,7 +3728,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 98 + "__id__": 113 }, "propertyPath": [ "_customMaterial" @@ -3152,7 +3747,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 100 + "__id__": 115 }, "propertyPath": [ "_customMaterial" @@ -3171,7 +3766,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 102 + "__id__": 117 }, "propertyPath": [ "_customMaterial" @@ -3190,7 +3785,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 104 + "__id__": 119 }, "propertyPath": [ "_customMaterial" @@ -3209,7 +3804,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 106 + "__id__": 121 }, "propertyPath": [ "_customMaterial" @@ -3228,7 +3823,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 108 + "__id__": 123 }, "propertyPath": [ "_customMaterial" @@ -3247,7 +3842,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 110 + "__id__": 125 }, "propertyPath": [ "_customMaterial" @@ -3266,7 +3861,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 112 + "__id__": 127 }, "propertyPath": [ "_customMaterial" @@ -3285,7 +3880,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 114 + "__id__": 129 }, "propertyPath": [ "_customMaterial" @@ -3304,7 +3899,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 116 + "__id__": 131 }, "propertyPath": [ "_customMaterial" @@ -3323,7 +3918,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 118 + "__id__": 133 }, "propertyPath": [ "_customMaterial" @@ -3342,7 +3937,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 120 + "__id__": 135 }, "propertyPath": [ "_customMaterial" @@ -3361,7 +3956,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 122 + "__id__": 137 }, "propertyPath": [ "_customMaterial" @@ -3380,7 +3975,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 124 + "__id__": 139 }, "propertyPath": [ "_customMaterial" @@ -3399,7 +3994,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 126 + "__id__": 141 }, "propertyPath": [ "_sizeMode" @@ -3415,7 +4010,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 128 + "__id__": 143 }, "propertyPath": [ "_contentSize" @@ -3453,11 +4048,11 @@ "node": { "__id__": 31 }, - "_enabled": true, + "_enabled": false, "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 765, + "width": 2280, "height": 72 }, "_anchorPoint": { @@ -3479,13 +4074,13 @@ "_active": true, "_components": [ { - "__id__": 132 + "__id__": 147 }, { - "__id__": 133 + "__id__": 148 }, { - "__id__": 134 + "__id__": 149 } ], "_prefab": null, @@ -3524,7 +4119,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 146 }, "_enabled": true, "__prefab": null, @@ -3540,7 +4135,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 146 }, "_enabled": true, "__prefab": null, @@ -3553,7 +4148,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 131 + "__id__": 146 }, "_enabled": true, "__prefab": null, @@ -3579,19 +4174,19 @@ }, "_children": [ { - "__id__": 136 + "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 156 }, { - "__id__": 142 + "__id__": 157 }, { - "__id__": 143 + "__id__": 158 } ], "_prefab": null, @@ -3630,29 +4225,29 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 135 + "__id__": 150 }, "_children": [], "_active": true, "_components": [ { - "__id__": 137 + "__id__": 152 }, { - "__id__": 138 + "__id__": 153 }, { - "__id__": 139 + "__id__": 154 }, { - "__id__": 140 + "__id__": 155 } ], "_prefab": null, "_lpos": { "__type__": "cc.Vec3", "x": -489, - "y": -552, + "y": -562, "z": 0 }, "_lrot": { @@ -3684,7 +4279,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 151 }, "_enabled": true, "__prefab": null, @@ -3726,7 +4321,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 151 }, "_enabled": true, "__prefab": null, @@ -3739,7 +4334,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 151 }, "_enabled": true, "__prefab": null, @@ -3761,7 +4356,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 151 }, "_enabled": true, "__prefab": null, @@ -3772,7 +4367,7 @@ "_left": 600, "_right": 0, "_top": 0, - "_bottom": 0, + "_bottom": -10, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -3793,12 +4388,12 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 150 }, "_enabled": true, "__prefab": null, "view": { - "__id__": 136 + "__id__": 151 }, "cannonSpriteFrame": [ { @@ -3810,23 +4405,23 @@ "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "c29e9aa8-3343-482f-b3c0-0f289cdf3e5e@f9941", + "__uuid__": "511b874d-bc3c-4dc0-a237-dcc6aef6dbbd@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "82017b2d-74a3-4ebd-86ed-a2c310bec222@f9941", + "__uuid__": "7ef4a8d8-105a-4d0b-90e7-28f3e1643d60@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "6a87d61f-cc37-4348-bf4e-3b977f8ebb2e@f9941", + "__uuid__": "c6812ce7-61f0-40f9-aa8f-d1121cc713df@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "818df71d-02fc-4e29-a2eb-bb1ddde418e8@f9941", + "__uuid__": "62538856-6491-4ae4-a146-7a5d73c776e6@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b0d14ae7-4d4b-4c05-aaac-93c4ca466e49@f9941", + "__uuid__": "2d2df4eb-a4f1-4dfc-8a3b-fcbe190084b5@f9941", "__expectedType__": "cc.SpriteFrame" } ], @@ -3838,7 +4433,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 150 }, "_enabled": true, "__prefab": null, @@ -3851,7 +4446,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 135 + "__id__": 150 }, "_enabled": true, "__prefab": null, @@ -3879,13 +4474,13 @@ "_active": true, "_components": [ { - "__id__": 145 + "__id__": 160 }, { - "__id__": 146 + "__id__": 161 }, { - "__id__": 147 + "__id__": 162 } ], "_prefab": null, @@ -3924,7 +4519,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 159 }, "_enabled": true, "__prefab": null, @@ -3946,7 +4541,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 159 }, "_enabled": true, "__prefab": null, @@ -3976,7 +4571,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 144 + "__id__": 159 }, "_enabled": true, "__prefab": null, @@ -4204,10 +4799,10 @@ "instance": null, "targetOverrides": [ { - "__id__": 154 + "__id__": 169 }, { - "__id__": 156 + "__id__": 171 } ], "nestedPrefabInstanceRoots": [ @@ -4215,14 +4810,14 @@ "__id__": 26 }, { - "__id__": 86 + "__id__": 101 } ] }, { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 85 + "__id__": 100 }, "sourceInfo": null, "propertyPath": [ @@ -4232,7 +4827,7 @@ "__id__": 26 }, "targetInfo": { - "__id__": 155 + "__id__": 170 } }, { @@ -4244,17 +4839,17 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 85 + "__id__": 100 }, "sourceInfo": null, "propertyPath": [ "waveEffect" ], "target": { - "__id__": 86 + "__id__": 101 }, "targetInfo": { - "__id__": 157 + "__id__": 172 } }, { @@ -4266,28 +4861,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 159 + "__id__": 174 }, "shadows": { - "__id__": 160 + "__id__": 175 }, "_skybox": { - "__id__": 161 + "__id__": 176 }, "fog": { - "__id__": 162 + "__id__": 177 }, "octree": { - "__id__": 163 + "__id__": 178 }, "skin": { - "__id__": 164 + "__id__": 179 }, "lightProbeInfo": { - "__id__": 165 + "__id__": 180 }, "postSettings": { - "__id__": 166 + "__id__": 181 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/FishSingle/scene/LoadingScene.scene b/assets/FishSingle/scene/LoadingScene.scene index e93c2f1..489ebfc 100644 --- a/assets/FishSingle/scene/LoadingScene.scene +++ b/assets/FishSingle/scene/LoadingScene.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 44 + "__id__": 52 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 53 + "__id__": 61 }, "_id": "3deca686-356b-4a89-97e0-d255f6a637b7" }, @@ -77,25 +77,25 @@ "__id__": 12 }, { - "__id__": 35 + "__id__": 43 } ], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 47 }, { - "__id__": 40 + "__id__": 48 }, { - "__id__": 41 + "__id__": 49 }, { - "__id__": 42 + "__id__": 50 }, { - "__id__": 43 + "__id__": 51 } ], "_prefab": null, @@ -193,7 +193,7 @@ "_priority": -1, "_fov": 60, "_fovAxis": 0, - "_orthoHeight": 803.9871382636657, + "_orthoHeight": 627.2953367875648, "_near": 1, "_far": 4096, "_color": { @@ -484,6 +484,24 @@ }, { "__id__": 33 + }, + { + "__id__": 35 + }, + { + "__id__": 36 + }, + { + "__id__": 37 + }, + { + "__id__": 38 + }, + { + "__id__": 39 + }, + { + "__id__": 41 } ], "removedComponents": [] @@ -674,6 +692,88 @@ "9686r/7GBC1Jgt/Xl5Wlbk" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 16 + }, + "propertyPath": [ + "_active" + ], + "value": true + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 16 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -22.359, + "y": -464.755, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 22 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": -646.5, + "y": -0.10000000149011612, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 40 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "e2Vv1bUelC/7EpoI1XnDNy" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 42 + }, + "propertyPath": [ + "_active" + ], + "value": false + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "c244u/aPRAJrCOXsUYfICO" + ] + }, { "__type__": "cc.Node", "_name": "UIRoot", @@ -686,13 +786,13 @@ "_active": true, "_components": [ { - "__id__": 36 + "__id__": 44 }, { - "__id__": 37 + "__id__": 45 }, { - "__id__": 38 + "__id__": 46 } ], "_prefab": null, @@ -731,7 +831,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -753,7 +853,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -783,7 +883,7 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 43 }, "_enabled": true, "__prefab": null, @@ -893,13 +993,13 @@ "instance": null, "targetOverrides": [ { - "__id__": 45 + "__id__": 53 }, { - "__id__": 47 + "__id__": 55 }, { - "__id__": 50 + "__id__": 58 } ], "nestedPrefabInstanceRoots": [ @@ -911,7 +1011,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 40 + "__id__": 48 }, "sourceInfo": null, "propertyPath": [ @@ -921,7 +1021,7 @@ "__id__": 12 }, "targetInfo": { - "__id__": 46 + "__id__": 54 } }, { @@ -936,7 +1036,7 @@ "__id__": 12 }, "sourceInfo": { - "__id__": 48 + "__id__": 56 }, "propertyPath": [ "percentLable" @@ -945,7 +1045,7 @@ "__id__": 12 }, "targetInfo": { - "__id__": 49 + "__id__": 57 } }, { @@ -966,7 +1066,7 @@ "__id__": 12 }, "sourceInfo": { - "__id__": 51 + "__id__": 59 }, "propertyPath": [ "bar" @@ -975,7 +1075,7 @@ "__id__": 12 }, "targetInfo": { - "__id__": 52 + "__id__": 60 } }, { @@ -993,28 +1093,28 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 54 + "__id__": 62 }, "shadows": { - "__id__": 55 + "__id__": 63 }, "_skybox": { - "__id__": 56 + "__id__": 64 }, "fog": { - "__id__": 57 + "__id__": 65 }, "octree": { - "__id__": 58 + "__id__": 66 }, "skin": { - "__id__": 59 + "__id__": 67 }, "lightProbeInfo": { - "__id__": 60 + "__id__": 68 }, "postSettings": { - "__id__": 61 + "__id__": 69 }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false diff --git a/assets/FishSingle/script/engine/config/CommonEvent.ts b/assets/FishSingle/script/engine/config/CommonEvent.ts index 22869f1..2aa5696 100644 --- a/assets/FishSingle/script/engine/config/CommonEvent.ts +++ b/assets/FishSingle/script/engine/config/CommonEvent.ts @@ -4,9 +4,9 @@ const { ccclass, property } = _decorator @ccclass('CommonEvent') export default class CommonEvent { - public static Event_FrameUpdate: string = 'Event_FrameUpdate' - public static Event_ConnectTimeOut: string = 'Event_ConnectTimeOut' - public static Event_ResourceLoader: string = 'Event_ResourceLoader' - public static Event_CheckUpdate: string = 'Event_CheckUpdate' - public static Event_Scene_Switch: string = 'Event_Scene_Switch' + public static Event_FrameUpdate: string = 'Event_FrameUpdate' + public static Event_ConnectTimeOut: string = 'Event_ConnectTimeOut' + public static Event_ResourceLoader: string = 'Event_ResourceLoader' + public static Event_CheckUpdate: string = 'Event_CheckUpdate' + public static Event_Scene_Switch: string = 'Event_Scene_Switch' } diff --git a/assets/FishSingle/script/engine/config/ManifestConfig.ts b/assets/FishSingle/script/engine/config/ManifestConfig.ts index 10b8431..52edaf6 100644 --- a/assets/FishSingle/script/engine/config/ManifestConfig.ts +++ b/assets/FishSingle/script/engine/config/ManifestConfig.ts @@ -1,37 +1,36 @@ import DateUtil from '../utils/DateUtil' + import NetConfig from './NetConfig' export default class ManifestConfig { - public static packageUrl: string = '' - public static remoteManifestUrl: string = '' - public static remoteVersionUrl: string = '' - public static version: string = '1.0.0' //更新包要更新这里 - public static assets: object = {} - public static searchPaths: Array = [] - public static getManifestStr(key: string) { - let obj: Object = {} - obj['packageUrl'] = `${NetConfig.hotupdateUrl}/hotupdate/${key}/` - obj['remoteManifestUrl'] = - NetConfig.hotupdateUrl + - '/hotupdate/' + - key + - '/project.manifest?t=' + - DateUtil.now() - obj['remoteManifestUrl'] = `${ - NetConfig.hotupdateUrl - }/hotupdate/${key}/project.manifest?t=${DateUtil.now()}` - obj['remoteVersionUrl'] = - NetConfig.hotupdateUrl + - '/hotupdate/' + - key + - '/version.manifest?t=' + - DateUtil.now() - obj['remoteVersionUrl'] = `${ - NetConfig.hotupdateUrl - }/hotupdate/${key}/version.manifest?t=${DateUtil.now()}` - obj['version'] = ManifestConfig.version - obj['assets'] = {} - obj['searchPaths'] = [] - return JSON.stringify(obj) - } + public static packageUrl: string = '' + public static remoteManifestUrl: string = '' + public static remoteVersionUrl: string = '' + public static version: string = '1.0.0' // 更新包要更新这里 + public static assets: object = {} + public static searchPaths: Array = [] + + public static getManifestStr(key: string) { + const obj: { + packageUrl?: string + remoteManifestUrl?: string + remoteVersionUrl?: string + version?: string + assets?: object + searchPaths?: Array + } = {} + obj.packageUrl = `${NetConfig.hotupdateUrl}/hotupdate/${key}/` + obj.remoteManifestUrl = `${NetConfig.hotupdateUrl}/hotupdate/${key}/project.manifest?t=${DateUtil.now()}` + obj.remoteManifestUrl = `${ + NetConfig.hotupdateUrl + }/hotupdate/${key}/project.manifest?t=${DateUtil.now()}` + obj.remoteVersionUrl = `${NetConfig.hotupdateUrl}/hotupdate/${key}/version.manifest?t=${DateUtil.now()}` + obj.remoteVersionUrl = `${ + NetConfig.hotupdateUrl + }/hotupdate/${key}/version.manifest?t=${DateUtil.now()}` + obj.version = ManifestConfig.version + obj.assets = {} + obj.searchPaths = [] + return JSON.stringify(obj) + } } diff --git a/assets/FishSingle/script/engine/config/MusicConfig.ts b/assets/FishSingle/script/engine/config/MusicConfig.ts index 99bb9f9..8b84da5 100644 --- a/assets/FishSingle/script/engine/config/MusicConfig.ts +++ b/assets/FishSingle/script/engine/config/MusicConfig.ts @@ -1,64 +1,59 @@ import { AudioClip } from 'cc' + import { GameConfig } from '../../game/config/GameConfig' export default class MusicConfig { - public static musicKey2Path: Map = new Map() //资源预加载路径 + public static musicKey2Path: Map = new Map() // 资源预加载路径 - public static musicKey2Cache: Map = new Map< - string, - AudioClip - >() //资源加载后cache路径 + public static musicKey2Cache: Map = new Map() // 资源加载后cache路径 - public static init() { - if ( - typeof GameConfig.GameName === 'undefined' || - GameConfig.GameName === null - ) { - console.error('GameConfig.GameName 未配置!') - return - } + public static init() { + if (typeof GameConfig.GameName === 'undefined' || GameConfig.GameName === null) { + console.error('GameConfig.GameName 未配置!') + return + } - const musicConfig = { - background_1: 'music/background_1', - background_2: 'music/background_2', - background_3: 'music/background_3', - deadfish_1: 'music/deadfish_1', - deadfish_2: 'music/deadfish_2', - deadfish_3: 'music/deadfish_3', - deadfish_4: 'music/deadfish_4', - deadfish_5: 'music/deadfish_5', - deadfish_6: 'music/deadfish_6', - deadfish_7: 'music/deadfish_7', - deadfish_8: 'music/deadfish_8', - deadfish_9: 'music/deadfish_9', - deadfish_10: 'music/deadfish_10', - deadfish_11: 'music/deadfish_11', - deadfish_12: 'music/deadfish_12', - deadfish_13: 'music/deadfish_13', - deadfish_14: 'music/deadfish_14', - deadfish_15: 'music/deadfish_15', - deadfish_16: 'music/deadfish_16', - deadfish_17: 'music/deadfish_17', - deadfish_18: 'music/deadfish_18', - deadfish_19: 'music/deadfish_19', - deadfish_20: 'music/deadfish_20', - deadfish_21: 'music/deadfish_21', - deadfish_22: 'music/deadfish_22', - deadfish_23: 'music/deadfish_23', - deadfish_24: 'music/deadfish_24', - deadfish_25: 'music/deadfish_25', - deadfish_26: 'music/deadfish_26', - deadfish_27: 'music/deadfish_27', - deadfish_28: 'music/deadfish_28', - deadfish_29: 'music/deadfish_29', - fire: 'music/fire', - } - // 音乐要预加载的配置 - for (const key in musicConfig) { - if (musicConfig.hasOwnProperty(key)) { - const path = `${GameConfig.GameName}/${musicConfig[key]}` - MusicConfig.musicKey2Path.set(key, path) - } - } - } + const musicConfig = { + background_1: 'music/background_1', + background_2: 'music/background_2', + background_3: 'music/background_3', + deadfish_1: 'music/deadfish_1', + deadfish_2: 'music/deadfish_2', + deadfish_3: 'music/deadfish_3', + deadfish_4: 'music/deadfish_4', + deadfish_5: 'music/deadfish_5', + deadfish_6: 'music/deadfish_6', + deadfish_7: 'music/deadfish_7', + deadfish_8: 'music/deadfish_8', + deadfish_9: 'music/deadfish_9', + deadfish_10: 'music/deadfish_10', + deadfish_11: 'music/deadfish_11', + deadfish_12: 'music/deadfish_12', + deadfish_13: 'music/deadfish_13', + deadfish_14: 'music/deadfish_14', + deadfish_15: 'music/deadfish_15', + deadfish_16: 'music/deadfish_16', + deadfish_17: 'music/deadfish_17', + deadfish_18: 'music/deadfish_18', + deadfish_19: 'music/deadfish_19', + deadfish_20: 'music/deadfish_20', + deadfish_21: 'music/deadfish_21', + deadfish_22: 'music/deadfish_22', + deadfish_23: 'music/deadfish_23', + deadfish_24: 'music/deadfish_24', + deadfish_25: 'music/deadfish_25', + deadfish_26: 'music/deadfish_26', + deadfish_27: 'music/deadfish_27', + deadfish_28: 'music/deadfish_28', + deadfish_29: 'music/deadfish_29', + fire: 'music/fire', + } + // 音乐要预加载的配置 + for (const key in musicConfig) { + if (Object.prototype.hasOwnProperty.call(musicConfig, key)) { + const path = `${GameConfig.GameName}/${musicConfig[key]}` + MusicConfig.musicKey2Path.set(key, path) + } + } + } } diff --git a/assets/FishSingle/script/engine/config/NetConfig.ts b/assets/FishSingle/script/engine/config/NetConfig.ts index 7632311..b51dfdc 100644 --- a/assets/FishSingle/script/engine/config/NetConfig.ts +++ b/assets/FishSingle/script/engine/config/NetConfig.ts @@ -1,3 +1,3 @@ export default class NetConfig { - public static hotupdateUrl: string = 'http://localhost:33/hotupdate' + public static hotupdateUrl: string = 'http://localhost:33/hotupdate' } diff --git a/assets/FishSingle/script/engine/uicomponent/CommonTips.ts b/assets/FishSingle/script/engine/uicomponent/CommonTips.ts index 162e739..90f9d44 100644 --- a/assets/FishSingle/script/engine/uicomponent/CommonTips.ts +++ b/assets/FishSingle/script/engine/uicomponent/CommonTips.ts @@ -1,50 +1,53 @@ -import { _decorator, Component, instantiate, Label, Node, tween, Vec3 } from 'cc' -import PrefabLoader from '../utils/PrefabLoader' +import { Component, Label, Node, Vec3, _decorator, instantiate, tween } from 'cc' + import { GameConfig } from '../../game/config/GameConfig' +import PrefabLoader from '../utils/PrefabLoader' + import DialogBase from './DialogBase' const { ccclass, property } = _decorator @ccclass('CommonTips') export default class CommonTips extends Component { - public static TipsZorderIndex: number = 999 - @property({ type: Label }) - txtContent: Label | null = null - private tips: string = '' - private static showingNameList: Array = [] - onLoad() {} + public static TipsZorderIndex: number = 999 + @property({ type: Label }) + txtContent: Label | null = null - start() { - tween(this.node) - .by(1.5, { position: new Vec3(0, 100, 0) }) - .to(0.2, { /* opacity: 0*/ scale: Vec3.ZERO }) - .call(() => { - this.node.destroy() - }) - .start() - } + private tips: string = '' + private static showingNameList: Array = [] - onDestroy() { - let index: number = CommonTips.showingNameList.indexOf(this.tips) - CommonTips.showingNameList.splice(index, 1) - this.unscheduleAllCallbacks() - } + onLoad() {} - public static showMsg(msg: string, parentNode: Node = null) { - PrefabLoader.loadPrefab( - `${GameConfig.GameName}/share/uicomponent/CommonTips`, - (loadedResource) => { - parentNode = parentNode || DialogBase.GetRootCanvas() - if (CommonTips.showingNameList.indexOf(msg) === -1) { - CommonTips.showingNameList.push(msg) - } - let dialogNode = instantiate(loadedResource) - dialogNode.setPosition(0, 0) - let dialogScript: CommonTips = dialogNode.getComponent(CommonTips) - dialogScript.tips = msg - dialogScript.txtContent.string = msg - parentNode.insertChild(dialogNode, CommonTips.TipsZorderIndex) - } - ) - } + start() { + tween(this.node) + .by(1.5, { position: new Vec3(0, 100, 0) }) + .to(0.2, { /* opacity: 0 */ scale: Vec3.ZERO }) + .call(() => { + this.node.destroy() + }) + .start() + } + + onDestroy() { + const index: number = CommonTips.showingNameList.indexOf(this.tips) + CommonTips.showingNameList.splice(index, 1) + this.unscheduleAllCallbacks() + } + + public static showMsg(msg: string, parentNode: Node = null) { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/CommonTips`, + (loadedResource) => { + parentNode = parentNode || DialogBase.GetRootCanvas() + if (!CommonTips.showingNameList.includes(msg)) CommonTips.showingNameList.push(msg) + + const dialogNode = instantiate(loadedResource) + dialogNode.setPosition(0, 0) + const dialogScript: CommonTips = dialogNode.getComponent(CommonTips) + dialogScript.tips = msg + dialogScript.txtContent.string = msg + parentNode.insertChild(dialogNode, CommonTips.TipsZorderIndex) + }, + ) + } } diff --git a/assets/FishSingle/script/engine/uicomponent/DarkLayer.ts b/assets/FishSingle/script/engine/uicomponent/DarkLayer.ts index bcaaaaa..8d1a300 100644 --- a/assets/FishSingle/script/engine/uicomponent/DarkLayer.ts +++ b/assets/FishSingle/script/engine/uicomponent/DarkLayer.ts @@ -1,30 +1,36 @@ -import { _decorator, Component, instantiate, Node, Prefab, Widget } from 'cc' -import PrefabLoader from '../utils/PrefabLoader' +import { Component, Node, Prefab, Widget, _decorator, instantiate } from 'cc' + import { GameConfig } from '../../game/config/GameConfig' +import PrefabLoader from '../utils/PrefabLoader' + import DialogBase from './DialogBase' const { ccclass, property } = _decorator @ccclass('DarkLayer') export default class DarkLayer extends Component { - private static prefab: Prefab - onLoad() { - this.getComponent(Widget).target = DialogBase.GetRootCanvas() - } - start() {} - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - `${GameConfig.GameName}/share/uicomponent/DarkLayer`, - (loadedResource) => { - DarkLayer.prefab = loadedResource - resolve() - } - ) - }) - } - public static getDarkLayer() { - let dialogNode: Node = instantiate(DarkLayer.prefab) - return dialogNode - } + private static prefab: Prefab + + onLoad() { + this.getComponent(Widget).target = DialogBase.GetRootCanvas() + } + + start() {} + + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/DarkLayer`, + (loadedResource) => { + DarkLayer.prefab = loadedResource + resolve() + }, + ) + }) + } + + public static getDarkLayer() { + const dialogNode: Node = instantiate(DarkLayer.prefab) + return dialogNode + } } diff --git a/assets/FishSingle/script/engine/uicomponent/DialogBase.ts b/assets/FishSingle/script/engine/uicomponent/DialogBase.ts index a8a5063..10a7954 100644 --- a/assets/FishSingle/script/engine/uicomponent/DialogBase.ts +++ b/assets/FishSingle/script/engine/uicomponent/DialogBase.ts @@ -1,65 +1,65 @@ -import { _decorator, Component, Node, Widget } from 'cc' -import DarkLayer from './DarkLayer' +import { Component, Node, Widget, _decorator } from 'cc' + import { UIRoot } from '../../game/utils/UIRoot' +import DarkLayer from './DarkLayer' + const { ccclass } = _decorator @ccclass('DialogBase') export default class DialogBase extends Component { - private static LocalZOrder: number = 5 - private darkLayer: Node | null = null + private static LocalZOrder: number = 5 + private darkLayer: Node | null = null - //private static _canvas: Node; - public static GetRootCanvas(): Node { - //if(DialogBase._canvas == null) - // DialogBase._canvas = director.getScene().getChildByName('Canvas'); - //return DialogBase._canvas; - return UIRoot.Instance.node - } - onLoad() { - DialogBase.LocalZOrder += 1 - let closeLayer: Node = this.node.getChildByName('closeLayer') - if (closeLayer) { - let closeLayerWidget: Widget = closeLayer.getComponent(Widget) - if (closeLayerWidget) { - closeLayerWidget.target = DialogBase.GetRootCanvas() - closeLayerWidget.left = 0 - closeLayerWidget.right = 0 - closeLayerWidget.top = 0 - closeLayerWidget.bottom = 0 - } - } - this.onLoadMe() - } + // private static _canvas: Node; + public static GetRootCanvas(): Node { + // if(DialogBase._canvas == null) + // DialogBase._canvas = director.getScene().getChildByName('Canvas'); + // return DialogBase._canvas; + return UIRoot.Instance.node + } - onLoadMe() {} + onLoad() { + DialogBase.LocalZOrder += 1 + const closeLayer: Node = this.node.getChildByName('closeLayer') + if (closeLayer) { + const closeLayerWidget: Widget = closeLayer.getComponent(Widget) + if (closeLayerWidget) { + closeLayerWidget.target = DialogBase.GetRootCanvas() + closeLayerWidget.left = 0 + closeLayerWidget.right = 0 + closeLayerWidget.top = 0 + closeLayerWidget.bottom = 0 + } + } + this.onLoadMe() + } - start(isPlayMv: boolean = false) { - this.darkLayer = DarkLayer.getDarkLayer() - this.node.insertChild(this.darkLayer, 0) //this.node.addChild(this.darkLayer, -1); - if (isPlayMv) { - this.node.setScale(0, 0) - } else { - this.onStartMe() - } - } + onLoadMe() {} - onStartMe() {} + start(isPlayMv: boolean = false) { + this.darkLayer = DarkLayer.getDarkLayer() + this.node.insertChild(this.darkLayer, 0) // this.node.addChild(this.darkLayer, -1); + if (isPlayMv) this.node.setScale(0, 0) + else this.onStartMe() + } - onClickClose() { - this.node.destroy() - } + onStartMe() {} - update(dt) { - this.onUpdateMe(dt) - } + onClickClose() { + this.node.destroy() + } - onUpdateMe(dt) {} + update(dt) { + this.onUpdateMe(dt) + } - onDestroy() { - DialogBase.LocalZOrder -= 1 - this.onDestroyMe() - } + onUpdateMe(dt) {} - onDestroyMe() {} + onDestroy() { + DialogBase.LocalZOrder -= 1 + this.onDestroyMe() + } + + onDestroyMe() {} } diff --git a/assets/FishSingle/script/engine/uicomponent/LoadingPrefab.ts b/assets/FishSingle/script/engine/uicomponent/LoadingPrefab.ts index 6b1d2c9..aff0173 100644 --- a/assets/FishSingle/script/engine/uicomponent/LoadingPrefab.ts +++ b/assets/FishSingle/script/engine/uicomponent/LoadingPrefab.ts @@ -1,78 +1,76 @@ -import { _decorator, Component, instantiate, Node, Prefab, Quat, Vec3 } from 'cc' -import PrefabLoader from '../utils/PrefabLoader' +import { Component, Node, Prefab, Quat, Vec3, _decorator, instantiate } from 'cc' + import { GameConfig } from '../../game/config/GameConfig' +import PrefabLoader from '../utils/PrefabLoader' + import DialogBase from './DialogBase' const { ccclass, property } = _decorator @ccclass('LoadingPrefab') export default class LoadingPrefab extends Component { - public static instance: Node - private static prefab: Prefab - public static LoadingZorderIndex: number = 99 - @property({ type: Node }) - loadingSp: Node | null = null + public static instance: Node + private static prefab: Prefab + public static LoadingZorderIndex: number = 99 + @property({ type: Node }) + loadingSp: Node | null = null - private _quatCache: Quat - private _vec3Cache: Vec3 - onLoad() { - this._quatCache = new Quat() - this._vec3Cache = new Vec3() - } + private _quatCache: Quat + private _vec3Cache: Vec3 - start() {} + onLoad() { + this._quatCache = new Quat() + this._vec3Cache = new Vec3() + } - public static close() { - if (!LoadingPrefab.instance) { - return - } - LoadingPrefab.instance.removeFromParent() - LoadingPrefab.instance.destroy() - LoadingPrefab.instance = null - } + start() {} - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'share/uicomponent/LoadingPrefab', - (loadedResource) => { - LoadingPrefab.prefab = loadedResource - resolve() - } - ) - }) - } + public static close() { + if (!LoadingPrefab.instance) return - private static createLoadingPrefab(parentNode: Node = null) { - let dialogNode: Node = instantiate(LoadingPrefab.prefab) - LoadingPrefab.instance = dialogNode - if (!parentNode) { - parentNode = DialogBase.GetRootCanvas() - } - parentNode.insertChild(dialogNode, LoadingPrefab.LoadingZorderIndex) - dialogNode.setPosition(0, 0) - } + LoadingPrefab.instance.removeFromParent() + LoadingPrefab.instance.destroy() + LoadingPrefab.instance = null + } - public static async show(parentNode: Node = null) { - if (LoadingPrefab.instance) return - if (!LoadingPrefab.prefab) { - await LoadingPrefab.preLoad() - } - this.createLoadingPrefab(parentNode) - } + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/LoadingPrefab`, + (loadedResource) => { + LoadingPrefab.prefab = loadedResource + resolve() + }, + ) + }) + } - update(dt) { - this.loadingSp.getRotation(this._quatCache) - Quat.toEuler(this._vec3Cache, this._quatCache) - this._vec3Cache.z += 10 - this.loadingSp.setRotationFromEuler(this._vec3Cache) - if (this._vec3Cache.z >= 360) { - this.loadingSp.getRotation(Quat.IDENTITY) - } - } + private static createLoadingPrefab(parentNode: Node = null) { + const dialogNode: Node = instantiate(LoadingPrefab.prefab) + LoadingPrefab.instance = dialogNode + if (!parentNode) parentNode = DialogBase.GetRootCanvas() - public static clear() { - LoadingPrefab.instance = null - LoadingPrefab.prefab = null - } + parentNode.insertChild(dialogNode, LoadingPrefab.LoadingZorderIndex) + dialogNode.setPosition(0, 0) + } + + public static async show(parentNode: Node = null) { + if (LoadingPrefab.instance) return + if (!LoadingPrefab.prefab) await LoadingPrefab.preLoad() + + this.createLoadingPrefab(parentNode) + } + + update(dt) { + this.loadingSp.getRotation(this._quatCache) + Quat.toEuler(this._vec3Cache, this._quatCache) + this._vec3Cache.z += 10 + this.loadingSp.setRotationFromEuler(this._vec3Cache) + if (this._vec3Cache.z >= 360) this.loadingSp.getRotation(Quat.IDENTITY) + } + + public static clear() { + LoadingPrefab.instance = null + LoadingPrefab.prefab = null + } } diff --git a/assets/FishSingle/script/engine/uicomponent/LoadingScenePrefab.ts b/assets/FishSingle/script/engine/uicomponent/LoadingScenePrefab.ts index 1bc7a0e..0cabd89 100644 --- a/assets/FishSingle/script/engine/uicomponent/LoadingScenePrefab.ts +++ b/assets/FishSingle/script/engine/uicomponent/LoadingScenePrefab.ts @@ -1,90 +1,76 @@ -import { _decorator, Component, instantiate, Node, Prefab } from 'cc' -import PrefabLoader from '../utils/PrefabLoader' -import Progress from './Progress' +import { Component, Node, Prefab, _decorator, instantiate } from 'cc' + import { GameConfig } from '../../game/config/GameConfig' +import PrefabLoader from '../utils/PrefabLoader' + import DialogBase from './DialogBase' +import Progress from './Progress' const { ccclass, property } = _decorator @ccclass('LoadingScenePrefab') export default class LoadingScenePrefab extends Component { - public static instance: Node - private static prefab: Prefab - public static LoadingZorderIndex: number = 99 - @property({ type: Node }) - private progressNode: Node | null = null - onLoad() {} + public static instance: Node + private static prefab: Prefab + public static LoadingZorderIndex: number = 99 + @property({ type: Node }) + private progressNode: Node | null = null - start() {} + onLoad() {} - public updateProgress( - completedCount: number, - totalCount: number, - item: any = null - ) { - this.progressNode - .getComponent(Progress) - .updateProgress( - completedCount, - totalCount, - '消耗流量,预下载所有"鱼"类中,请耐心等待...' - ) - } + start() {} - public static updateLoading( - completedCount: number, - totalCount: number, - item: any = null - ) { - if (LoadingScenePrefab.instance) { - let nodeTs: LoadingScenePrefab = - LoadingScenePrefab.instance.getComponent(LoadingScenePrefab) - if (nodeTs) { - nodeTs.updateProgress(completedCount, totalCount, item) - } - } - } + public updateProgress(completedCount: number, totalCount: number, item: any = null) { + this.progressNode + .getComponent(Progress) + .updateProgress(completedCount, totalCount, '消耗流量,预下载所有"鱼"类中,请耐心等待...') + } - private static createPrefab(parentNode: Node = null) { - let dialogNode: Node = instantiate(LoadingScenePrefab.prefab) - LoadingScenePrefab.instance = dialogNode - if (!parentNode) { - parentNode = DialogBase.GetRootCanvas() - } - parentNode.insertChild(dialogNode, LoadingScenePrefab.LoadingZorderIndex) - dialogNode.setPosition(0, 0) - } + public static updateLoading(completedCount: number, totalCount: number, item: any = null) { + if (LoadingScenePrefab.instance) { + const nodeTs: LoadingScenePrefab = + LoadingScenePrefab.instance.getComponent(LoadingScenePrefab) + if (nodeTs) nodeTs.updateProgress(completedCount, totalCount, item) + } + } - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'share/uicomponent/LoadingScenePrefab', - (loadedResource: Prefab) => { - LoadingScenePrefab.prefab = loadedResource - resolve() - } - ) - }) - } + private static createPrefab(parentNode: Node = null) { + const dialogNode: Node = instantiate(LoadingScenePrefab.prefab) + LoadingScenePrefab.instance = dialogNode + if (!parentNode) parentNode = DialogBase.GetRootCanvas() - public static close() { - if (!LoadingScenePrefab.instance) { - return - } - LoadingScenePrefab.instance.destroy() - LoadingScenePrefab.instance = null - } + parentNode.insertChild(dialogNode, LoadingScenePrefab.LoadingZorderIndex) + dialogNode.setPosition(0, 0) + } - public static async show(parentNode: Node = null) { - if (LoadingScenePrefab.instance) return - if (!LoadingScenePrefab.prefab) { - await LoadingScenePrefab.preLoad() - } - this.createPrefab(parentNode) - } + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/LoadingScenePrefab`, + (loadedResource: Prefab) => { + LoadingScenePrefab.prefab = loadedResource + resolve() + }, + ) + }) + } - public static clear() { - LoadingScenePrefab.instance = null - LoadingScenePrefab.prefab = null - } + public static close() { + if (!LoadingScenePrefab.instance) return + + LoadingScenePrefab.instance.destroy() + LoadingScenePrefab.instance = null + } + + public static async show(parentNode: Node = null) { + if (LoadingScenePrefab.instance) return + if (!LoadingScenePrefab.prefab) await LoadingScenePrefab.preLoad() + + this.createPrefab(parentNode) + } + + public static clear() { + LoadingScenePrefab.instance = null + LoadingScenePrefab.prefab = null + } } diff --git a/assets/FishSingle/script/engine/uicomponent/MusicPrefab.ts b/assets/FishSingle/script/engine/uicomponent/MusicPrefab.ts index e0f69d1..8ae2fc7 100644 --- a/assets/FishSingle/script/engine/uicomponent/MusicPrefab.ts +++ b/assets/FishSingle/script/engine/uicomponent/MusicPrefab.ts @@ -1,9 +1,18 @@ -import { _decorator, AssetManager, AudioClip, AudioSource, Component, instantiate, Prefab } from 'cc' +import { + AssetManager, + AudioClip, + AudioSource, + Component, + Prefab, + _decorator, + instantiate, +} from 'cc' + +import { GameConfig } from '../../game/config/GameConfig' +import MusicConfig from '../config/MusicConfig' +import LocalStorage from '../utils/LocalStorage' import { Logger } from '../utils/Logger' import PrefabLoader from '../utils/PrefabLoader' -import LocalStorage from '../utils/LocalStorage' -import MusicConfig from '../config/MusicConfig' -import { GameConfig } from '../../game/config/GameConfig' const { ccclass, property } = _decorator @@ -13,71 +22,59 @@ const { ccclass, property } = _decorator @ccclass('MusicPrefab') export default class MusicPrefab extends Component { - private static instance: MusicPrefab - private static MUSIC_VOLUMN_KEY: string = 'musicVolumn' - public static musicVolumn: number = 1 - public static play(key: string) { - let url: string = MusicConfig.musicKey2Path.get(key) - if (url) { - AssetManager.instance.resources.load( - url, - AudioClip, - (error: Error, clip: AudioClip) => { - if (error) { - Logger.warn(this, 'load music error===', error.message) - } else { - if (clip) { - this.instance.node.getComponent(AudioSource).clip = clip - this.instance.node.getComponent(AudioSource).volume = - this.musicVolumn - this.instance.node.getComponent(AudioSource).play() - this.instance.node.getComponent(AudioSource).loop = true - } - } - } - ) - } else { - Logger.warn(this, '播放不存在的music=', key) - } - } + private static instance: MusicPrefab + private static MUSIC_VOLUMN_KEY: string = 'musicVolumn' + public static musicVolumn: number = 1 - public static changeVolumn(nowVolumn: number) { - this.musicVolumn = nowVolumn - this.instance.node.getComponent(AudioSource).volume = nowVolumn - LocalStorage.setItem( - MusicPrefab.MUSIC_VOLUMN_KEY, - this.musicVolumn.toString() - ) - } + public static play(key: string) { + const url: string = MusicConfig.musicKey2Path.get(key) + if (url) { + AssetManager.instance.resources.load(url, AudioClip, (error: Error, clip: AudioClip) => { + if (error) { + Logger.warn(this, 'load music error===', error.message) + } else { + if (clip) { + this.instance.node.getComponent(AudioSource).clip = clip + this.instance.node.getComponent(AudioSource).volume = this.musicVolumn + this.instance.node.getComponent(AudioSource).play() + this.instance.node.getComponent(AudioSource).loop = true + } + } + }) + } else { + Logger.warn(this, '播放不存在的music=', key) + } + } - private static preInit() { - this.musicVolumn = parseFloat( - LocalStorage.getItem(MusicPrefab.MUSIC_VOLUMN_KEY) - ) - if (isNaN(this.musicVolumn)) { - this.musicVolumn = 1 - } - } + public static changeVolumn(nowVolumn: number) { + this.musicVolumn = nowVolumn + this.instance.node.getComponent(AudioSource).volume = nowVolumn + LocalStorage.setItem(MusicPrefab.MUSIC_VOLUMN_KEY, this.musicVolumn.toString()) + } - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'share/uicomponent/MusicPrefab', - (loadedResource: Prefab) => { - MusicPrefab.instance = - instantiate(loadedResource).getComponent(MusicPrefab) - this.preInit() - resolve() - } - ) - }) - } + private static preInit() { + this.musicVolumn = Number.parseFloat(LocalStorage.getItem(MusicPrefab.MUSIC_VOLUMN_KEY)) + if (Number.isNaN(this.musicVolumn)) this.musicVolumn = 1 + } - public static destory() { - if (MusicPrefab.instance) { - MusicPrefab.instance.getComponent(AudioSource).stop() - MusicPrefab.instance.destroy() - } - MusicPrefab.instance = null - } + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/MusicPrefab`, + (loadedResource: Prefab) => { + MusicPrefab.instance = instantiate(loadedResource).getComponent(MusicPrefab) + this.preInit() + resolve() + }, + ) + }) + } + + public static destory() { + if (MusicPrefab.instance) { + MusicPrefab.instance.getComponent(AudioSource).stop() + MusicPrefab.instance.destroy() + } + MusicPrefab.instance = null + } } diff --git a/assets/FishSingle/script/engine/uicomponent/Progress.ts b/assets/FishSingle/script/engine/uicomponent/Progress.ts index 04ebf32..2187567 100644 --- a/assets/FishSingle/script/engine/uicomponent/Progress.ts +++ b/assets/FishSingle/script/engine/uicomponent/Progress.ts @@ -1,56 +1,55 @@ -import { _decorator, Component, Label, ProgressBar } from 'cc' +import { Component, Label, ProgressBar, _decorator } from 'cc' const { ccclass, property } = _decorator @ccclass('Progress') export default class Progress extends Component { - @property(Label) - public percentLable: Label + @property(Label) + public percentLable: Label - @property(ProgressBar) - public bar: ProgressBar + @property(ProgressBar) + public bar: ProgressBar - onLoad() { - this.bar.node.active = false - this.bar.progress = 0 - } + onLoad() { + this.bar.node.active = false + this.bar.progress = 0 + } - start() {} + start() {} - updatePercent(current, filePercent) { - //this.percentLable.string = filePercent.toFixed(2); - } + updatePercent(current, filePercent) { + // this.percentLable.string = filePercent.toFixed(2); + } - updatefileTotal(current, filePercent) { - if (!this.bar.node.active) this.bar.node.active = true - var nowPercent = Math.round((current / filePercent) * 100) - var curMB = this.getMB(current) - var totalMB = this.getMB(filePercent) - // this.percentLable.string = "正在更新 " + nowPercent + "%" + " ( " + curMB + " / "+totalMB +" MB)"; - nowPercent = Math.min(nowPercent, 100) - this.percentLable.string = '正在更新 ' + nowPercent + '%' - var percent = current / filePercent - this.bar.progress = percent - } + updatefileTotal(current: number, filePercent: number) { + if (!this.bar.node.active) this.bar.node.active = true + let nowPercent = Math.round((current / filePercent) * 100) + const curMB = this.getMB(current) + const totalMB = this.getMB(filePercent) + // this.percentLable.string = "正在更新 " + nowPercent + "%" + " ( " + curMB + " / "+totalMB +" MB)"; + nowPercent = Math.min(nowPercent, 100) + this.percentLable.string = `正在更新 ${nowPercent}%` + this.bar.progress = current / filePercent + } - public updateProgress( - current, - total, - msg: string = '正在加载资源，此过程不消耗流量...' - ) { - this.bar.node.active = true - // this.setMsg(msg+ current + "/" + total); - this.setMsg(msg) - this.bar.progress = current / total - } + public updateProgress( + current: number, + total: number, + msg: string = '正在加载资源，此过程不消耗流量...', + ) { + this.bar.node.active = true + // this.setMsg(msg+ current + "/" + total); + this.setMsg(msg) + this.bar.progress = current / total + } - getMB(bytes) { - bytes /= 1024 - bytes /= 1024 - return bytes.toFixed(2) - } + getMB(bytes: number) { + bytes /= 1024 + bytes /= 1024 + return bytes.toFixed(2) + } - public setMsg(msg: string = '游戏加载中，请稍后...') { - this.percentLable.string = msg - } + public setMsg(msg: string = '游戏加载中，请稍后...') { + this.percentLable.string = msg + } } diff --git a/assets/FishSingle/script/engine/uicomponent/SoundPrefab.ts b/assets/FishSingle/script/engine/uicomponent/SoundPrefab.ts index 7eec9a2..a0543e0 100644 --- a/assets/FishSingle/script/engine/uicomponent/SoundPrefab.ts +++ b/assets/FishSingle/script/engine/uicomponent/SoundPrefab.ts @@ -1,11 +1,22 @@ -import { _decorator, AssetManager, AudioClip, AudioSource, Component, instantiate, Node, NodePool, Prefab } from 'cc' -import { Logger } from '../utils/Logger' -import PrefabLoader from '../utils/PrefabLoader' -import LocalStorage from '../utils/LocalStorage' -import EventManager from '../utils/EventManager' +import { + AssetManager, + AudioClip, + AudioSource, + Component, + Node, + NodePool, + Prefab, + _decorator, + instantiate, +} from 'cc' + +import { GameConfig } from '../../game/config/GameConfig' import CommonEvent from '../config/CommonEvent' import MusicConfig from '../config/MusicConfig' -import { GameConfig } from '../../game/config/GameConfig' +import EventManager from '../utils/EventManager' +import LocalStorage from '../utils/LocalStorage' +import { Logger } from '../utils/Logger' +import PrefabLoader from '../utils/PrefabLoader' const { ccclass, property } = _decorator @@ -16,120 +27,102 @@ const { ccclass, property } = _decorator @ccclass('SoundPrefab') export default class SoundPrefab extends Component { - private static prefab: Prefab | null = null - private static SOUND_VOLUMN_KEY: string = 'soundVolumn' - public static soundVolumn: number = 1 - private static Pool_Init_Num: number = 30 - private static pool: NodePool = new NodePool() - private static nowAudioNodeList: Array = [] - private audioName: string = '' - private audioUrl: string = '' - private static getAudioNode() { - let node: Node = null - // if (this.pool.size() > 0) { + private static prefab: Prefab | null = null + private static SOUND_VOLUMN_KEY: string = 'soundVolumn' + public static soundVolumn: number = 1 + private static Pool_Init_Num: number = 30 + private static pool: NodePool = new NodePool() + private static nowAudioNodeList: Array = [] + private audioName: string = '' + private audioUrl: string = '' - // node = this.pool.get(); - // } else { - node = instantiate(this.prefab) - // } - return node - } + private static getAudioNode() { + let node: Node = null + // if (this.pool.size() > 0) { - public static play(key: string) { - let url: string = MusicConfig.musicKey2Path.get(key) - if (url) { - AssetManager.instance.resources.load(url, AudioClip, (error: Error, clip: AudioClip) => { - if (error) { - Logger.warn(this, 'load sound error===', error.message) - } else { - if (clip) { - let audioNode: Node = this.getAudioNode() - if (audioNode) { - audioNode.getComponent(AudioSource).clip = clip - audioNode.getComponent(AudioSource).volume = - SoundPrefab.soundVolumn - audioNode.getComponent(AudioSource).loop = false - audioNode.getComponent(AudioSource).currentTime = 0 //rewind(); - audioNode.getComponent(AudioSource).play() - audioNode.getComponent(SoundPrefab).audioName = key - audioNode.getComponent(SoundPrefab).audioUrl = url - this.nowAudioNodeList.push(audioNode) - } - } - } - }) - } else { - Logger.warn(this, '播放不存在的music=', key) - } - } + // node = this.pool.get(); + // } else { + node = instantiate(this.prefab) + // } + return node + } - public static changeVolumn(nowVolumn: number) { - this.soundVolumn = nowVolumn - for (let i = 0; i < this.nowAudioNodeList.length; i++) { - let audioNode: Node = this.nowAudioNodeList[i] - let audioSource: AudioSource = audioNode.getComponent(AudioSource) - if (audioSource.playing) { - audioSource.volume = nowVolumn - } - } - LocalStorage.setItem( - SoundPrefab.SOUND_VOLUMN_KEY, - SoundPrefab.soundVolumn.toString() - ) - } + public static play(key: string) { + const url: string = MusicConfig.musicKey2Path.get(key) + if (url) { + AssetManager.instance.resources.load(url, AudioClip, (error: Error, clip: AudioClip) => { + if (error) { + Logger.warn(this, 'load sound error===', error.message) + } else { + if (clip) { + const audioNode: Node = this.getAudioNode() + if (audioNode) { + audioNode.getComponent(AudioSource).clip = clip + audioNode.getComponent(AudioSource).volume = SoundPrefab.soundVolumn + audioNode.getComponent(AudioSource).loop = false + audioNode.getComponent(AudioSource).currentTime = 0 // rewind(); + audioNode.getComponent(AudioSource).play() + audioNode.getComponent(SoundPrefab).audioName = key + audioNode.getComponent(SoundPrefab).audioUrl = url + this.nowAudioNodeList.push(audioNode) + } + } + } + }) + } else { + Logger.warn(this, '播放不存在的music=', key) + } + } - private static preInit() { - EventManager.instance.addListener( - CommonEvent.Event_FrameUpdate, - this.updateFrame, - this - ) - SoundPrefab.soundVolumn = parseFloat( - LocalStorage.getItem(SoundPrefab.SOUND_VOLUMN_KEY) - ) - if (isNaN(SoundPrefab.soundVolumn)) { - SoundPrefab.soundVolumn = 1 - } - } + public static changeVolumn(nowVolumn: number) { + this.soundVolumn = nowVolumn + for (let i = 0; i < this.nowAudioNodeList.length; i++) { + const audioNode: Node = this.nowAudioNodeList[i] + const audioSource: AudioSource = audioNode.getComponent(AudioSource) + if (audioSource.playing) audioSource.volume = nowVolumn + } + LocalStorage.setItem(SoundPrefab.SOUND_VOLUMN_KEY, SoundPrefab.soundVolumn.toString()) + } - private static updateFrame() { - for (let i = 0; i < this.nowAudioNodeList.length; i++) { - let audioNode: Node = this.nowAudioNodeList[i] - let audioSource: AudioSource = audioNode.getComponent(AudioSource) - if (!audioSource.playing) { - SoundPrefab.nowAudioNodeList.splice(i, 1) - } - } - } + private static preInit() { + EventManager.instance.addListener(CommonEvent.Event_FrameUpdate, this.updateFrame, this) + SoundPrefab.soundVolumn = Number.parseFloat(LocalStorage.getItem(SoundPrefab.SOUND_VOLUMN_KEY)) + if (Number.isNaN(SoundPrefab.soundVolumn)) SoundPrefab.soundVolumn = 1 + } - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'share/uicomponent/SoundPrefab', - (loadedResource: Prefab) => { - SoundPrefab.prefab = loadedResource - this.preInit() - // for (let i = 0; i < this.Pool_Init_Num; i++) { - // let tempNode: cc.Node = cc.instantiate(loadedResource); - // this.pool.put(tempNode); - // } - resolve() - } - ) - }) - } + private static updateFrame() { + for (let i = 0; i < this.nowAudioNodeList.length; i++) { + const audioNode: Node = this.nowAudioNodeList[i] + const audioSource: AudioSource = audioNode.getComponent(AudioSource) + if (!audioSource.playing) SoundPrefab.nowAudioNodeList.splice(i, 1) + } + } - public static destory() { - EventManager.instance.removeListener( - CommonEvent.Event_FrameUpdate, - this.updateFrame - ) - for (let i = 0; i < this.nowAudioNodeList.length; i++) { - let audioNode: Node = this.nowAudioNodeList[i] - audioNode.getComponent(AudioSource).stop() - audioNode.getComponent(AudioSource).destroy() - } - this.nowAudioNodeList = [] - this.pool.clear() - } + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/share/uicomponent/SoundPrefab`, + (loadedResource: Prefab) => { + SoundPrefab.prefab = loadedResource + this.preInit() + // for (let i = 0; i < this.Pool_Init_Num; i++) { + // let tempNode: cc.Node = cc.instantiate(loadedResource); + // this.pool.put(tempNode); + // } + resolve() + }, + ) + }) + } + + public static destory() { + EventManager.instance.removeListener(CommonEvent.Event_FrameUpdate, this.updateFrame) + for (let i = 0; i < this.nowAudioNodeList.length; i++) { + const audioNode: Node = this.nowAudioNodeList[i] + audioNode.getComponent(AudioSource).stop() + audioNode.getComponent(AudioSource).destroy() + } + this.nowAudioNodeList = [] + this.pool.clear() + } } diff --git a/assets/FishSingle/script/engine/uicomponent/TextureMgr.ts b/assets/FishSingle/script/engine/uicomponent/TextureMgr.ts index 3a22fe2..f1059cf 100644 --- a/assets/FishSingle/script/engine/uicomponent/TextureMgr.ts +++ b/assets/FishSingle/script/engine/uicomponent/TextureMgr.ts @@ -1,21 +1,25 @@ -import { _decorator, Component, SpriteFrame } from 'cc' +import { Component, SpriteFrame, _decorator } from 'cc' const { ccclass, property } = _decorator @ccclass('TextureMgr') export default class TextureMgr extends Component { - @property({ type: [SpriteFrame] }) - public Spriteset: SpriteFrame[] = [] - @property({ type: [SpriteFrame] }) - public Spriteset1: SpriteFrame[] = [] - @property({ type: [SpriteFrame] }) - public Spriteset2: SpriteFrame[] = [] - @property({ type: [SpriteFrame] }) - public Spriteset3: SpriteFrame[] = [] - @property({ type: [SpriteFrame] }) - public Spriteset4: SpriteFrame[] = [] + @property({ type: [SpriteFrame] }) + public Spriteset: SpriteFrame[] = [] - onLoad() { - // // init logic - } + @property({ type: [SpriteFrame] }) + public Spriteset1: SpriteFrame[] = [] + + @property({ type: [SpriteFrame] }) + public Spriteset2: SpriteFrame[] = [] + + @property({ type: [SpriteFrame] }) + public Spriteset3: SpriteFrame[] = [] + + @property({ type: [SpriteFrame] }) + public Spriteset4: SpriteFrame[] = [] + + onLoad() { + // init logic + } } diff --git a/assets/FishSingle/script/engine/utils/AdapterHelper.ts b/assets/FishSingle/script/engine/utils/AdapterHelper.ts index 12cc9d9..5269043 100644 --- a/assets/FishSingle/script/engine/utils/AdapterHelper.ts +++ b/assets/FishSingle/script/engine/utils/AdapterHelper.ts @@ -10,29 +10,25 @@ export default class AdapterHelper { public static fixApdater() { log('v3.6没找到接口修改 fitHeight、fitWidth, 先在项目里写死fitHeight=true') - return - let framesize = view.getFrameSize() - if (!this.winSizeWidth) { - this.winSizeWidth = screen.width - this.winSizeHeiht = screen.height - } - let designsize = view.getDesignResolutionSize() - let canvas: Canvas = DialogBase.GetRootCanvas().getComponent(Canvas) - - let ratio: number = framesize.height / framesize.width - let designRatio: number = designsize.height / designsize.width - if (ratio > designRatio) { - //canvas.fitHeight = false; - //canvas.fitWidth = true; - error( - 'v3.6没找到接口修改 fitHeight、fitWidth, 先在项目里写死fitHeight=true' - ) - } else { - //canvas.fitHeight = true; - //canvas.fitWidth = false; - error( - 'v3.6没找到接口修改 fitHeight、fitWidth, 先在项目里写死fitHeight=true' - ) - } + // return + // const framesize = view.getFrameSize() + // if (!this.winSizeWidth) { + // this.winSizeWidth = screen.width + // this.winSizeHeiht = screen.height + // } + // const designsize = view.getDesignResolutionSize() + // const canvas: Canvas = DialogBase.GetRootCanvas().getComponent(Canvas) + + // const ratio: number = framesize.height / framesize.width + // const designRatio: number = designsize.height / designsize.width + // if (ratio > designRatio) { + // canvas.fitHeight = false; + // canvas.fitWidth = true; + // error('v3.6没找到接口修改 fitHeight、fitWidth, 先在项目里写死fitHeight=true') + // } else { + // // canvas.fitHeight = true; + // // canvas.fitWidth = false; + // error('v3.6没找到接口修改 fitHeight、fitWidth, 先在项目里写死fitHeight=true') + // } } } diff --git a/assets/FishSingle/script/engine/utils/BitUtil.ts b/assets/FishSingle/script/engine/utils/BitUtil.ts index 2506ca5..a1fe4d8 100644 --- a/assets/FishSingle/script/engine/utils/BitUtil.ts +++ b/assets/FishSingle/script/engine/utils/BitUtil.ts @@ -4,45 +4,39 @@ const { ccclass, property } = _decorator @ccclass('BitUtil') export default class BitUtil { - //index是二进制从右到左 + // index是二进制从右到左 public static isBitSet(value: number, index: number): boolean { - let str: string = value.toString(2) - return parseInt(str[str.length - 1 - index]) == 1 + const str: string = value.toString(2) + return Number.parseInt(str[str.length - 1 - index]) === 1 } - //从右到左计算 + // 从右到左计算 public static setBitValue(value: number, index: number): number { let newValue: number = value - let str: string = value.toString(2) + const str: string = value.toString(2) let newStr: string = '' - let maxIndex = Math.max(str.length - 1, index) + const maxIndex = Math.max(str.length - 1, index) for (let i = 0; i <= maxIndex; i++) { - if (index == i) { - newStr = '1' + newStr + if (index === i) { + newStr = `1${newStr}` } else { - if (str[i] == undefined) { - newStr = '0' + newStr - } else { - newStr = str[i] + newStr - } + if (str[i] === undefined) newStr = `0${newStr}` + else newStr = str[i] + newStr } } - newValue = parseInt(newStr, 2) + newValue = Number.parseInt(newStr, 2) return newValue } public static clearBitValue(value: number, index: number) { let newValue: number = value - let str: string = value.toString(2) + const str: string = value.toString(2) let newStr: string = '' for (let i = str.length - 1; i >= 0; i--) { - if (index == str.length - 1 - i) { - newStr = '0' + newStr - } else { - newStr = str[i] + newStr - } + if (index === str.length - 1 - i) newStr = `0${newStr}` + else newStr = str[i] + newStr } - newValue = parseInt(newStr, 2) + newValue = Number.parseInt(newStr, 2) return newValue } } diff --git a/assets/FishSingle/script/engine/utils/ColorHelper.ts b/assets/FishSingle/script/engine/utils/ColorHelper.ts index 326d9bd..3561e39 100644 --- a/assets/FishSingle/script/engine/utils/ColorHelper.ts +++ b/assets/FishSingle/script/engine/utils/ColorHelper.ts @@ -1,11 +1,11 @@ -import { _decorator, Color } from 'cc' +import { Color, _decorator } from 'cc' const { ccclass, property } = _decorator @ccclass('ColorHelper') export default class ColorHelper { public static getColor(hexStr: string): Color { - let color: Color = Color.BLACK + const color: Color = Color.BLACK return color.fromHEX(hexStr) } } diff --git a/assets/FishSingle/script/engine/utils/DateUtil.ts b/assets/FishSingle/script/engine/utils/DateUtil.ts index 9e8bf82..a9a99eb 100644 --- a/assets/FishSingle/script/engine/utils/DateUtil.ts +++ b/assets/FishSingle/script/engine/utils/DateUtil.ts @@ -1,136 +1,83 @@ export default class DateUtil { public static formatNumStr(num: number) { - let str = '' + num - if (num < 10) { - str = '0' + num - } + let str = `${num}` + if (num < 10) str = `0${num}` return str } public static formateYearMonthDayStr(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() - ) + const date: Date = new Date(timestamp) + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}` } public static formateMonthDayStr(timestamp: number) { - let date: Date = new Date(timestamp) - return date.getMonth() + 1 + '月' + date.getDate() + '日' + const date: Date = new Date(timestamp) + return `${date.getMonth() + 1}月${date.getDate()}日` } // timestamp:1453094034000 2018-1-31 19:53:44 - //根据时间戳返回 2018-1-31 19:53:44 + // 根据时间戳返回 2018-1-31 19:53:44 public static formatDateStr(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - date.getFullYear() + - '-' + - (date.getMonth() + 1) + - '-' + - date.getDate() + - ' ' + - this.formatNumStr(date.getHours()) + - ':' + - this.formatNumStr(date.getMinutes()) + - ':' + - this.formatNumStr(date.getSeconds()) - ) + const date: Date = new Date(timestamp) + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${this.formatNumStr( + date.getHours(), + )}:${this.formatNumStr(date.getMinutes())}:${this.formatNumStr(date.getSeconds())}` } // timestamp:1453094034000 2018-1-31-19-53-44 - //根据时间戳返回 2018-1-31-19-53-44 + // 根据时间戳返回 2018-1-31-19-53-44 public static formatDateStr2(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - date.getFullYear() + - '-' + - (date.getMonth() + 1) + - '-' + - date.getDate() + - '-' + - this.formatNumStr(date.getHours()) + - '-' + - this.formatNumStr(date.getMinutes()) + - '-' + - this.formatNumStr(date.getSeconds()) - ) + const date: Date = new Date(timestamp) + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}-${this.formatNumStr(date.getHours())}-${this.formatNumStr(date.getMinutes())}-${this.formatNumStr(date.getSeconds())}` } // timestamp:1453094034000 2018-1-31 - //根据时间戳返回 2018-1-31 + // 根据时间戳返回 2018-1-31 public static formatDateStr3(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() - ) + const date: Date = new Date(timestamp) + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}` } // timestamp:1453094034000 - //根据时间戳返回 19:53 + // 根据时间戳返回 19:53 public static formatHourMinStr(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - this.formatNumStr(date.getHours()) + - ':' + - this.formatNumStr(date.getMinutes()) - ) + const date: Date = new Date(timestamp) + return `${this.formatNumStr(date.getHours())}:${this.formatNumStr(date.getMinutes())}` } // timestamp:1453094034000 - //根据时间戳返回 19:53:11 + // 根据时间戳返回 19:53:11 public static formatHourMinSecondStr(timestamp: number) { - let date: Date = new Date(timestamp) - return ( - this.formatNumStr(date.getHours()) + - ':' + - this.formatNumStr(date.getMinutes()) + - ':' + - this.formatNumStr(date.getSeconds()) - ) + const date: Date = new Date(timestamp) + return `${this.formatNumStr(date.getHours())}:${this.formatNumStr(date.getMinutes())}:${this.formatNumStr(date.getSeconds())}` } public static now(): number { - let date: Date = new Date() + const date: Date = new Date() return date.getTime() } public static betweenTime(startTime: number, endTime: number) { - let date: Date = new Date() - if (date.getTime() >= startTime && date.getTime() <= endTime) { - return true - } - return false + const date: Date = new Date() + return date.getTime() >= startTime && date.getTime() <= endTime } - //根据时间戳返回 1天19:53:11 + // 根据时间戳返回 1天19:53:11 public static formatLeftTime(timestamp: number) { - let result: string = '' - let day: number = Math.floor(timestamp / (1000 * 60 * 60 * 24)) - let hour: number = Math.floor(timestamp / (1000 * 60 * 60)) % 24 - let min: number = Math.floor(timestamp / (1000 * 60)) % 60 - let second: number = Math.floor(timestamp / 1000) % 60 - result = - day + - '天' + - this.formatNumStr(hour) + - ':' + - this.formatNumStr(min) + - ':' + - this.formatNumStr(second) - return result + const day: number = Math.floor(timestamp / (1000 * 60 * 60 * 24)) + const hour: number = Math.floor(timestamp / (1000 * 60 * 60)) % 24 + const min: number = Math.floor(timestamp / (1000 * 60)) % 60 + const second: number = Math.floor(timestamp / 1000) % 60 + return `${day}天${this.formatNumStr(hour)}:${this.formatNumStr(min)}:${this.formatNumStr(second)}` } public static isToday(dateTime: number): boolean { - let nowDate: Date = new Date() - let checkDate: Date = new Date(dateTime) - if ( - checkDate.getFullYear() == nowDate.getFullYear() && - checkDate.getMonth() == nowDate.getMonth() && - checkDate.getDate() == nowDate.getDate() - ) { - return true - } - return false + const nowDate: Date = new Date() + const checkDate: Date = new Date(dateTime) + return ( + checkDate.getFullYear() === nowDate.getFullYear() && + checkDate.getMonth() === nowDate.getMonth() && + checkDate.getDate() === nowDate.getDate() + ) } } diff --git a/assets/FishSingle/script/engine/utils/EventManager.ts b/assets/FishSingle/script/engine/utils/EventManager.ts index ecf520c..38f63a6 100644 --- a/assets/FishSingle/script/engine/utils/EventManager.ts +++ b/assets/FishSingle/script/engine/utils/EventManager.ts @@ -1,4 +1,5 @@ import { Button, Color, Component, Node, Slider } from 'cc' + import ColorHelper from './ColorHelper' export class HaoEvent { @@ -18,20 +19,17 @@ export default class EventManager { private callbackList = {} - public constructor() { - } + public constructor() {} - //注册事件 + // 注册事件 public addListener(eventName: string, callback: Function, caller: any) { if (this.callbackList[eventName]) { - let eventList: Array = this.callbackList[eventName] - //不同元件才放入,相同元件覆蓋 + const eventList: Array = this.callbackList[eventName] + // 不同元件才放入,相同元件覆蓋 let add: boolean = true for (let i = 0; i < eventList.length; i++) { - let event: HaoEvent = eventList[i] - if (caller === event.caller) { - add = false - } + const event: HaoEvent = eventList[i] + if (caller === event.caller) add = false } if (add) { eventList.push(new HaoEvent(callback, caller)) @@ -46,7 +44,7 @@ export default class EventManager { public removeListener(eventName: string, callback: Function) { if (this.callbackList[eventName]) { for (let i = this.callbackList[eventName].length - 1; i >= 0; i--) { - let event: HaoEvent = this.callbackList[eventName][i] + const event: HaoEvent = this.callbackList[eventName][i] if (event.callback == callback) { this.callbackList[eventName].splice(i, 1) break @@ -56,17 +54,15 @@ export default class EventManager { } public dispatchEvent(eventName, parameter?: any, ...restOfName: any[]) { - let eventList: Array = this.callbackList[eventName] + const eventList: Array = this.callbackList[eventName] if (eventList) { for (let i = eventList.length - 1; i >= 0; i--) { - let event: HaoEvent = eventList[i] + const event: HaoEvent = eventList[i] event.callback.call(event.caller, event, parameter, ...restOfName) - if (event.isStop) { - break - } + if (event.isStop) break } for (let i = eventList.length - 1; i >= 0; i--) { - let event: HaoEvent = eventList[i] + const event: HaoEvent = eventList[i] event.isStop = false } } @@ -77,12 +73,12 @@ export default class EventManager { objectNode: Node, scriptName: string, eventName: string, - data: any = null + data: any = null, ) { - var btn: Button = objectNode.addComponent(Button) - var clickEventHandler = new Component.EventHandler() - clickEventHandler.target = parentNode //这个 node 节点是你的事件处理代码组件所属的节点 - clickEventHandler.component = scriptName //这个是代码文件名 + const btn: Button = objectNode.addComponent(Button) + const clickEventHandler = new Component.EventHandler() + clickEventHandler.target = parentNode // 这个 node 节点是你的事件处理代码组件所属的节点 + clickEventHandler.component = scriptName // 这个是代码文件名 clickEventHandler.handler = eventName clickEventHandler.customEventData = data btn.clickEvents.push(clickEventHandler) @@ -94,12 +90,12 @@ export default class EventManager { } public removeBtnEffect(objectNode: Node) { - var b = objectNode.getComponent(Button) + const b = objectNode.getComponent(Button) b.transition = Button.Transition.NONE } public addBtnEffect(objectNode: Node, scale: number = 1.1) { - var b = objectNode.getComponent(Button) + const b = objectNode.getComponent(Button) b.transition = Button.Transition.SCALE b.zoomScale = scale } @@ -107,24 +103,19 @@ export default class EventManager { public addBtnEffect_color( objectNode: Node, normalC: Color = ColorHelper.getColor('#FFFFFF'), - pressC: Color = ColorHelper.getColor('#C0C0C0') + pressC: Color = ColorHelper.getColor('#C0C0C0'), ) { - var b = objectNode.getComponent(Button) + const b = objectNode.getComponent(Button) b.transition = Button.Transition.COLOR b.normalColor = normalC b.pressedColor = pressC } - public addSliderEvent( - parentNode: Node, - objectNode: Node, - EventName: string, - data: any - ) { - var b = objectNode.getComponent(Slider) - var clickEventHandler = new Component.EventHandler() - clickEventHandler.target = parentNode //这个 node 节点是你的事件处理代码组件所属的节点 - clickEventHandler.component = parentNode.name //这个是代码文件名 + public addSliderEvent(parentNode: Node, objectNode: Node, EventName: string, data: any) { + const b = objectNode.getComponent(Slider) + const clickEventHandler = new Component.EventHandler() + clickEventHandler.target = parentNode // 这个 node 节点是你的事件处理代码组件所属的节点 + clickEventHandler.component = parentNode.name // 这个是代码文件名 clickEventHandler.handler = EventName clickEventHandler.customEventData = data b.slideEvents.push(clickEventHandler) diff --git a/assets/FishSingle/script/engine/utils/HaoEncrypt.ts b/assets/FishSingle/script/engine/utils/HaoEncrypt.ts index e11daa9..c291d00 100644 --- a/assets/FishSingle/script/engine/utils/HaoEncrypt.ts +++ b/assets/FishSingle/script/engine/utils/HaoEncrypt.ts @@ -2,13 +2,11 @@ export default class HaoEncrypt { public static encode(str: string) { let result: string = '' for (let i = 0; i < str.length; i++) { - //遍历字符串 + // 遍历字符串 let code: number = str.charCodeAt(i) // //逐个提取每个字符，并获取Unicode编码值 - if (i % 2 == 0) { - code += 2 - } else { - code += 1 - } + if (i % 2 === 0) code += 2 + else code += 1 + result += String.fromCharCode(code) } return result @@ -17,13 +15,10 @@ export default class HaoEncrypt { public static decode(str: string) { let result: string = '' for (let i = 0; i < str.length; i++) { - //遍历字符串 + // 遍历字符串 let code: number = str.charCodeAt(i) // //逐个提取每个字符，并获取Unicode编码值 - if (i % 2 == 0) { - code -= 2 - } else { - code -= 1 - } + if (i % 2 === 0) code -= 2 + else code -= 1 result += String.fromCharCode(code) } return result diff --git a/assets/FishSingle/script/engine/utils/HotUpdate.ts b/assets/FishSingle/script/engine/utils/HotUpdate.ts index 1f8fb64..437ab65 100644 --- a/assets/FishSingle/script/engine/utils/HotUpdate.ts +++ b/assets/FishSingle/script/engine/utils/HotUpdate.ts @@ -1,18 +1,19 @@ import { native, sys } from 'cc' -import { Logger } from './Logger' -import EventManager from './EventManager' -import VersionManager from './VersionManager' + import ManifestConfig from '../config/ManifestConfig' -import ResourcePreload from '../../game/utils/ResourcePreload' + import CommonTips from '../uicomponent/CommonTips' +import EventManager from './EventManager' +import { Logger } from './Logger' +import VersionManager from './VersionManager' + export default class HotUpdate { public static Event_CheckUpdate: string = 'Event_CheckUpdate' public static Event_On_Progress: string = 'HotUpdate_Event_On_Progress' public static Event_On_NeedUpdate: string = 'HotUpdate_Event_On_NeedUpdate' public static Event_Finish_Update: string = 'HotUpdate_Event_Finish' - public static Event_On_ALREADY_UP_TO_DATE: string = - 'HotUpdate_Event_On_ALREADY_UP_TO_DATE' + public static Event_On_ALREADY_UP_TO_DATE: string = 'HotUpdate_Event_On_ALREADY_UP_TO_DATE' public static Event_On_Fail_Update: string = 'HotUpdate_Event_On_Fail_Update' private _am: any private _checkListener: null @@ -27,21 +28,16 @@ export default class HotUpdate { private key: string private hotupdateIndex: number - constructor() { - } + constructor() {} - public init( - index: number, - key: string = 'Code-remote-asset', - manifestUrl: string - ) { + public init(index: number, key: string = 'Code-remote-asset', manifestUrl: string) { if (sys.isNative) { this.hotupdateIndex = index this.key = key this.manifestUrl = manifestUrl this.storagePath = '获取this.storagePath报错了' - Logger.log(this, 'init removeDirectory=', this.storagePath + '_temp') + Logger.log(this, 'init removeDirectory=', `${this.storagePath}_temp`) } this.needUpdate = false this.isUpdating = false @@ -52,38 +48,25 @@ export default class HotUpdate { private jumpToPack() { let url: string if (sys.isNative) { - if (sys.os == sys.OS.ANDROID) { - url = VersionManager.instance.apkStoreUrl - } else if (sys.os == sys.OS.IOS) { - url = VersionManager.instance.iosStoreUrl - } + if (sys.os === sys.OS.ANDROID) url = VersionManager.instance.apkStoreUrl + else if (sys.os === sys.OS.IOS) url = VersionManager.instance.iosStoreUrl } - Logger.info( - this, - 'jumpToPack==androidurl===', - VersionManager.instance.apkStoreUrl - ) - Logger.info( - this, - 'jumpToPack==iosStoreUrl===', - VersionManager.instance.iosStoreUrl - ) + Logger.info(this, 'jumpToPack==androidurl===', VersionManager.instance.apkStoreUrl) + Logger.info(this, 'jumpToPack==iosStoreUrl===', VersionManager.instance.iosStoreUrl) Logger.info(this, 'jumpToPack=====', url) sys.openURL(url) // cc.game.end(); } - //显示强制更新，即更细包面板 + // 显示强制更新，即更细包面板 private showPackUpdateDialog() { - CommonTips.showMsg( - '有新的版本需要更新，下载后请先卸载，以前的版本，再安装！' - ) + CommonTips.showMsg('有新的版本需要更新，下载后请先卸载，以前的版本，再安装！') this.jumpToPack() this.showPackUpdateDialog() } private checkCb(event: any) { - Logger.log(this, 'checkCb Code: =================' + event.getEventCode()) + Logger.log(this, `checkCb Code: =================${event.getEventCode()}`) switch (event.getEventCode()) { case native.EventAssetsManager.ERROR_NO_LOCAL_MANIFEST: Logger.info(this, 'No local manifest file found, hot update skipped.') @@ -103,18 +86,18 @@ export default class HotUpdate { this, 'new version found, please try to update.', this.localBigVersion, - this.remoteBigVersion + this.remoteBigVersion, ) if ( - this.key == VersionManager.Config_Key[0] && + this.key === VersionManager.Config_Key[0] && this.localBigVersion < this.remoteBigVersion ) { - //更新大版本 + // 更新大版本 Logger.info( this, 'new version found, please try to update======packupdate=', this.localBigVersion, - this.remoteBigVersion + this.remoteBigVersion, ) this.showPackUpdateDialog() } else { @@ -122,14 +105,11 @@ export default class HotUpdate { this, 'new version found, please try to update======hotupdate=', this.localBigVersion, - this.remoteBigVersion + this.remoteBigVersion, ) // this._am.update(); this.needUpdate = true - EventManager.instance.dispatchEvent( - HotUpdate.Event_On_NeedUpdate, - this.key - ) + EventManager.instance.dispatchEvent(HotUpdate.Event_On_NeedUpdate, this.key) } break case native.EventAssetsManager.UPDATE_PROGRESSION: @@ -142,14 +122,14 @@ export default class HotUpdate { 'UPDATE_PROGRESSION2222==========', this.key, event.getDownloadedBytes(), - event.getTotalBytes() + event.getTotalBytes(), ) if (event.getTotalBytes() > 0) { EventManager.instance.dispatchEvent( HotUpdate.Event_On_Progress, event.getDownloadedBytes(), event.getTotalBytes(), - this.key + this.key, ) } break @@ -162,23 +142,16 @@ export default class HotUpdate { this.failUpdate() break case native.EventAssetsManager.ERROR_UPDATING: - let fullFilePath: string = this.storagePath + '/' + event.getAssetId() - let tempFilePath: string = - this.storagePath + '_temp/' + event.getAssetId() + const fullFilePath: string = `${this.storagePath}/${event.getAssetId()}` + const tempFilePath: string = `${this.storagePath}_temp/${event.getAssetId()}` Logger.warn(this, 'fullFilePath====', fullFilePath) Logger.warn(this, 'tempFilePath====', tempFilePath) // jsb.fileUtils.removeFile(tempFilePath); - Logger.warn( - this, - 'ERROR_UPDATING=============', - event.getAssetId(), - event.getMessage() - ) + Logger.warn(this, 'ERROR_UPDATING=============', event.getAssetId(), event.getMessage()) this.failUpdate() break default: - // this.failUpdate(); - return + // this.failUpdate(); } } @@ -187,21 +160,20 @@ export default class HotUpdate { Logger.log(this, 'Checking or updating ...') return } - let hotupdateUrlKey: string = - VersionManager.Config_Url_Key[this.hotupdateIndex] + const hotupdateUrlKey: string = VersionManager.Config_Url_Key[this.hotupdateIndex] Logger.log(this, 'checkoutUpdate=====', this.manifestUrl, hotupdateUrlKey) if (!this._am) { this._am = new native.AssetsManager( '', this.storagePath, - this.versionCompareHandle.bind(this) + this.versionCompareHandle.bind(this), ) } // this._am.setMaxConcurrentTask(1); - let manifestStr: string = ManifestConfig.getManifestStr(hotupdateUrlKey) + const manifestStr: string = ManifestConfig.getManifestStr(hotupdateUrlKey) Logger.log(this, 'checkUpdate=======manifestStr=======', manifestStr) - let manifest = new native.Manifest(manifestStr, this.storagePath) - this._am.setVerifyCallback(function(filePath, asset) { + const manifest = new native.Manifest(manifestStr, this.storagePath) + this._am.setVerifyCallback((filePath, asset) => { return true // var md5 = calculateMD5(filePath); // if (md5 === asset.md5) @@ -223,46 +195,33 @@ export default class HotUpdate { private versionCompareHandle(versionA: string, versionB: string) { const vA = versionA.split('.') const vB = versionB.split('.') - Logger.log( - this, - 'versionCompareHandle======', - this.key, - VersionManager.Config_Key[0] - ) - if (this.key == VersionManager.Config_Key[0]) { + Logger.log(this, 'versionCompareHandle======', this.key, VersionManager.Config_Key[0]) + if (this.key === VersionManager.Config_Key[0]) { Logger.log(this, 'versionCompareHandle22===', versionA, versionB) VersionManager.instance.nowVersion = versionA VersionManager.instance.targetVersion = versionB } - this.localBigVersion = parseInt(vA[0]) - this.remoteBigVersion = parseInt(vB[0]) + this.localBigVersion = Number.parseInt(vA[0]) + this.remoteBigVersion = Number.parseInt(vB[0]) for (let i = 0; i < vA.length; ++i) { - const a = parseInt(vA[i]) - const b = parseInt(vB[i] || '0') + const a = Number.parseInt(vA[i]) + const b = Number.parseInt(vB[i] || '0') if (a !== b) return a - b } - if (vB.length > vA.length) { - return -1 - } else { - return 0 - } + if (vB.length > vA.length) return -1 + else return 0 } public startUpdate() { if (this.isUpdating) return - let localManifest = this._am.getLocalManifest() - let remoteManifest = this._am.getRemoteManifest() + const localManifest = this._am.getLocalManifest() + const remoteManifest = this._am.getRemoteManifest() Logger.log(this, 'startUpdate111===', localManifest.getVersionFileUrl()) Logger.log(this, 'startUpdate2222===', localManifest.getManifestFileUrl()) Logger.log(this, 'startUpdate3333===', remoteManifest.getVersionFileUrl()) Logger.log(this, 'startUpdate4444===', remoteManifest.getManifestFileUrl()) this.isUpdating = true - EventManager.instance.dispatchEvent( - HotUpdate.Event_On_Progress, - 0, - 100, - this.key - ) + EventManager.instance.dispatchEvent(HotUpdate.Event_On_Progress, 0, 100, this.key) this._am.update() } @@ -280,42 +239,19 @@ export default class HotUpdate { private failUpdate() { this.disposeUpdate() this.isCheck = false - EventManager.instance.dispatchEvent( - HotUpdate.Event_On_Fail_Update, - this.key - ) + EventManager.instance.dispatchEvent(HotUpdate.Event_On_Fail_Update, this.key) } private alreadyUpToDate() { this.disposeUpdate() this.isFinishUpdate = true - EventManager.instance.dispatchEvent( - HotUpdate.Event_On_ALREADY_UP_TO_DATE, - this.key - ) + EventManager.instance.dispatchEvent(HotUpdate.Event_On_ALREADY_UP_TO_DATE, this.key) } private finishUpdate(needRestart: boolean) { Logger.info(this, '更新完成=====', needRestart) this.disposeUpdate() this.isFinishUpdate = true - EventManager.instance.dispatchEvent( - HotUpdate.Event_Finish_Update, - this.key, - needRestart - ) - if (false && needRestart) { - //暂时不想修 fileUtils 这个报错 - var searchPaths = '' //jsb.fileUtils.getSearchPaths();暂时注释 - Logger.info(this, '更新完成====searchPaths======', searchPaths) - sys.localStorage.setItem( - 'HotUpdateSearchPaths', - JSON.stringify(searchPaths) - ) - //jsb.fileUtils.setSearchPaths(searchPaths);暂时注释 - if (this.key == VersionManager.Config_Key[0]) { - ResourcePreload.instance.restartGame() - } - } + EventManager.instance.dispatchEvent(HotUpdate.Event_Finish_Update, this.key, needRestart) } } diff --git a/assets/FishSingle/script/engine/utils/HttpClient.ts b/assets/FishSingle/script/engine/utils/HttpClient.ts index 4ed22d2..233ffcc 100644 --- a/assets/FishSingle/script/engine/utils/HttpClient.ts +++ b/assets/FishSingle/script/engine/utils/HttpClient.ts @@ -1,13 +1,14 @@ import { _decorator } from 'cc' + import { Logger } from './Logger' const { ccclass } = _decorator @ccclass('HttpClient') export default class HttpClient { - public static instance: HttpClient //= new HttpClient(); + public static instance: HttpClient // = new HttpClient(); - //example + // example // HttpClient.instance.request("http://localhost:8080/haohttp/test", ()=>{ // console.log("http 请求 end============="); // }, {"nickName":"jhao", "hh":1, "id":9527}); @@ -27,12 +28,10 @@ export default class HttpClient { let resParams = '' let nowIndex = 1 for (const key in paramsObj) { - if (paramsObj.hasOwnProperty(key)) { - if (nowIndex == 1) { - resParams += key + '=' + paramsObj[key] - } else { - resParams += '&' + key + '=' + paramsObj[key] - } + if (Object.prototype.hasOwnProperty.call(paramsObj, key)) { + if (nowIndex === 1) resParams += `${key}=${paramsObj[key]}` + else resParams += `&${key}=${paramsObj[key]}` + nowIndex += 1 } } @@ -44,41 +43,29 @@ export default class HttpClient { this.responseType = responseType } - public setContentType() { - } + public setContentType() {} - public request( - url: string, - callback: Function, - params: any = null, - timeOut: number = 5 * 1000 - ) { - if (params && this.methodType == 'GET') { + public request(url: string, callback: Function, params: any = null, timeOut: number = 5 * 1000) { + if (params && this.methodType === 'GET') { let getParams: string = this.setParams(params) // getParams = StringUtil:encodeURI(params) getParams = encodeURI(getParams) - url += '?' + getParams + url += `?${getParams}` } this.xhr = new XMLHttpRequest() // http请求 fget - //this.xhr = cc.loader.getXMLHttpRequest(); - let xhr: XMLHttpRequest = this.xhr + // this.xhr = cc.loader.getXMLHttpRequest(); + const xhr: XMLHttpRequest = this.xhr xhr.responseType = this.responseType xhr.timeout = timeOut // xhr.setRequestHeader("Content-Type", "text/plain"); xhr.onreadystatechange = () => { - Logger.log( - this, - 'status======', - xhr.status, - xhr.readyState, - xhr.statusText - ) + Logger.log(this, 'status======', xhr.status, xhr.readyState, xhr.statusText) // if (xhr.readyState == 4 && (xhr.status >= 200 && xhr.status < 400)) { - if (xhr.readyState == 4 && xhr.status == 200) { - let response = xhr.response + if (xhr.readyState === 4 && xhr.status === 200) { + const response = xhr.response Logger.log(this, 'http response1============', xhr) try { - let testJson = JSON.stringify(response) + const testJson = JSON.stringify(response) Logger.log(this, 'http response json============', testJson) if (callback) { callback(true, response) @@ -91,31 +78,21 @@ export default class HttpClient { callback = null } } - } else if (xhr.readyState == 4 && xhr.status == 301) { - //域名转移 - Logger.log( - this, - 'http response222============', - xhr.getResponseHeader('Location') - ) + } else if (xhr.readyState === 4 && xhr.status === 301) { + // 域名转移 + Logger.log(this, 'http response222============', xhr.getResponseHeader('Location')) // console.log("http response333============", xhr.getAllResponseHeaders()); if (HttpClient.instance == null) HttpClient.instance = new HttpClient() HttpClient.instance.request(xhr.getResponseHeader('Location'), callback) - } else if (xhr.readyState == 4 && xhr.status == 404) { + } else if (xhr.readyState === 4 && xhr.status === 404) { Logger.log(this, 'http onError============') if (callback) { callback(false) callback = null } } else { - Logger.log( - this, - 'onreadystatechange else====', - xhr.status, - xhr.readyState, - xhr.response - ) - if (xhr.readyState == 4) { + Logger.log(this, 'onreadystatechange else====', xhr.status, xhr.readyState, xhr.response) + if (xhr.readyState === 4) { Logger.log(this, 'http onError else============') if (callback) { callback(false) @@ -125,13 +102,7 @@ export default class HttpClient { } } xhr.onprogress = () => { - Logger.log( - this, - 'http onprogress===', - xhr.status, - xhr.readyState, - xhr.response - ) + Logger.log(this, 'http onprogress===', xhr.status, xhr.readyState, xhr.response) } xhr.onerror = () => { Logger.log(this, 'http onError============') @@ -155,6 +126,5 @@ export default class HttpClient { xhr.send(params) } - public getInfo(callback: Function = null) { - } + public getInfo(callback: Function = null) {} } diff --git a/assets/FishSingle/script/engine/utils/LocalStorage.ts b/assets/FishSingle/script/engine/utils/LocalStorage.ts index 3cf2f3b..6fba224 100644 --- a/assets/FishSingle/script/engine/utils/LocalStorage.ts +++ b/assets/FishSingle/script/engine/utils/LocalStorage.ts @@ -16,11 +16,10 @@ export default class LocalStorage { } public static getInt(key: string): number { - let tempValue: string = LocalStorage.getItem(key) + const tempValue: string = LocalStorage.getItem(key) let result: number = 0 - if (tempValue) { - result = parseInt(tempValue) - } + if (tempValue) result = Number.parseInt(tempValue) + return result } @@ -29,11 +28,10 @@ export default class LocalStorage { } public static getFloat(key: string): number { - let tempValue: string = LocalStorage.getItem(key) + const tempValue: string = LocalStorage.getItem(key) let result: number = 0 - if (tempValue) { - result = parseFloat(tempValue) - } + if (tempValue) result = Number.parseFloat(tempValue) + return result } @@ -42,19 +40,13 @@ export default class LocalStorage { } public static getBoolean(key: string): boolean { - let temp: number = LocalStorage.getInt(key) - if (temp == 1) { - return true - } - return false + const temp: number = LocalStorage.getInt(key) + return temp === 1 } public static setBoolean(key: string, value: boolean) { - if (value) { - LocalStorage.setInt(key, 1) - } else { - LocalStorage.setInt(key, 0) - } + if (value) LocalStorage.setInt(key, 1) + else LocalStorage.setInt(key, 0) } public static clear() { diff --git a/assets/FishSingle/script/engine/utils/Logger.ts b/assets/FishSingle/script/engine/utils/Logger.ts index bf592a3..6976eb0 100644 --- a/assets/FishSingle/script/engine/utils/Logger.ts +++ b/assets/FishSingle/script/engine/utils/Logger.ts @@ -9,130 +9,78 @@ class LOG_LEVEL_TYPES { const Log_Level_Names: Array = ['debug', 'log', 'info', 'warn', 'error'] export class Logger { - public static tag: string = '[HaoJslog]' //可以设置当前游戏的前缀 - public static LEVEL: number = LOG_LEVEL_TYPES.WARN //当前Logger等级 + public static tag: string = '[HaoJslog]' // 可以设置当前游戏的前缀 + public static LEVEL: number = LOG_LEVEL_TYPES.WARN // 当前Logger等级 public static Log_Color_Config: Array = [ 'color:#890;font-size:10px;', 'color:#000;font-size:11px;', 'color:#09f;font-size:12px;', 'color:#f90;font-size:13px;', - 'color:#f00;font-size:15px;' + 'color:#f00;font-size:15px;', ] + private static Terminal_Log: boolean = false public static formatNow() { - let date: Date = new Date() //后端返回的时间戳是秒 - return ( - date.getFullYear() + - '-' + - (date.getMonth() + 1) + - '-' + - date.getDate() + - ' ' + - date.getHours() + - ':' + - date.getMinutes() + - ':' + - date.getSeconds() + - ':' + - date.getMilliseconds() - ) + const date: Date = new Date() // 后端返回的时间戳是秒 + return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes()}:${date.getSeconds()}:${date.getMilliseconds()}` } private static getLogPreKey(nowLevel: number): string { - return '[' + - Logger.formatNow() + - '] ' + - Logger.tag + - ' [' + - Log_Level_Names[nowLevel] + - '] ' + return `[${Logger.formatNow()}] ${Logger.tag} [${Log_Level_Names[nowLevel]}] ` } public static debug(...params: any) { - if (Logger.LEVEL > LOG_LEVEL_TYPES.DEBUG) { + if (Logger.LEVEL > LOG_LEVEL_TYPES.DEBUG) return - } - let str: string = this.getLogPreKey(LOG_LEVEL_TYPES.DEBUG) - let fileStr: string = str + params.join(' ') + + const str: string = this.getLogPreKey(LOG_LEVEL_TYPES.DEBUG) + const fileStr: string = str + params.join(' ') // LogErrorFileUtil.debug(fileStr); - if (this.Terminal_Log) { - console.log( - '%c' + str, - this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], - ...params - ) - } else { - console.info(fileStr) - } + if (this.Terminal_Log) + console.log(`%c${str}`, this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], ...params) + else console.info(fileStr) } public static log(...params: any) { - if (Logger.LEVEL > LOG_LEVEL_TYPES.LOG) { + if (Logger.LEVEL > LOG_LEVEL_TYPES.LOG) return - } - let str: string = this.getLogPreKey(LOG_LEVEL_TYPES.LOG) - let fileStr: string = str + params.join(' ') + + const str: string = this.getLogPreKey(LOG_LEVEL_TYPES.LOG) + const fileStr: string = str + params.join(' ') // LogErrorFileUtil.log(fileStr); - if (this.Terminal_Log) { - console.log( - '%c' + str, - this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], - ...params - ) - } else { - console.info(fileStr) //console.log(str, ...params) - } + if (this.Terminal_Log) + console.log(`%c${str}`, this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], ...params) + else console.info(fileStr) // console.log(str, ...params) } public static info(...params: any) { - if (Logger.LEVEL > LOG_LEVEL_TYPES.INFO) { - return - } - let str: string = this.getLogPreKey(LOG_LEVEL_TYPES.INFO) - let fileStr: string = str + params.join(' ') - if (this.Terminal_Log) { - console.info( - '%c' + str, - this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], - ...params - ) - } else { - console.info(fileStr) - } + if (Logger.LEVEL > LOG_LEVEL_TYPES.INFO) return + const str: string = this.getLogPreKey(LOG_LEVEL_TYPES.INFO) + const fileStr: string = str + params.join(' ') + if (this.Terminal_Log) + console.info(`%c${str}`, this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], ...params) + else console.info(fileStr) } public static warn(...params: any) { - if (Logger.LEVEL > LOG_LEVEL_TYPES.WARN) { + if (Logger.LEVEL > LOG_LEVEL_TYPES.WARN) return - } - let str: string = this.getLogPreKey(LOG_LEVEL_TYPES.WARN) - let fileStr: string = str + params.join(' ') - if (this.Terminal_Log) { - console.warn( - '%c' + str, - this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], - ...params - ) - } else { - console.warn(fileStr) - } + + const str: string = this.getLogPreKey(LOG_LEVEL_TYPES.WARN) + const fileStr: string = str + params.join(' ') + if (this.Terminal_Log) + console.warn(`%c${str}`, this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], ...params) + else console.warn(fileStr) } public static error(...params: any) { - if (Logger.LEVEL > LOG_LEVEL_TYPES.ERROR) { - return - } - let str: string = this.getLogPreKey(LOG_LEVEL_TYPES.ERROR) - let fileStr: string = str + params.join(' ') - if (this.Terminal_Log) { - console.error( - '%c' + str, - this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], - ...params - ) - } else { - console.error(fileStr) - } + if (Logger.LEVEL > LOG_LEVEL_TYPES.ERROR) return + + const str: string = this.getLogPreKey(LOG_LEVEL_TYPES.ERROR) + const fileStr: string = str + params.join(' ') + if (this.Terminal_Log) + console.error(`%c${str}`, this.Log_Color_Config[LOG_LEVEL_TYPES.DEBUG], ...params) + else console.error(fileStr) } } diff --git a/assets/FishSingle/script/engine/utils/MathUtils.ts b/assets/FishSingle/script/engine/utils/MathUtils.ts index f73dfff..d2e5f68 100644 --- a/assets/FishSingle/script/engine/utils/MathUtils.ts +++ b/assets/FishSingle/script/engine/utils/MathUtils.ts @@ -11,7 +11,7 @@ export default class MathUtils { public static distance(x1: number, y1: number, x2: number, y2: number) { // 设两点A（X1,Y1）,B（X2,Y2） // 距离D=（X2-X1）的平方+（Y2-Y1）平方的和开平方 - return Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)) + return Math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2) } /** @@ -45,7 +45,7 @@ export default class MathUtils { * @param endP */ public static p2pRad(startP: Vec2, endP: Vec2) { - let rad: number = Math.atan2(endP.y - startP.y, endP.x - startP.x) + const rad: number = Math.atan2(endP.y - startP.y, endP.x - startP.x) return rad } @@ -54,11 +54,8 @@ export default class MathUtils { * @param rot */ public static rotation2Fish(rot: number) { - if (rot >= 0 && rot <= 180) { - rot = 180 - rot - } else { - rot = -180 - rot - } + if (rot >= 0 && rot <= 180) rot = 180 - rot + else rot = -180 - rot return rot } } diff --git a/assets/FishSingle/script/engine/utils/MoveHelper.ts b/assets/FishSingle/script/engine/utils/MoveHelper.ts index e033574..96b76c6 100644 --- a/assets/FishSingle/script/engine/utils/MoveHelper.ts +++ b/assets/FishSingle/script/engine/utils/MoveHelper.ts @@ -1,4 +1,5 @@ import { Node, Vec2, Vec3 } from 'cc' + import MathUtils from './MathUtils' export class MoveHelper { @@ -11,7 +12,7 @@ export class MoveHelper { speed: number, tx: number, ty: number, - minSpeed: number = 0.01 + minSpeed: number = 0.01, ) { let isMoving: boolean = false let times: number = 0 @@ -20,9 +21,9 @@ export class MoveHelper { MoveHelper._vec2_0.y = MoveHelper._vec3.y MoveHelper._vec2_1.x = tx MoveHelper._vec2_1.y = ty - let rad: number = MathUtils.p2pRad(MoveHelper._vec2_0, MoveHelper._vec2_1) - let speedX: number = speed * Math.cos(rad) - let speedY: number = speed * Math.sin(rad) + const rad: number = MathUtils.p2pRad(MoveHelper._vec2_0, MoveHelper._vec2_1) + const speedX: number = speed * Math.cos(rad) + const speedY: number = speed * Math.sin(rad) if (Math.abs(MoveHelper._vec3.x - tx) > minSpeed) { times = Math.floor(Math.abs(speedX / minSpeed)) for (let i = 0; i < times; i++) { diff --git a/assets/FishSingle/script/engine/utils/PrefabLoader.ts b/assets/FishSingle/script/engine/utils/PrefabLoader.ts index cd0344d..5645e87 100644 --- a/assets/FishSingle/script/engine/utils/PrefabLoader.ts +++ b/assets/FishSingle/script/engine/utils/PrefabLoader.ts @@ -1,4 +1,5 @@ -import { _decorator, AssetManager, Prefab } from 'cc' +import { AssetManager, Prefab, _decorator } from 'cc' + import { Logger } from './Logger' const { ccclass, property } = _decorator @@ -10,21 +11,17 @@ export default class PrefabLoader { public static loadPrefab(url: string, callback: Function) { if (this.isLoading) return this.isLoading = true - AssetManager.instance.resources.load( - url, - Prefab, - (error: Error, loadedResource) => { - if (error) { - Logger.warn(this, '载入Prefab失败, 原因:', url, error.message) - return - } - if (!(loadedResource instanceof Prefab)) { - Logger.warn(this, '你载入的不是Prefab, 你做了什么事?') - return - } - callback(loadedResource) - this.isLoading = false + AssetManager.instance.resources.load(url, Prefab, (error: Error, loadedResource) => { + if (error) { + Logger.warn(this, '载入Prefab失败, 原因:', url, error.message) + return } - ) + if (!(loadedResource instanceof Prefab)) { + Logger.warn(this, '你载入的不是Prefab, 你做了什么事?') + return + } + callback(loadedResource) + this.isLoading = false + }) } } diff --git a/assets/FishSingle/script/engine/utils/RandomUtil.ts b/assets/FishSingle/script/engine/utils/RandomUtil.ts index e486710..8e47835 100644 --- a/assets/FishSingle/script/engine/utils/RandomUtil.ts +++ b/assets/FishSingle/script/engine/utils/RandomUtil.ts @@ -1,7 +1,7 @@ import { Vec2 } from 'cc' export default class RandomUtil { - //随机minNum到maxNum的数字 （包含maxNum） + // 随机minNum到maxNum的数字 （包含maxNum） public static nextInt(minNum: number, maxNum: number) { return Math.floor(Math.random() * (maxNum - minNum + 1) + minNum) } @@ -11,27 +11,24 @@ export default class RandomUtil { } public static nextSign() { - let temp = Math.random() - if (temp < 0.5) { - return 1 - } + const temp = Math.random() + if (temp < 0.5) return 1 + return -1 } public static nextBoolean() { - let temp = Math.random() - return temp < 0.5; - + const temp = Math.random() + return temp < 0.5 } public static randomArr(nowArr: Array, needNum: number) { - let tempArr: Array = nowArr.concat() - let resultArr: Array = [] + const tempArr: Array = nowArr.concat() + const resultArr: Array = [] for (let index = 0; index < needNum; index++) { - if (tempArr.length <= 0) { - break - } - let randomIndex: number = RandomUtil.nextInt(0, tempArr.length - 1) + if (tempArr.length <= 0) break + + const randomIndex: number = RandomUtil.nextInt(0, tempArr.length - 1) resultArr.push(tempArr.splice(randomIndex, 1)[0]) } return resultArr @@ -42,8 +39,8 @@ export default class RandomUtil { } public static randomP(left: number, right: number, up: number, down: number) { - let randomX: number = RandomUtil.nextNumber(left, right) - let randomY: number = RandomUtil.nextNumber(up, down) + const randomX: number = RandomUtil.nextNumber(left, right) + const randomY: number = RandomUtil.nextNumber(up, down) return new Vec2(randomX, randomY) } } diff --git a/assets/FishSingle/script/engine/utils/ShaderHelper.ts b/assets/FishSingle/script/engine/utils/ShaderHelper.ts index 2f814e2..a758d1e 100644 --- a/assets/FishSingle/script/engine/utils/ShaderHelper.ts +++ b/assets/FishSingle/script/engine/utils/ShaderHelper.ts @@ -1,4 +1,5 @@ import { Color, Material, Node, UIRenderer, UITransform, Vec2 } from 'cc' + import ShaderMaterialPrefab from '../../game/prefab/ShaderMaterialPrefab' export default class ShaderHelper { @@ -9,21 +10,15 @@ export default class ShaderHelper { */ public static clearAllEffect( showNode: Node, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).default + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).default, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - renderComponent.setSharedMaterial(material, 0) - }) }) } @@ -36,23 +31,18 @@ export default class ShaderHelper { public static setGrayEffect( showNode: Node, grayLevel: number = 1, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).grayMaterial + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab) + .grayMaterial, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('grayLevel', grayLevel) - renderComponent.setMaterial(material, 0) - }) + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + material.setProperty('grayLevel', grayLevel) + renderComponent.setMaterial(material, 0) + }) showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('grayLevel', grayLevel) - renderComponent.setSharedMaterial(material, 0) - }) + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + material.setProperty('grayLevel', grayLevel) + renderComponent.setSharedMaterial(material, 0) + }) }) } @@ -61,15 +51,13 @@ export default class ShaderHelper { */ public static showGrayMv(showNode: Node) { let grayValue: number = 0.5 - let intervalId = setInterval(() => { + const intervalId = setInterval(() => { grayValue += 0.01 if (grayValue >= 1) { grayValue = 1 clearInterval(intervalId) } - if (showNode) { - ShaderHelper.setGrayEffect(showNode, grayValue) - } + if (showNode) ShaderHelper.setGrayEffect(showNode, grayValue) }, 1) } @@ -82,23 +70,17 @@ export default class ShaderHelper { public static setOldPhotoEffect( showNode: Node, grayLevel: number = 1, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).oldPhoto + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).oldPhoto, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + material.setProperty('oldLevel', grayLevel) + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { material.setProperty('oldLevel', grayLevel) renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('oldLevel', grayLevel) - renderComponent.setSharedMaterial(material, 0) - }) }) } @@ -107,15 +89,13 @@ export default class ShaderHelper { */ public static showOldPhotoMv(showNode: Node) { let grayValue: number = 0 - let intervalId = setInterval(() => { + const intervalId = setInterval(() => { grayValue += 0.01 if (grayValue >= 1) { grayValue = 1 clearInterval(intervalId) } - if (showNode) { - ShaderHelper.setOldPhotoEffect(showNode, grayValue) - } + if (showNode) ShaderHelper.setOldPhotoEffect(showNode, grayValue) }, 1) } @@ -131,27 +111,21 @@ export default class ShaderHelper { public static setGlowInner( showNode: Node, materialParam: any, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).glowInner + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).glowInner, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + material.setProperty('glowColor', materialParam.glowColor) + material.setProperty('glowColorSize', materialParam.glowColorSize) + material.setProperty('glowThreshold', materialParam.glowThreshold) + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { material.setProperty('glowColor', materialParam.glowColor) material.setProperty('glowColorSize', materialParam.glowColorSize) material.setProperty('glowThreshold', materialParam.glowThreshold) - renderComponent.setSharedMaterial(material, 0) + renderComponent.setMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('glowColor', materialParam.glowColor) - material.setProperty('glowColorSize', materialParam.glowColorSize) - material.setProperty('glowThreshold', materialParam.glowThreshold) - renderComponent.setMaterial(material, 0) - }) }) } @@ -164,7 +138,7 @@ export default class ShaderHelper { this.setGlowInner(showNode, { glowColor: color, glowColorSize: 0.015, - glowThreshold: 0.1 + glowThreshold: 0.1, }) } @@ -173,29 +147,27 @@ export default class ShaderHelper { */ public static showFlash(showNode: Node, totalFlashTimes: number = 1) { let timeCount: number = 0 - let color: Color = Color.WHITE + const color: Color = Color.WHITE let flashTimes: number = 0 - let intervalId = setInterval(() => { + const intervalId = setInterval(() => { timeCount += 1 - if (timeCount % 50 == 0) { - let tempCount: number = timeCount / 50 - if (tempCount % 2 == 0) { + if (timeCount % 50 === 0) { + const tempCount: number = timeCount / 50 + if (tempCount % 2 === 0) { color.a = 100 this.setGlowInner(showNode, { glowColor: color, glowColorSize: 0.1, - glowThreshold: 0 + glowThreshold: 0, }) } else { flashTimes++ this.setGlowInner(showNode, { glowColor: color, glowColorSize: 0, - glowThreshold: 0 + glowThreshold: 0, }) - if (flashTimes > totalFlashTimes) { - clearInterval(intervalId) - } + if (flashTimes > totalFlashTimes) clearInterval(intervalId) } } }, 1) @@ -210,25 +182,19 @@ export default class ShaderHelper { public static setMosaic( showNode: Node, materialParam: any, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).mosaic + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).mosaic, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + material.setProperty('xBlockCount', materialParam.xBlockCount) + material.setProperty('yBlockCount', materialParam.yBlockCount) + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { material.setProperty('xBlockCount', materialParam.xBlockCount) material.setProperty('yBlockCount', materialParam.yBlockCount) renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('xBlockCount', materialParam.xBlockCount) - material.setProperty('yBlockCount', materialParam.yBlockCount) - renderComponent.setSharedMaterial(material, 0) - }) }) } @@ -237,17 +203,15 @@ export default class ShaderHelper { */ public static showMosaicMv(showNode: Node, callback: Function = null) { let masaicTimes: number = 500 - let intervalId = setInterval(() => { + const intervalId = setInterval(() => { masaicTimes -= 2 this.setMosaic(showNode, { xBlockCount: masaicTimes, - yBlockCount: masaicTimes + yBlockCount: masaicTimes, }) if (masaicTimes <= 30) { clearInterval(intervalId) - if (callback) { - callback() - } + if (callback) callback() } }, 1) } @@ -261,27 +225,22 @@ export default class ShaderHelper { public static setRoundCornerCrop( showNode: Node, roundCornerRadius: number = 0.1, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).roundCornerCrop + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab) + .roundCornerCrop, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + // material.setProperty("roundCornerRadius", roundCornerRadius); + material.setProperty('xRadius', roundCornerRadius) + material.setProperty('yRadius', roundCornerRadius) + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { // material.setProperty("roundCornerRadius", roundCornerRadius); material.setProperty('xRadius', roundCornerRadius) material.setProperty('yRadius', roundCornerRadius) renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - // material.setProperty("roundCornerRadius", roundCornerRadius); - material.setProperty('xRadius', roundCornerRadius) - material.setProperty('yRadius', roundCornerRadius) - renderComponent.setSharedMaterial(material, 0) - }) }) } @@ -304,33 +263,49 @@ export default class ShaderHelper { enableGradient: boolean = true, cropAlpha: boolean = true, enableFog: boolean = false, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).flashLight + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab) + .flashLight, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + // showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + // material.setProperty('lightColor', lightColor) + // material.setProperty('lightWidth', lightWidth) + // material.setProperty('lightAngle', lightAngle) + // material.setProperty('enableGradient', enableGradient ? 1 : 0) + // material.setProperty('cropAlpha', cropAlpha ? 1 : 0) + // material.setProperty('enableFog', enableFog ? 1 : 0) + // renderComponent.setSharedMaterial(material, 0) + // }) + // showNode.children.forEach((childNode) => { + // childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + // material.setProperty('lightColor', lightColor) + // material.setProperty('lightWidth', lightWidth) + // material.setProperty('lightAngle', lightAngle) + // material.setProperty('enableGradient', enableGradient ? 1 : 0) + // material.setProperty('cropAlpha', cropAlpha ? 1 : 0) + // material.setProperty('enableFog', enableFog ? 1 : 0) + // renderComponent.setSharedMaterial(material, 0) + // }) + // }) + const setMaterialProperties = (renderer: UIRenderer) => { + try { material.setProperty('lightColor', lightColor) material.setProperty('lightWidth', lightWidth) material.setProperty('lightAngle', lightAngle) material.setProperty('enableGradient', enableGradient ? 1 : 0) material.setProperty('cropAlpha', cropAlpha ? 1 : 0) material.setProperty('enableFog', enableFog ? 1 : 0) - renderComponent.setSharedMaterial(material, 0) - }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - material.setProperty('lightColor', lightColor) - material.setProperty('lightWidth', lightWidth) - material.setProperty('lightAngle', lightAngle) - material.setProperty('enableGradient', enableGradient ? 1 : 0) - material.setProperty('cropAlpha', cropAlpha ? 1 : 0) - material.setProperty('enableFog', enableFog ? 1 : 0) - renderComponent.setSharedMaterial(material, 0) - }) + renderer.setSharedMaterial(material, 0) + } catch (error) { + console.error('Error setting material properties:', error) + } + } + const renderComponents = [ + ...showNode.getComponents(UIRenderer), + ...showNode.children.flatMap(childNode => childNode.getComponents(UIRenderer)), + ] + + renderComponents.forEach((renderComponent: UIRenderer) => { + setMaterialProperties(renderComponent) }) } @@ -340,28 +315,23 @@ export default class ShaderHelper { * @param callback */ public static showFlashLightMv(showNode: Node, callback: Function = null) { - let nowClor: Color = new Color(0, 0, 0, 255) + const nowClor: Color = new Color(0, 0, 0, 255) let colorIndex: number = 0 let lightAngle: number = 0 - let intervalId = setInterval(() => { - if (colorIndex == 0) { + const intervalId = setInterval(() => { + if (colorIndex === 0) { nowClor.r = nowClor.r + 2 - if (nowClor.r >= 255) { - colorIndex += 1 - } - } else if (colorIndex == 1) { + if (nowClor.r >= 255) colorIndex += 1 + } else if (colorIndex === 1) { nowClor.g = nowClor.g + 2 - if (nowClor.g >= 255) { - colorIndex += 1 - } + if (nowClor.g >= 255) colorIndex += 1 } else { nowClor.b = nowClor.b + 2 if (nowClor.b >= 255) { clearInterval(intervalId) ShaderHelper.clearAllEffect(showNode) - if (callback) { - callback() - } + if (callback) callback() + return } } @@ -372,21 +342,15 @@ export default class ShaderHelper { public static setFlag( showNode: Node, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).flag + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).flag, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - renderComponent.setSharedMaterial(material, 0) - }) }) } @@ -397,32 +361,23 @@ export default class ShaderHelper { */ public static setGaussian( showNode: Node, - material: Material = ShaderMaterialPrefab.instance.getComponent( - ShaderMaterialPrefab - ).gaussian + material: Material = ShaderMaterialPrefab.instance.getComponent(ShaderMaterialPrefab).gaussian, ) { - showNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - let tran = renderComponent.node.getComponent(UITransform) + showNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + const tran = renderComponent.node.getComponent(UITransform) + material.setProperty('textureSize', new Vec2(tran.contentSize.width, tran.contentSize.height)) + renderComponent.setSharedMaterial(material, 0) + }) + showNode.children.forEach((childNode) => { + childNode.getComponents(UIRenderer).forEach((renderComponent: UIRenderer) => { + const tran = renderComponent.node.getComponent(UITransform) material.setProperty( 'textureSize', - new Vec2(tran.contentSize.width, tran.contentSize.height) + new Vec2(tran.contentSize.width, tran.contentSize.height), ) - renderComponent.setMaterial(material, 0) + // material.setProperty("textureSize", cc.v2(showNode.width, showNode.height)); + renderComponent.setSharedMaterial(material, 0) }) - showNode.children.forEach((childNode) => { - childNode - .getComponents(UIRenderer) - .forEach((renderComponent: UIRenderer) => { - let tran = renderComponent.node.getComponent(UITransform) - material.setProperty( - 'textureSize', - new Vec2(tran.contentSize.width, tran.contentSize.height) - ) - // material.setProperty("textureSize", cc.v2(showNode.width, showNode.height)); - renderComponent.setSharedMaterial(material, 0) - }) }) } } diff --git a/assets/FishSingle/script/engine/utils/VersionManager.ts b/assets/FishSingle/script/engine/utils/VersionManager.ts index 145b21a..adad662 100644 --- a/assets/FishSingle/script/engine/utils/VersionManager.ts +++ b/assets/FishSingle/script/engine/utils/VersionManager.ts @@ -1,5 +1,7 @@ import { sys } from 'cc' + import ManifestConfig from '../config/ManifestConfig' + import EventManager from './EventManager' import HotUpdate from './HotUpdate' @@ -8,7 +10,7 @@ export default class VersionManager { public static Config_Game_Name: Array = ['游戏大厅'] - //热更文件下载来后存放文件夹 + // 热更文件下载来后存放文件夹 public static Config_Key: Array = ['main-remote-asset'] private static Config_ManifestName: string = 'project.manifest' @@ -18,10 +20,10 @@ export default class VersionManager { public iosStoreUrl: string = '' public apkStoreUrl: string = '' - public nowVersion: string = ManifestConfig.version //网页显示版本号，如果是热更会替换改值 + public nowVersion: string = ManifestConfig.version // 网页显示版本号，如果是热更会替换改值 public targetVersion: string = '1.0.0' - public isOpenHotUpdate: boolean = true //是否打开热更 + public isOpenHotUpdate: boolean = true // 是否打开热更 private hotUpdateList: Array = [] @@ -33,27 +35,21 @@ export default class VersionManager { public reInitAll() { this.releaseAll() - for (let i = 0; i < VersionManager.Config_Key.length; i++) { - this.reInit(i) - } + for (let i = 0; i < VersionManager.Config_Key.length; i++) this.reInit(i) } public releaseAll() { - for (let i = 0; i < VersionManager.Config_Key.length; i++) { - if (this.hotUpdateList[i]) { - this.hotUpdateList[i].disposeUpdate() - } - } + for (let i = 0; i < VersionManager.Config_Key.length; i++) + if (this.hotUpdateList[i]) this.hotUpdateList[i].disposeUpdate() } public reInit(index: number) { - if (!this.hotUpdateList[index]) { - this.hotUpdateList[index] = new HotUpdate() - } + if (!this.hotUpdateList[index]) this.hotUpdateList[index] = new HotUpdate() + this.hotUpdateList[index].init( index, VersionManager.Config_Key[index], - VersionManager.Config_ManifestName + VersionManager.Config_ManifestName, ) if (!this.isOpenHotUpdate) { this.hotUpdateList[index].isCheck = true @@ -63,15 +59,15 @@ export default class VersionManager { public checkUpdate(keyIndex: number) { if (keyIndex < this.hotUpdateList.length) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] if (sys.isNative) { - if (keyIndex == this.noUpdateIndex) { - //在大厅热更，不用子游戏热更了 + if (keyIndex === this.noUpdateIndex) { + // 在大厅热更，不用子游戏热更了 hotUpdate.isCheck = true hotUpdate.isFinishUpdate = true EventManager.instance.dispatchEvent( HotUpdate.Event_On_ALREADY_UP_TO_DATE, - VersionManager.Config_Key[keyIndex] + VersionManager.Config_Key[keyIndex], ) } else { hotUpdate.checkUpdate() @@ -81,28 +77,27 @@ export default class VersionManager { hotUpdate.isFinishUpdate = true EventManager.instance.dispatchEvent( HotUpdate.Event_On_ALREADY_UP_TO_DATE, - VersionManager.Config_Key[keyIndex] + VersionManager.Config_Key[keyIndex], ) } } else { EventManager.instance.dispatchEvent( HotUpdate.Event_On_ALREADY_UP_TO_DATE, - VersionManager.Config_Key[keyIndex] + VersionManager.Config_Key[keyIndex], ) } } public startUpdate(keyIndex: number) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] hotUpdate.startUpdate() } public isCheck(keyIndex: number) { if (keyIndex < this.hotUpdateList.length) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] - if (keyIndex == this.noUpdateIndex) { - return true - } + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + if (keyIndex === this.noUpdateIndex) return true + return hotUpdate.isCheck } return true @@ -110,10 +105,9 @@ export default class VersionManager { public needUpdate(keyIndex: number) { if (keyIndex < this.hotUpdateList.length) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] - if (keyIndex == this.noUpdateIndex) { - return false - } + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + if (keyIndex === this.noUpdateIndex) return false + return hotUpdate.needUpdate } return false @@ -121,7 +115,7 @@ export default class VersionManager { public isUpdating(keyIndex: number) { if (keyIndex < this.hotUpdateList.length) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] return hotUpdate.isUpdating } return false @@ -129,10 +123,9 @@ export default class VersionManager { public isFinishUpdate(keyIndex: number) { if (keyIndex < this.hotUpdateList.length) { - let hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] - if (keyIndex == this.noUpdateIndex) { - return true - } + const hotUpdate: HotUpdate = this.hotUpdateList[keyIndex] + if (keyIndex === this.noUpdateIndex) return true + return hotUpdate.isFinishUpdate } return true diff --git a/assets/FishSingle/script/game/config/Config.ts b/assets/FishSingle/script/game/config/Config.ts new file mode 100644 index 0000000..3f65915 --- /dev/null +++ b/assets/FishSingle/script/game/config/Config.ts @@ -0,0 +1,6 @@ +import { DEV } from 'cc/env' + +export default { + url: () => (DEV ? 'https://fish.wanzhuanyongcheng.cn' : 'https://fish.jdt168.com'), + wsUrl: () => (DEV ? 'fish.wanzhuanyongcheng.cn' : 'fish.jdt168.com'), +} diff --git a/assets/FishSingle/script/game/config/GameEvent.ts.meta b/assets/FishSingle/script/game/config/Config.ts.meta similarity index 52% rename from assets/FishSingle/script/game/config/GameEvent.ts.meta rename to assets/FishSingle/script/game/config/Config.ts.meta index 9042692..70d81b7 100644 --- a/assets/FishSingle/script/game/config/GameEvent.ts.meta +++ b/assets/FishSingle/script/game/config/Config.ts.meta @@ -2,10 +2,8 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "71a46444-1a80-435f-b02e-0fe6acf71155", + "uuid": "f01978bd-5d14-49a6-bea7-4b7ad0c82b7b", "files": [], "subMetas": {}, - "userData": { - "simulateGlobals": [] - } + "userData": {} } diff --git a/assets/FishSingle/script/game/config/FishConfig.ts b/assets/FishSingle/script/game/config/FishConfig.ts index 639058a..396a1c7 100644 --- a/assets/FishSingle/script/game/config/FishConfig.ts +++ b/assets/FishSingle/script/game/config/FishConfig.ts @@ -1,44 +1,86 @@ import { FishInfo } from './FishInfo' - +import config from './Config' export class FishConfig { - public static readonly config: ReadonlyArray = [ - new FishInfo(1, '蝴蝶鱼', 2, 2), - new FishInfo(2, '鲶鱼', 2, 1), - new FishInfo(3, '狮子鱼', 2, 2), - new FishInfo(4, '条纹鱼', 2, 2), - new FishInfo(5, '沙丁鱼', 2, 2), - new FishInfo(6, '石斑鱼', 2, 2), - new FishInfo(7, '河豚', 3, 1.2), - new FishInfo(8, '海螺', 3, 2), - new FishInfo(9, '接吻鱼', 3, 1.2), - new FishInfo(10, '海姆', 4, 1), - new FishInfo(11, '绿鳍鱼', 4, 1.2), - new FishInfo(12, '鲎', 4, 1.2), - new FishInfo(13, '魔鬼鱼', 5, 0.6), - new FishInfo(14, '小海龟', 5, 2), - new FishInfo(15, '锤头鲨', 6, 0.5), - new FishInfo(16, '金枪鱼', 6, 0.5), - new FishInfo(17, '大三元', 6, 0.5), - new FishInfo(18, '黄金鲎', 6, 1.2), - new FishInfo(19, '大四喜', 7, 0.5), - new FishInfo(20, '黄金锤头鲨', 7, 0.5), - new FishInfo(21, '金海姆', 7, 0.6), - new FishInfo(22, '五福临门', 8, 0.4), - new FishInfo(23, '金海龟', 8, 0.7), - new FishInfo(24, '金鲨', 8, 0.5), - new FishInfo(25, '蓝鲨', 8, 0.5), - new FishInfo(26, '美人鱼', 14, 0.4), - new FishInfo(27, '金龙', 14, 0.3), - new FishInfo(28, '章鱼', 10, 0.5), - new FishInfo(29, '电鳗鱼', 3, 0.8) + public static config: Array = [ + // new FishInfo(1, '蝴蝶鱼', 2, 2), + // new FishInfo(2, '鲶鱼', 2, 1), + // new FishInfo(3, '狮子鱼', 2, 2), + // new FishInfo(4, '条纹鱼', 2, 2), + // new FishInfo(5, '沙丁鱼', 2, 2), + // new FishInfo(6, '石斑鱼', 2, 2), + // new FishInfo(7, '河豚', 3, 1.2), + // new FishInfo(8, '海螺', 3, 2), + // new FishInfo(9, '接吻鱼', 3, 1.2), + // new FishInfo(10, '海姆', 4, 1), + // new FishInfo(11, '绿鳍鱼', 4, 1.2), + // new FishInfo(12, '鲎', 4, 1.2), + // new FishInfo(13, '魔鬼鱼', 5, 0.6), + // new FishInfo(14, '小海龟', 5, 2), + // new FishInfo(15, '锤头鲨', 6, 0.5), + // new FishInfo(16, '金枪鱼', 6, 0.5), + // new FishInfo(17, '大三元', 6, 0.5), + // new FishInfo(18, '黄金鲎', 6, 1.2), + // new FishInfo(19, '大四喜', 7, 0.5), + // new FishInfo(20, '黄金锤头鲨', 7, 0.5), + // new FishInfo(21, '金海姆', 7, 0.6), + // new FishInfo(22, '五福临门', 8, 0.4), + // new FishInfo(23, '金海龟', 8, 0.7), + // new FishInfo(24, '金鲨', 8, 0.5), + // new FishInfo(25, '蓝鲨', 8, 0.5), + // new FishInfo(26, '美人鱼', 14, 0.4), + // new FishInfo(27, '金龙', 14, 0.3), + // new FishInfo(28, '章鱼', 10, 0.5), + // new FishInfo(29, '电鳗鱼', 3, 0.8), + // new FishInfo(1, '蝴蝶鱼'), + // new FishInfo(2, '鲶鱼'), + // new FishInfo(3, '狮子鱼'), + // new FishInfo(4, '条纹鱼'), + // new FishInfo(5, '沙丁鱼'), + // new FishInfo(6, '石斑鱼'), + // new FishInfo(7, '河豚'), + // new FishInfo(8, '海螺'), + // new FishInfo(9, '接吻鱼'), + // new FishInfo(10, '海姆'), + // new FishInfo(11, '绿鳍鱼'), + // new FishInfo(12, '鲎'), + // new FishInfo(13, '魔鬼鱼'), + // new FishInfo(14, '小海龟'), + // new FishInfo(15, '锤头鲨'), + // new FishInfo(16, '金枪鱼'), + // new FishInfo(17, '大三元'), + // new FishInfo(18, '黄金鲎'), + // new FishInfo(19, '大四喜'), + // new FishInfo(20, '黄金锤头鲨'), + // new FishInfo(21, '金海姆'), + // new FishInfo(22, '五福临门'), + // new FishInfo(23, '金海龟'), + // new FishInfo(24, '金鲨'), + // new FishInfo(25, '蓝鲨'), + // new FishInfo(26, '美人鱼'), + // new FishInfo(27, '金龙'), + // new FishInfo(28, '章鱼'), + // new FishInfo(29, '电鳗鱼'), ] + public static async init() { + this.config = [] + return new Promise((resolve) => { + fetch(`${config.url()}/fish/list`) + .then((response) => response.text()) + .then((response) => { + const { data: res } = JSON.parse(response) + res.data.forEach((item) => { + this.config.push(new FishInfo(item.ID, item.name, item.health)) + }) + resolve(true) + }) + }) + } + public static getFishInfoByType(fishType: number) { for (let i = 0; i < this.config.length; i++) { - let fishInfo: FishInfo = this.config[i] - if (fishInfo.fishType == fishType) { - return fishInfo - } + const fishInfo: FishInfo = this.config[i] + if (fishInfo.fishType === fishType) return fishInfo } } } diff --git a/assets/FishSingle/script/game/config/FishInfo.ts b/assets/FishSingle/script/game/config/FishInfo.ts index d6ac67a..19c9ac5 100644 --- a/assets/FishSingle/script/game/config/FishInfo.ts +++ b/assets/FishSingle/script/game/config/FishInfo.ts @@ -2,17 +2,17 @@ export class FishInfo { public fishType: number public name: string public blood: number - public wikiScale: number + // public wikiScale: number constructor( fishType: number, name: string, blood: number, - wikiScale: number + // wikiScale: number, ) { this.fishType = fishType this.name = name this.blood = blood - this.wikiScale = wikiScale + // this.wikiScale = wikiScale } } diff --git a/assets/FishSingle/script/game/config/FishMapInfo.ts b/assets/FishSingle/script/game/config/FishMapInfo.ts index ff020f4..1ba5e37 100644 --- a/assets/FishSingle/script/game/config/FishMapInfo.ts +++ b/assets/FishSingle/script/game/config/FishMapInfo.ts @@ -1,17 +1,11 @@ export class FishMapInfo { public fishType: number public scale: number - public side: number //1: -1: + public side: number // 1: -1: public x: number public y: number - constructor( - fishType: number, - scale: number, - side: number, - x: number, - y: number - ) { + constructor(fishType: number, scale: number, side: number, x: number, y: number) { this.fishType = fishType this.scale = scale this.side = side diff --git a/assets/FishSingle/script/game/config/FishPathConfig.ts b/assets/FishSingle/script/game/config/FishPathConfig.ts index 6380375..d8a32f0 100644 --- a/assets/FishSingle/script/game/config/FishPathConfig.ts +++ b/assets/FishSingle/script/game/config/FishPathConfig.ts @@ -1,8 +1,10 @@ import { Vec2 } from 'cc' -import { FishPathInfo } from './FishPathInfo' + import RandomUtil from '../../engine/utils/RandomUtil' -import { FishMapInfo } from './FishMapInfo' + import { FishMap } from './FishMap' +import { FishMapInfo } from './FishMapInfo' +import { FishPathInfo } from './FishPathInfo' export class FishPathConfig { private static mapConfig: Array>> = [ @@ -90,7 +92,7 @@ export class FishPathConfig { [1, 1, 1, 754, -7], [1, 1, 1, 671, 26], [1, 1, 1, 630, 59], - [1, 1, 1, 584, 80] + [1, 1, 1, 584, 80], ], [ [2, 1, 1, -784, 353], @@ -135,7 +137,7 @@ export class FishPathConfig { [3, 1, 1, 523, -253], [3, 1, 1, 172, 128], [3, 1, 1, -357, 30], - [3, 1, 1, 582, 23] + [3, 1, 1, 582, 23], ], [ [5, 1, 1, -888, 405], @@ -191,7 +193,7 @@ export class FishPathConfig { [7, 1, 1, 340, -259], [7, 1, 1, 485, -254], [7, 1, 1, 622, -254], - [7, 1, 1, 816, -251] + [7, 1, 1, 816, -251], ], [ [9, 1, 1, -513, 150], @@ -222,7 +224,7 @@ export class FishPathConfig { [9, 1, 1, 865, 195], [9, 1, 1, 665, 207], [17, 1, 1, -461, 2], - [17, 1, 1, 515, -49] + [17, 1, 1, 515, -49], ], [ [19, 1, 1, -785, 31], @@ -234,7 +236,7 @@ export class FishPathConfig { [20, 1, 1, 425, -301], [20, 1, 1, 537, 265], [20, 1, 1, -604, 317], - [20, 1, 1, -634, -285] + [20, 1, 1, -634, -285], ], [ [21, 1, 1, -757, 94], @@ -245,12 +247,12 @@ export class FishPathConfig { [21, 1, 1, -437, 300], [21, 1, 1, -434, -155], [21, 1, 1, 314, -154], - [21, 1, 1, 435, 249] + [21, 1, 1, 435, 249], ], [ [22, 1, 1, -548, 65], [22, 1, 1, 747, 61], - [22, 1, 1, 95, 63] + [22, 1, 1, 95, 63], ], [ [23, 1, 1, -431, 384], @@ -262,7 +264,7 @@ export class FishPathConfig { [23, 1, 1, 1025, 60], [23, 1, 1, 677, -247], [23, 1, 1, 104, 390], - [23, 1, 1, 84, -265] + [23, 1, 1, 84, -265], ], [ [24, 1, 1, -429, 353], @@ -271,7 +273,7 @@ export class FishPathConfig { [24, 1, 1, -27, 35], [24, 1, 1, 563, 39], [24, 1, 1, -268, -245], - [24, 1, 1, 172, -260] + [24, 1, 1, 172, -260], ], [ [25, 1, 1, -595, 276], @@ -279,27 +281,27 @@ export class FishPathConfig { [25, 1, 1, -192, -64], [25, 1, 1, 464, -46], [25, 1, 1, 191, -280], - [25, 1, 1, 884, -319] + [25, 1, 1, 884, -319], ], [ [26, 1, 1, -681, 441], [26, 1, 1, 685, 426], [26, 1, 1, -46, 140], [26, 1, 1, -494, -207], - [26, 1, 1, 497, -238] + [26, 1, 1, 497, -238], ], [ [27, 1, 1, -431, 345], [27, 1, 1, 569, 311], [27, 1, 1, 112, -12], [27, 1, 1, -298, -271], - [27, 1, 1, 678, -244] + [27, 1, 1, 678, -244], ], [ [28, 1, 1, -454, 8], [28, 1, 1, 597, 1], [28, 1, 1, 46, 431], - [28, 1, 1, 44, -227] + [28, 1, 1, 44, -227], ], [ [2, 1, 1, -557, 409], @@ -345,9 +347,10 @@ export class FishPathConfig { [5, 1, 1, 407, -178], [5, 1, 1, 297, 8], [5, 1, 1, 625, 48], - [5, 1, 1, 379, 92] - ] + [5, 1, 1, 379, 92], + ], ] + private static formatMapConfig: Array = [] private static config: Array>> = [ // 左边开始 @@ -368,7 +371,7 @@ export class FishPathConfig { [627, -511], [762, -578], [885, -667], - [1068, -773] + [1068, -773], ], [ [-1295, 534], @@ -385,7 +388,7 @@ export class FishPathConfig { [753, 233], [936, 279], [1182, 350], - [1314, 418] + [1314, 418], ], [ [-1295, 534], @@ -402,7 +405,7 @@ export class FishPathConfig { [827, -42], [1020, -131], [1189, -170], - [1309, -198] + [1309, -198], ], [ [-1295, 534], @@ -419,7 +422,7 @@ export class FishPathConfig { [835, 88], [1013, -2], [1212, -99], - [1309, -198] + [1309, -198], ], [ [-1275, -118], @@ -436,7 +439,7 @@ export class FishPathConfig { [772, 391], [887, 426], [1066, 513], - [1164, 710] + [1164, 710], ], [ [-1299, -618], @@ -453,7 +456,7 @@ export class FishPathConfig { [904, 176], [1090, 273], [1208, 355], - [1308, 435] + [1308, 435], ], [ [-1275, -118], @@ -470,7 +473,7 @@ export class FishPathConfig { [784, 266], [935, 228], [1157, 174], - [1329, 163] + [1329, 163], ], [ [-1288, -220], @@ -487,7 +490,7 @@ export class FishPathConfig { [851, 203], [1050, 141], [1255, 58], - [1326, 20] + [1326, 20], ], [ [-1288, -220], @@ -504,7 +507,7 @@ export class FishPathConfig { [993, -283], [1090, -319], [1242, -341], - [1329, -396] + [1329, -396], ], [ [-1288, -220], @@ -521,7 +524,7 @@ export class FishPathConfig { [1011, -407], [1095, -418], [1238, -539], - [1317, -663] + [1317, -663], ], [ [-1314, -508], @@ -540,7 +543,7 @@ export class FishPathConfig { [1093, 280], [1026, 371], [868, 631], - [648, 787] + [648, 787], ], [ [-1314, -508], @@ -559,7 +562,7 @@ export class FishPathConfig { [1093, 280], [1026, 371], [868, 631], - [648, 787] + [648, 787], ], [ [-1314, -508], @@ -576,9 +579,9 @@ export class FishPathConfig { [872, -200], [1060, -391], [1150, -492], - [1301, -461] + [1301, -461], ], - //右边开始 + // 右边开始 [ [1286, -293], [1149, -184], @@ -588,7 +591,7 @@ export class FishPathConfig { [476, 57], [467, 300], [408, 500], - [405, 701] + [405, 701], ], [ [1345, 34], @@ -599,7 +602,7 @@ export class FishPathConfig { [267, -29], [66, -79], [-219, -287], - [-271, -693] + [-271, -693], ], [ [1345, 34], @@ -614,7 +617,7 @@ export class FishPathConfig { [-725, -92], [-963, -68], [-1169, -46], - [-1325, -40] + [-1325, -40], ], [ [1345, 34], @@ -629,7 +632,7 @@ export class FishPathConfig { [-719, -199], [-981, -264], [-1180, -291], - [-1320, -367] + [-1320, -367], ], [ [1345, 34], @@ -644,7 +647,7 @@ export class FishPathConfig { [-707, -320], [-961, -408], [-1160, -449], - [-1309, -524] + [-1309, -524], ], [ [1345, 34], @@ -659,7 +662,7 @@ export class FishPathConfig { [-596, -448], [-847, -604], [-1019, -589], - [-1241, -695] + [-1241, -695], ], [ [1345, 34], @@ -674,7 +677,7 @@ export class FishPathConfig { [-898, 66], [-1070, 219], [-1181, 292], - [-1289, 558] + [-1289, 558], ], [ [1345, 34], @@ -689,7 +692,7 @@ export class FishPathConfig { [-806, 84], [-905, 246], [-1008, 375], - [-1021, 750] + [-1021, 750], ], [ [1297, 542], @@ -704,7 +707,7 @@ export class FishPathConfig { [-806, 84], [-905, 246], [-1008, 375], - [-1021, 750] + [-1021, 750], ], [ [1297, 542], @@ -719,7 +722,7 @@ export class FishPathConfig { [-806, 84], [-927, 189], [-1073, 291], - [-1318, 474] + [-1318, 474], ], [ [1297, 542], @@ -734,7 +737,7 @@ export class FishPathConfig { [-775, -77], [-923, -28], [-1133, -46], - [-1294, -10] + [-1294, -10], ], [ [1297, 542], @@ -749,7 +752,7 @@ export class FishPathConfig { [-616, -254], [-854, -240], [-1115, -272], - [-1312, -336] + [-1312, -336], ], [ [1297, 542], @@ -764,7 +767,7 @@ export class FishPathConfig { [-562, -321], [-647, -446], [-930, -540], - [-1073, -726] + [-1073, -726], ], [ [1293, -558], @@ -779,7 +782,7 @@ export class FishPathConfig { [-562, -321], [-647, -446], [-930, -540], - [-1073, -726] + [-1073, -726], ], [ [1293, -558], @@ -794,7 +797,7 @@ export class FishPathConfig { [-568, -262], [-857, -301], [-1055, -406], - [-1353, -380] + [-1353, -380], ], [ [1293, -558], @@ -809,7 +812,7 @@ export class FishPathConfig { [-590, -195], [-905, -120], [-1100, -72], - [-1300, 225] + [-1300, 225], ], [ [1293, -558], @@ -824,7 +827,7 @@ export class FishPathConfig { [-633, -130], [-917, 33], [-1079, 184], - [-1220, 412] + [-1220, 412], ], [ [1293, -558], @@ -839,9 +842,9 @@ export class FishPathConfig { [-602, -25], [-857, 181], [-921, 416], - [-909, 805] + [-909, 805], ], - //下往上 + // 下往上 [ [-279, -786], [-92, -667], @@ -855,7 +858,7 @@ export class FishPathConfig { [-602, -25], [-857, 181], [-921, 416], - [-909, 805] + [-909, 805], ], [ [-279, -786], @@ -870,7 +873,7 @@ export class FishPathConfig { [-362, 152], [-543, 358], [-721, 502], - [-401, 770] + [-401, 770], ], [ [-279, -786], @@ -885,7 +888,7 @@ export class FishPathConfig { [60, 214], [-85, 418], [-140, 630], - [-401, 770] + [-401, 770], ], [ [-279, -786], @@ -900,7 +903,7 @@ export class FishPathConfig { [253, 319], [330, 465], [544, 684], - [858, 803] + [858, 803], ], [ [841, -837], @@ -915,9 +918,10 @@ export class FishPathConfig { [253, 319], [330, 465], [544, 684], - [858, 803] - ] + [858, 803], + ], ] + private static formatConfig: Array = [] public static init() { @@ -928,70 +932,60 @@ export class FishPathConfig { private static initMapConfig() { this.formatMapConfig = [] for (let i = 0; i < this.mapConfig.length; i++) { - let arr: Array> = this.mapConfig[i] - let fishMapInfoList: Array = [] + const arr: Array> = this.mapConfig[i] + const fishMapInfoList: Array = [] for (let j = 0; j < arr.length; j++) { - let temp: Array = arr[j] - let fishMapInfo: FishMapInfo = new FishMapInfo( + const temp: Array = arr[j] + const fishMapInfo: FishMapInfo = new FishMapInfo( temp[0], temp[1], temp[2], temp[3], - temp[4] + temp[4], ) fishMapInfoList.push(fishMapInfo) } - let fishMap: FishMap = new FishMap(i, fishMapInfoList) + const fishMap: FishMap = new FishMap(i, fishMapInfoList) this.formatMapConfig.push(fishMap) + // console.log('this.formatMapConfig ', this.formatMapConfig) } } public static randomFishMap() { - let randomIndex: number = RandomUtil.nextInt( - 0, - this.formatMapConfig.length - 1 - ) - let map: FishMap = this.formatMapConfig[randomIndex] - return map + const randomIndex: number = RandomUtil.nextInt(0, this.formatMapConfig.length - 1) + return this.formatMapConfig[randomIndex] } private static initNormalConfig() { this.formatConfig = [] let pathId: number = 1 for (let i = 0; i < this.config.length; i++) { - let path: Array = [] - let flipXPath: Array = [] - let flipYPath: Array = [] + const path: Array = [] + const flipXPath: Array = [] + const flipYPath: Array = [] for (let j = 0; j < this.config[i].length; j++) { - let p: Vec2 = new Vec2(this.config[i][j][0], this.config[i][j][1]) + const p: Vec2 = new Vec2(this.config[i][j][0], this.config[i][j][1]) path.push(p) - let flipXP: Vec2 = new Vec2(-p.x, p.y) - let flipYP: Vec2 = new Vec2(p.x, -p.y) + const flipXP: Vec2 = new Vec2(-p.x, p.y) + const flipYP: Vec2 = new Vec2(p.x, -p.y) flipXPath.push(flipXP) flipYPath.push(flipYP) } - this.formatConfig.push(new FishPathInfo(pathId++, path)) - this.formatConfig.push(new FishPathInfo(pathId++, flipXPath)) - this.formatConfig.push(new FishPathInfo(pathId++, flipYPath)) + this.formatConfig.push(new FishPathInfo(pathId, path)) + this.formatConfig.push(new FishPathInfo(pathId, flipXPath)) + this.formatConfig.push(new FishPathInfo(pathId, flipYPath)) } } public static getPathInfo(pathId: number) { for (let i = 0; i < this.formatConfig.length; i++) { - let pathInfo: FishPathInfo = this.formatConfig[i] - if (pathInfo.pathId == pathId) { - return pathInfo - } + const pathInfo: FishPathInfo = this.formatConfig[i] + if (pathInfo.pathId === pathId) return pathInfo } } public static randomPathInfo() { - let randomIndex: number = RandomUtil.nextInt( - 0, - this.formatConfig.length - 1 - ) - // let randomIndex: number = 0 - let pathInfo: FishPathInfo = this.formatConfig[randomIndex] - return pathInfo + const randomIndex: number = RandomUtil.nextInt(0, this.formatConfig.length - 1) + return this.formatConfig[randomIndex] } } diff --git a/assets/FishSingle/script/game/config/FishPathInfo.ts b/assets/FishSingle/script/game/config/FishPathInfo.ts index aa4089d..9595992 100644 --- a/assets/FishSingle/script/game/config/FishPathInfo.ts +++ b/assets/FishSingle/script/game/config/FishPathInfo.ts @@ -1,10 +1,10 @@ import { Vec2 } from 'cc' export class FishPathInfo { - public pathId: number + public pathId: string public path: Array = [] - constructor(pathId: number, path: Array) { + constructor(pathId: string, path: Array) { this.pathId = pathId this.path = path } diff --git a/assets/FishSingle/script/game/config/GameEvent.ts b/assets/FishSingle/script/game/config/GameEvent.ts deleted file mode 100644 index 55c2023..0000000 --- a/assets/FishSingle/script/game/config/GameEvent.ts +++ /dev/null @@ -1,2 +0,0 @@ -export default class GameEvent { -} diff --git a/assets/FishSingle/script/game/manager/BulletManager.ts b/assets/FishSingle/script/game/manager/BulletManager.ts index e32d60f..258e866 100644 --- a/assets/FishSingle/script/game/manager/BulletManager.ts +++ b/assets/FishSingle/script/game/manager/BulletManager.ts @@ -1,32 +1,39 @@ import { - _decorator, Component, EventTouch, - instantiate, Node, NodePool, Prefab, - sys, UITransform, Vec2, - Vec3 + Vec3, + _decorator, + instantiate, + sys, } from 'cc' + import FishBulletBase from '../../../fish/script/FishBulletBase' -import MathUtils from '../../engine/utils/MathUtils' -import CannonManager from './CannonManager' -import { MoveHelper } from '../../engine/utils/MoveHelper' -import FishNetManager from './FishNetManager' -import GameMusicHelper from '../utils/GameMusicHelper' import FishUI from '../../../fish/script/FishUI' import CommonTips from '../../engine/uicomponent/CommonTips' +import MathUtils from '../../engine/utils/MathUtils' + +import { MoveHelper } from '../../engine/utils/MoveHelper' + +import GameMusicHelper from '../utils/GameMusicHelper' + +import CannonManager from './CannonManager' +import FishNetManager from './FishNetManager' +import WsManager from './WsManager' const { ccclass, property } = _decorator +// 子弹管理类 @ccclass('BulletManager') export default class BulletManager extends Component { public static instance: BulletManager = null @property({ type: [Prefab] }) private bulletPrefabList: Prefab[] | [] = [] + private bulletPool: Array = [] private bulletList: Array = [] private bulletMoveSpeed: number = 30 @@ -40,24 +47,23 @@ export default class BulletManager extends Component { this._vec2Cache = new Vec2() BulletManager.instance = this this.node.on(Node.EventType.TOUCH_START, this.onShootBullet, this) - // this.node.on(Node.EventType.TOUCH_MOVE, this.onShootBullet, this) } - start() { - } + start() {} update() { this.checkMoveBullet() } + // 检测子弹是否移动完成 private checkMoveBullet() { for (let i = this.bulletList.length - 1; i >= 0; i--) { - let bullet: FishBulletBase = this.bulletList[i] - let isMoving: boolean = MoveHelper.moveNode( + const bullet: FishBulletBase = this.bulletList[i] + const isMoving: boolean = MoveHelper.moveNode( bullet.node, this.bulletMoveSpeed, bullet.targetP.x, - bullet.targetP.y + bullet.targetP.y, ) if (!isMoving) { bullet.node.getPosition(this._vec3Cache) @@ -70,38 +76,31 @@ export default class BulletManager extends Component { } } + // 发射炮弹 private onShootBullet(event: EventTouch) { - //TOUCH_START 在Editor上，连续触发2次，导致发2次炮弹bug - if (sys.platform == 'EDITOR_PAGE') { + // TOUCH_START 在Editor上，连续触发2次，导致发2次炮弹bug + if (sys.platform === 'EDITOR_PAGE') { this._fireTimeNew = new Date().getTime() - if (this._fireTimeNew - this._fireTime < 100) { - return - } + if (this._fireTimeNew - this._fireTime < 15000) return this._fireTime = this._fireTimeNew } - let tran = this.node.getComponent(UITransform) - let location = event.getUILocation() + const tran = this.node.getComponent(UITransform) + const location = event.getUILocation() this._vec3Cache.x = location.x this._vec3Cache.y = location.y this._vec3Cache.z = 0 tran.convertToNodeSpaceAR(this._vec3Cache, this._vec3Cache) - let localP: Vec2 = new Vec2(this._vec3Cache.x, this._vec3Cache.y) + const localP: Vec2 = new Vec2(this._vec3Cache.x, this._vec3Cache.y) FishUI.instance.playClickEffect(localP) // 子弹发射 if (FishUI.instance.dz_score >= CannonManager.instance.cannonType) { FishUI.instance.dz_score -= CannonManager.instance.cannonType - FishUI.instance.refreshScore() + // FishUI.instance.refreshScore() this._vec3Cache = CannonManager.instance.getCannonPosition() - - let rad: number = MathUtils.p2pRad( - new Vec2(this._vec3Cache.x, this._vec3Cache.y), - localP - ) - let rot: number = MathUtils.radiansToDegrees(rad) - let bullet: FishBulletBase = this.createBullet( - CannonManager.instance.cannonType - 1 - ) + const rad: number = MathUtils.p2pRad(new Vec2(this._vec3Cache.x, this._vec3Cache.y), localP) + const rot: number = MathUtils.radiansToDegrees(rad) + const bullet: FishBulletBase = this.createBullet(CannonManager.instance.cannonType - 1) bullet.targetP = localP this.node.addChild(bullet.node) bullet.node.setPosition(CannonManager.instance.getCannonPosition()) @@ -113,14 +112,14 @@ export default class BulletManager extends Component { bullet.node.angle = rot this.bulletList.push(bullet) GameMusicHelper.playFire() - - //旋转炮台 + // 旋转炮台 CannonManager.instance.rotateCannon(location) } else { CommonTips.showMsg('豆子不足!') } } + // 创建子弹 private createBullet(bulletType: number) { let bulletNode: Node if (this.bulletPool[bulletType] && this.bulletPool[bulletType].size() > 0) { @@ -133,23 +132,21 @@ export default class BulletManager extends Component { } public killBullet(bullet: FishBulletBase) { - let index: number = this.bulletList.indexOf(bullet) + const index: number = this.bulletList.indexOf(bullet) if (index >= 0) { this.bulletList.splice(index, 1) this.destroyBullet(bullet) } } + // 销毁子弹 private destroyBullet(bullet: FishBulletBase) { - //临时代码，因为回收在内存卡顿。后面在优化 2023-2-10 - if (sys.platform == 'EDITOR_PAGE') { + // 临时代码，因为回收在内存卡顿。后面在优化 2023-2-10 + if (sys.platform === 'EDITOR_PAGE') { bullet.node.destroy() return } - - if (!this.bulletPool[bullet.bulletType]) { - this.bulletPool[bullet.bulletType] = new NodePool() - } + if (!this.bulletPool[bullet.bulletType]) this.bulletPool[bullet.bulletType] = new NodePool() this.bulletPool[bullet.bulletType].put(bullet.node) } diff --git a/assets/FishSingle/script/game/manager/CannonManager.ts b/assets/FishSingle/script/game/manager/CannonManager.ts index 4240cd3..249024c 100644 --- a/assets/FishSingle/script/game/manager/CannonManager.ts +++ b/assets/FishSingle/script/game/manager/CannonManager.ts @@ -1,15 +1,29 @@ -import { _decorator, Component, EventMouse, Node, Sprite, SpriteFrame, UITransform, Vec2, Vec3 } from 'cc' +import { + Component, + EventMouse, + Node, + Sprite, + SpriteFrame, + UITransform, + Vec2, + Vec3, + _decorator, +} from 'cc' + import MathUtils from '../../engine/utils/MathUtils' const { ccclass, property } = _decorator +// 炮塔管理类 @ccclass('CannonManager') export default class CannonManager extends Component { public static instance: CannonManager = null @property({ type: Node }) private view: Node | null = null + @property({ type: [SpriteFrame] }) private cannonSpriteFrame: Array | [] = [] + // 炮塔倍数 public cannonType: number = 1 private _vec3Cache: Vec3 @@ -21,33 +35,33 @@ export default class CannonManager extends Component { this.refreshCannon() } + // 炮塔移动 private onMeMove(event: EventMouse) { this.rotateCannon(event.getUILocation()) } + // 炮塔旋转 public rotateCannon(uilocation: Vec2) { - let location = uilocation + const location = uilocation this._vec3Cache.x = location.x this._vec3Cache.y = location.y this._vec3Cache.z = 0 - let tran = this.node.getComponent(UITransform) + const tran = this.node.getComponent(UITransform) tran.convertToNodeSpaceAR(this._vec3Cache, this._vec3Cache) - let localTouch: Vec2 = new Vec2(this._vec3Cache.x, this._vec3Cache.y) + const localTouch: Vec2 = new Vec2(this._vec3Cache.x, this._vec3Cache.y) this.view.getPosition(this._vec3Cache) - let rad: number = MathUtils.p2pRad( - new Vec2(this._vec3Cache.x, this._vec3Cache.y), - localTouch - ) - let rot: number = MathUtils.radiansToDegrees(rad) + const rad: number = MathUtils.p2pRad(new Vec2(this._vec3Cache.x, this._vec3Cache.y), localTouch) + const rot: number = MathUtils.radiansToDegrees(rad) this.view.angle = rot - 90 } + // 刷新炮塔 public refreshCannon() { - this.view.getComponent(Sprite).spriteFrame = - this.cannonSpriteFrame[this.cannonType - 1] + this.view.getComponent(Sprite).spriteFrame = this.cannonSpriteFrame[this.cannonType - 1] } + // 获取炮塔位置 public getCannonPosition() { return this.view.getPosition() } diff --git a/assets/FishSingle/script/game/manager/FishManager.ts b/assets/FishSingle/script/game/manager/FishManager.ts index 58fc8d5..05b6f93 100644 --- a/assets/FishSingle/script/game/manager/FishManager.ts +++ b/assets/FishSingle/script/game/manager/FishManager.ts @@ -1,210 +1,272 @@ -import { _decorator, Animation, Component, game, instantiate, Node, NodePool, Prefab, Vec2, Vec3 } from 'cc' -import RandomUtil from '../../engine/utils/RandomUtil' +import { + Animation, + Component, + Node, + NodePool, + Prefab, + Tween, + Vec2, + Vec3, + _decorator, + game, + instantiate, + tween, +} from 'cc' + import FishBase from '../../../fish/script/FishBase' -import { FishPathConfig } from '../config/FishPathConfig' import FishMover from '../../../fish/script/FishMover' +import FishUI from '../../../fish/script/FishUI' import { Logger } from '../../engine/utils/Logger' -import { FishInfo } from '../config/FishInfo' +import RandomUtil from '../../engine/utils/RandomUtil' import { FishConfig } from '../config/FishConfig' -import GameMusicHelper from '../utils/GameMusicHelper' -import ScoreManager from './ScoreManager' +import { FishInfo } from '../config/FishInfo' import { FishMap } from '../config/FishMap' import { FishMapInfo } from '../config/FishMapInfo' -import FishUI from '../../../fish/script/FishUI' +import { FishPathConfig } from '../config/FishPathConfig' +import GameMusicHelper from '../utils/GameMusicHelper' + import TimeHelper from '../utils/TimeHelper' +import ScoreManager from './ScoreManager' +import WsManager from './WsManager' +import { FishPathInfo } from '../config/FishPathInfo' + const { ccclass, property } = _decorator +interface dataType { + fisn: Array +} + +interface FishType { + fishId: string + fishInfo: FishInfo + fishType: string + isDead: number + fishPathInfo: Array +} + +interface fishPathInfoType { + pathId: string + path: Array +} + +interface PathPoint { + x: number + y: number +} + +// 鱼管理类 @ccclass('FishManager') export default class FishManager extends Component { public static instance: FishManager = null @property({ type: Node }) private fishContainer: Node | null = null + @property({ type: [Prefab] }) public fishPrefabList: Array = [] + private fishPool: Array = [] - private fishList: Array = [] + private fishList: Map = new Map() private nextRandomFishTime: number = 0 private minRandomTime: number = 2 * (game.frameRate as number) private maxRandomTime: number = 5 * (game.frameRate as number) private isFishMap: boolean = false private mapCount: number = 0 - private minMapCount: number = 30 * (game.frameRate as number) - private maxMapCount: number = 60 * (game.frameRate as number) - // // private minMapCount: number = 2 * cc.game.getFrameRate(); - // // private maxMapCount: number = 5 * cc.game.getFrameRate(); private _fishPosCache: Vec3 onLoad() { + WsManager.instance.on(100, this.randomFish, this) FishManager.instance = this this._fishPosCache = new Vec3() - Logger.log( - 'maxRandomTime=', - this.minRandomTime, - this.maxRandomTime, - game.frameRate - ) + Logger.log('maxRandomTime=', this.minRandomTime, this.maxRandomTime, game.frameRate) } start() { - this.randomFish() + // this.randomFish() } update() { - this.checkRandomFish() + // this.checkRandomFish() this.checkFishMoveEnd() - this.checkFishMap() + // this.checkFishMap() } private checkFishMap() { if (!this.isFishMap) { if (this.mapCount > 0) { this.mapCount-- - if (this.mapCount <= 0) { - FishUI.instance.playWaveEffect() - } + if (this.mapCount <= 0) FishUI.instance.playWaveEffect() } } } + // 检测是否随机鱼 private checkRandomFish() { if (!this.isFishMap) { if (this.nextRandomFishTime > 0) { this.nextRandomFishTime-- - if (this.nextRandomFishTime == 0) { - this.randomFish() - } + // if (this.nextRandomFishTime === 0) this.randomFish() } } } + // 检测鱼是否移动结束 private checkFishMoveEnd() { - for (let i = this.fishList.length - 1; i >= 0; i--) { - let fish: FishBase = this.fishList[i] + this.fishList.forEach(async (item: FishBase, key: string) => { if (this.isFishMap) { - if (!fish.isDead) { - fish.node.getPosition(this._fishPosCache) + // 鱼阵回收 + if (item.isDead === 2) { + item.node.getPosition(this._fishPosCache) this._fishPosCache.x -= 2 - fish.node.setPosition(this._fishPosCache) + item.node.setPosition(this._fishPosCache) if (this._fishPosCache.x <= -screen.width / 2) { - //winSize.width - this.destroyFish(fish) - this.fishList.splice(i, 1) + // winSize.width + await WsManager.instance.onSend({ + type: 102, + fish_id: item.fishId, + }) + // this.fishList.splice(index, 1) + this.destroyFish(item) + // this.fishList.delete(item.fishId) this.checkEndFishMap() } } - } else if (!fish.getComponent(FishMover).isMoving) { - this.destroyFish(fish) - this.fishList.splice(i, 1) + } else if (!item.getComponent(FishMover).isMoving) { + // 普通鱼回收 + await WsManager.instance.onSend({ + type: 102, + fish_id: item.fishId, + }) + // this.fishList.splice(index, 1) + this.destroyFish(item) + // this.fishList.delete(item.fishId) } - } + }) } private checkEndFishMap() { - Logger.log('checkEndFishMap==', this.isFishMap, this.fishList) - if (this.isFishMap && this.fishList.length <= 0) { + // Logger.log('checkEndFishMap==', this.isFishMap, this.fishList) + if (this.isFishMap && this.fishList.size <= 0) { this.isFishMap = false - this.randomFish() + // this.randomFish() } } - private randomFish() { - if (this.isFishMap) return - let randomNum: number = RandomUtil.nextInt(1, 10) - // let randomNum: number = RandomUtil.nextInt(1, 1); - for (let i = 0; i < randomNum; i++) { - let fishType: number = RandomUtil.nextInt(1, 29) - // let fishType: number = RandomUtil.nextInt(1, 1); - let fish: FishBase = this.createFishByType(fishType) - fish.fishPathInfo = FishPathConfig.randomPathInfo() + /** + * 原：本地随机生成鱼 + * 新：服务端生成鱼 + */ + private async randomFish(data: dataType) { + const arr = data.fisn + const paths: Array = [] + if (!Array.isArray(arr) || this.isFishMap) return + for (let i = 0; i < arr.length; i++) { + const fish: FishBase = this.createFishByType(arr[i]) + for (let k = 0; k < arr[i].fishPathInfo.length; k++) { + const path: Array = [] + + for (let j = 0; j < arr[i].fishPathInfo[k].path.length; j++) { + const p: Vec2 = new Vec2( + arr[i].fishPathInfo[k].path[j].x, + arr[i].fishPathInfo[k].path[j].y, + ) + path.push(p) + } + paths.push(new FishPathInfo(arr[i].fishPathInfo[k].pathId, path)) + } + fish.fishPathInfo = paths[0] this._fishPosCache.z = 0 this._fishPosCache.x = fish.fishPathInfo.path[0].x this._fishPosCache.y = fish.fishPathInfo.path[0].y fish.node.setPosition(this._fishPosCache) fish.getComponent(FishMover).bezierPList = fish.fishPathInfo.path fish.getComponent(FishMover).startMove() - this.fishList.push(fish) - this.fishContainer.addChild(fish.node) - } - Logger.log('checkFishMoveEnd=randomFish=', this.fishList) - this.nextRandomFishTime = RandomUtil.nextInt( - this.minRandomTime, - this.maxRandomTime - ) - if (this.mapCount <= 0) { - this.mapCount = RandomUtil.nextInt(this.minMapCount, this.maxMapCount) + // this.fishList.push(fish) + this.fishList.set(fish.fishId, fish) + // this.fishContainer.addChild(fish.node) + this.fishContainer.addChild(this.fishList.get(fish.fishId).node) } } - public createFishByType(fishType: number): FishBase { + // 创建鱼类 + public createFishByType(data: FishType | any): FishBase { let fishNode: Node + const fishType: number = Number(data.fishType) if (this.fishPool[fishType - 1] && this.fishPool[fishType - 1].size() > 0) { fishNode = this.fishPool[fishType - 1].get() } else { fishNode = instantiate(this.fishPrefabList[fishType - 1]) } - //fishNode.getComponent(Animation).play() //v3 当前帧 不能播放 - TimeHelper.exeNextFrame(fishNode, () => - fishNode.getComponent(Animation).play() - ) - let fishInfo: FishInfo = FishConfig.getFishInfoByType(fishType) + TimeHelper.exeNextFrame(fishNode, () => fishNode.getComponent(Animation).play()) + const fishInfo: FishInfo = FishConfig.getFishInfoByType(fishType) fishNode.getComponent(FishBase).fishInfo = fishInfo fishNode.getComponent(FishBase).fishType = fishType - fishNode.getComponent(FishBase).blood = fishInfo.blood - fishNode.getComponent(FishBase).isDead = false + fishNode.getComponent(FishBase).fishId = data.fishId + fishNode.getComponent(FishBase).isDead = 2 return fishNode.getComponent(FishBase) } - public killFish(fish: FishBase) { - let index: number = this.fishList.indexOf(fish) - if (index >= 0) { - // console.log("鱼挂了") - GameMusicHelper.playFishDead(fish.fishType) - fish.node.getPosition(this._fishPosCache) - let vec2 = new Vec2(this._fishPosCache.x, this._fishPosCache.y) - ScoreManager.instance.addScore(fish.fishInfo.blood, vec2) - this.fishList.splice(index, 1) - this.destroyFish(fish) - this.checkEndFishMap() + // 销毁鱼类 + public killFish(res: any) { + const fishCheck = this.fishList.get(res.fish_id) + // console.log('正在执行销毁=', fishCheck.fishId, res.fish_id, res.fish_status, fishCheck.isDead) + if (fishCheck) { + fishCheck.isDead = 1 + setTimeout(() => { + GameMusicHelper.playFishDead(fishCheck.fishType) + fishCheck.node.getPosition(this._fishPosCache) + const vec2 = new Vec2(this._fishPosCache.x, this._fishPosCache.y) + ScoreManager.instance.addScore(Number(res.fish_number), vec2) + this.destroyFish(fishCheck) + // console.log('killFish=', fishCheck.fishId, fishCheck.fishInfo.name) + this.checkEndFishMap() + }, 500) + tween(fishCheck.node) + .repeatForever(tween().by(0.6, { angle: -360 })) + .start() + + // this.fishList.splice(index, 1) } } private destroyFish(fish: FishBase) { - if (!this.fishPool[fish.fishType - 1]) { - this.fishPool[fish.fishType - 1] = new NodePool() + const f = this.fishList.get(fish.fishId) + if (!f) return + if (!this.fishPool[f.fishType - 1]) { + this.fishPool[f.fishType - 1] = new NodePool() } - this.fishPool[fish.fishType - 1].put(fish.node) + this.fishPool[f.fishType - 1].put(f.node) + this.fishList.delete(f.fishId) } public playFishMap() { this.isFishMap = true - for (let i = this.fishList.length - 1; i >= 0; i--) { - let fish: FishBase = this.fishList[i] + this.fishList.forEach((fish: FishBase, key: string) => { this.destroyFish(fish) - this.fishList.splice(i, 1) - } + }) } public startFishMap() { - // this.playFishMap(); - // this.fishList = []; - - let map: FishMap = FishPathConfig.randomFishMap() - let fishMapInfoList: Array = map.fishMapInfoList + const map: FishMap = FishPathConfig.randomFishMap() + const fishMapInfoList: Array = map.fishMapInfoList Logger.log('startFishMap==', this.isFishMap, this.fishList, map) for (let i = 0; i < fishMapInfoList.length; i++) { - let fishMapInfo: FishMapInfo = fishMapInfoList[i] - let fish: FishBase = this.createFishByType(fishMapInfo.fishType) + const fishMapInfo: FishMapInfo = fishMapInfoList[i] + // 暂时屏蔽 + // @ts-ignore + const fish: FishBase = this.createFishByType(fishMapInfo.fishType) fish.node.angle = 0 - // fish.node.setScale(fishMapInfo.scale); this.fishContainer.addChild(fish.node) fish.node.setPosition(fishMapInfo.x + screen.width, fishMapInfo.y) - this.fishList.push(fish) + this.fishList.set(fish.fishId, fish) } } onDestroy() { FishManager.instance = null + WsManager.instance.off(100) } + + protected onDisable(): void {} } diff --git a/assets/FishSingle/script/game/manager/FishNetManager.ts b/assets/FishSingle/script/game/manager/FishNetManager.ts index 189933e..5d81356 100644 --- a/assets/FishSingle/script/game/manager/FishNetManager.ts +++ b/assets/FishSingle/script/game/manager/FishNetManager.ts @@ -1,26 +1,31 @@ -import { _decorator, Component, instantiate, Node, NodePool, Prefab, Vec2, Vec3 } from 'cc' +import { Component, Node, NodePool, Prefab, Vec2, Vec3, _decorator, instantiate } from 'cc' + import FishNetBase from '../../../fish/script/FishNetBase' const { ccclass, property } = _decorator +// 鱼网管理类 @ccclass('FishNetManager') export default class FishNetManager extends Component { public static instance: FishNetManager = null @property({ type: [Prefab] }) private netPrefabList: Prefab[] | [] = [] + private fishNetPool: Array = [] onLoad() { FishNetManager.instance = this } + // 添加鱼网 public addFishNet(netType: number, p: Vec2) { - let fishNet: FishNetBase = this.createFishNet(netType) + const fishNet: FishNetBase = this.createFishNet(netType) this.node.addChild(fishNet.node) fishNet.node.setPosition(new Vec3(p.x, p.y, 0)) fishNet.playMv() } + // 创建鱼网 private createFishNet(netType: number) { let fishNetNode: Node if (this.fishNetPool[netType] && this.fishNetPool[netType].size() > 0) { @@ -28,14 +33,17 @@ export default class FishNetManager extends Component { } else { fishNetNode = instantiate(this.netPrefabList[netType]) } + fishNetNode.getComponent(FishNetBase).netType = netType return fishNetNode.getComponent(FishNetBase) } + // 销毁鱼网 public destroyFishNet(fishNet: FishNetBase) { if (!this.fishNetPool[fishNet.netType]) { this.fishNetPool[fishNet.netType] = new NodePool() } + this.fishNetPool[fishNet.netType].put(fishNet.node) } diff --git a/assets/FishSingle/script/game/manager/ScoreManager.ts b/assets/FishSingle/script/game/manager/ScoreManager.ts index 848cd70..9dc65e4 100644 --- a/assets/FishSingle/script/game/manager/ScoreManager.ts +++ b/assets/FishSingle/script/game/manager/ScoreManager.ts @@ -1,6 +1,7 @@ -import { _decorator, Component, instantiate, Node, NodePool, Prefab, Vec2, Vec3 } from 'cc' -import ScorePrefab from '../prefab/ScorePrefab' +import { Component, Node, NodePool, Prefab, Vec2, Vec3, _decorator, instantiate } from 'cc' + import FishUI from '../../../fish/script/FishUI' +import ScorePrefab from '../prefab/ScorePrefab' const { ccclass, property } = _decorator @@ -9,6 +10,7 @@ export default class ScoreManager extends Component { public static instance: ScoreManager = null @property({ type: Prefab }) private scrorePrefab: Prefab | null = null + private scorePool: NodePool onLoad() { @@ -16,34 +18,35 @@ export default class ScoreManager extends Component { this.scorePool = new NodePool() } + // 添加积分 public addScore(score: number, p: Vec2) { - let scorePrefab: ScorePrefab = this.createScore(score) + const scorePrefab: ScorePrefab = this.createScore(score) this.node.addChild(scorePrefab.node) scorePrefab.node.setPosition(new Vec3(p.x, p.y, 0)) scorePrefab.init(score) scorePrefab.playMoveEffect(new Vec2(-472.398, -547.481), () => { this.destroyScore(scorePrefab) - FishUI.instance.jf_score += score - FishUI.instance.refreshScore() + // 本地不在添加积分 + // FishUI.instance.jf_score += score + // FishUI.instance.refreshScore() }) } + // 创建积分 private createScore(score: number): ScorePrefab { let scoreNode: Node - if (this.scorePool && this.scorePool.size() > 0) { - scoreNode = this.scorePool.get() - } else { - scoreNode = instantiate(this.scrorePrefab) - } + if (this.scorePool && this.scorePool.size() > 0) scoreNode = this.scorePool.get() + else scoreNode = instantiate(this.scrorePrefab) + return scoreNode.getComponent(ScorePrefab) } + // 销毁积分 private destroyScore(scorePrefab: ScorePrefab) { this.scorePool.put(scorePrefab.node) } - onDisable() { - } + onDisable() {} onDestroy() { ScoreManager.instance = null diff --git a/assets/FishSingle/script/game/manager/WsManager.ts b/assets/FishSingle/script/game/manager/WsManager.ts new file mode 100644 index 0000000..0acc344 --- /dev/null +++ b/assets/FishSingle/script/game/manager/WsManager.ts @@ -0,0 +1,137 @@ +import { _decorator } from 'cc' +import CommonTips from '../../engine/uicomponent/CommonTips' +import FishUI from '../../../fish/script/FishUI' +import config from '../config/Config' + +export default class WsManager { + private static _instance: WsManager = null + uid: string + + message: any + + t_id: any = null + + public static get instance() { + if (!this._instance) { + this._instance = new WsManager() + } + return this._instance + } + + private _socket: WebSocket | null = null + + protected m_mapCallbackFun: Map + + constructor() { + this.m_mapCallbackFun = new Map() + } + + public on(msgId: number, cb: Function, target: any) { + let callback = cb.bind(target) + let fnCallback: Function = this.m_mapCallbackFun.get(msgId) + if (fnCallback) { + console.error('重复注册消息处理函数! msgId:' + msgId) + } else { + this.m_mapCallbackFun.set(msgId, callback) + } + } + + public off(msgId: number) { + if (this.m_mapCallbackFun.has(msgId)) { + this.m_mapCallbackFun.delete(msgId) + } + } + + public get(msgId: number) { + return this.m_mapCallbackFun.get(msgId) + } + + public offAll() { + this.m_mapCallbackFun.clear() + } + + // 获取url参数 + public getQueryString(name: string) { + var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i') + var r = window.location.search.substr(1).match(reg) + if (r != null) { + return unescape(r[2]) + } + return null + } + + public init(): void { + this.uid = this.getQueryString('uid') + this._socket = new WebSocket(`wss://${config.wsUrl()}/fish/home?uid=${this.uid}`) + + // 添加事件监听器 + this._socket.onopen = this.onOpen.bind(this) + this._socket.onmessage = this.onMessage.bind(this) + this._socket.onclose = this.onClose.bind(this) + this._socket.onerror = this.onError.bind(this) + } + + public onOpen(): void { + console.log('WebSocket connection opened.') + setInterval(() => { + this._socket.send(JSON.stringify('ping')) + }, 20000) + this.clear() + } + + public async onSend(data: any): Promise { + if (this._socket && this._socket.readyState === WebSocket.OPEN) { + this._socket.send(JSON.stringify(data)) + } else { + console.error('消息发送失败！！！') + } + } + + /** + * 处理接收到的消息 + * @param event WebSocket message event + */ + public onMessage(event: MessageEvent): void { + this.message = JSON.parse(event.data) + + if (this.message.code === 200 || this.message.code === 5) { + FishUI.instance.refreshScore(this.message) + } + + let fnCallback: Function = this.m_mapCallbackFun.get(this.message.code) + + if (fnCallback) { + fnCallback(this.message) + } + } + + /** + * 关闭WebSocket连接 + */ + public onClose(): void { + console.log('链接已关闭') + CommonTips.showMsg('游戏服务器中断关闭，正在重试') + // this.init() + if (this._socket) { + this._socket.close() + this._socket = null + } + this.t_id = setInterval(() => { + WsManager.instance.init() + }, 8000) + } + + public onError(event: Event): void { + CommonTips.showMsg('网络连接失败，正在重试链接游戏服务器') + this.t_id = setInterval(() => { + WsManager.instance.init() + }, 8000) + } + + public clear() { + if (this.t_id) { + clearInterval(this.t_id) + this.t_id = null + } + } +} diff --git a/assets/FishSingle/script/game/scene/StartScene.ts.meta b/assets/FishSingle/script/game/manager/WsManager.ts.meta similarity index 52% rename from assets/FishSingle/script/game/scene/StartScene.ts.meta rename to assets/FishSingle/script/game/manager/WsManager.ts.meta index 3e1cbfe..d2729d5 100644 --- a/assets/FishSingle/script/game/scene/StartScene.ts.meta +++ b/assets/FishSingle/script/game/manager/WsManager.ts.meta @@ -2,10 +2,8 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "65ad3e01-f8b1-4160-a391-c55d6c8f366f", + "uuid": "44f1bff8-2972-4ae5-8f53-e0daaa97b92e", "files": [], "subMetas": {}, - "userData": { - "simulateGlobals": [] - } + "userData": {} } diff --git a/assets/FishSingle/script/game/prefab/ResourcePrefab.ts b/assets/FishSingle/script/game/prefab/ResourcePrefab.ts index 3593463..23abc1f 100644 --- a/assets/FishSingle/script/game/prefab/ResourcePrefab.ts +++ b/assets/FishSingle/script/game/prefab/ResourcePrefab.ts @@ -1,4 +1,5 @@ -import { _decorator, Component, instantiate, Node, Prefab } from 'cc' +import { Component, Node, Prefab, _decorator, instantiate } from 'cc' + import PrefabLoader from '../../engine/utils/PrefabLoader' import { GameConfig } from '../config/GameConfig' @@ -6,29 +7,30 @@ const { ccclass, property } = _decorator @ccclass('ResourcePrefab') export default class ResourcePrefab extends Component { - private static prefab: Prefab | null = null - public static instance: Node - @property({ type: Prefab }) - private scorePrefab: Prefab | null = null - public static preLoad(): Promise { - return new Promise((resolve, reject) => { - PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'game/prefab/ResourcePrefab', - (loadedResource: Prefab) => { - ResourcePrefab.prefab = loadedResource - ResourcePrefab.instance = instantiate(loadedResource) - resolve() - } - ) - }) - } + private static prefab: Prefab | null = null + public static instance: Node + @property({ type: Prefab }) + private scorePrefab: Prefab | null = null - public static clear() { - ResourcePrefab.instance = null - ResourcePrefab.prefab = null - } + public static preLoad(): Promise { + return new Promise((resolve, reject) => { + PrefabLoader.loadPrefab( + `${GameConfig.GameName}/game/prefab/ResourcePrefab`, + (loadedResource: Prefab) => { + ResourcePrefab.prefab = loadedResource + ResourcePrefab.instance = instantiate(loadedResource) + resolve() + }, + ) + }) + } - public static getScorePrefab() { - return ResourcePrefab.instance.getComponent(ResourcePrefab).scorePrefab - } + public static clear() { + ResourcePrefab.instance = null + ResourcePrefab.prefab = null + } + + public static getScorePrefab() { + return ResourcePrefab.instance.getComponent(ResourcePrefab).scorePrefab + } } diff --git a/assets/FishSingle/script/game/prefab/ScorePrefab.ts b/assets/FishSingle/script/game/prefab/ScorePrefab.ts index 1ee5916..4334eb6 100644 --- a/assets/FishSingle/script/game/prefab/ScorePrefab.ts +++ b/assets/FishSingle/script/game/prefab/ScorePrefab.ts @@ -1,31 +1,27 @@ -import { _decorator, Component, Label, tween, Tween, Vec2, Vec3 } from 'cc' +import { Component, Label, Tween, Vec2, Vec3, _decorator, tween } from 'cc' const { ccclass, property } = _decorator @ccclass('ScorePrefab') export default class ScorePrefab extends Component { - @property({ type: Label }) - private txtScore: Label | null = null - public init(score: number) { - if (score <= 0) { - this.txtScore.string = 'Miss' - } else { - this.txtScore.string = score + '' - } - } + @property({ type: Label }) + private txtScore: Label | null = null - public playMoveEffect(p: Vec2, callback: Function = null) { - tween(this.node) - .to(0.5, { scale: new Vec3(3, 3, 3), position: new Vec3(p.x, p.y, 0) }) - .call(() => { - if (callback) { - callback() - } - }) - .start() - } + public init(score: number) { + if (score <= 0) this.txtScore.string = 'Miss' + else this.txtScore.string = `${score}` + } - onDisable() { - Tween.stopAllByTarget(this.node) - } + public playMoveEffect(p: Vec2, callback: Function = null) { + tween(this.node) + .to(0.5, { scale: new Vec3(3, 3, 3), position: new Vec3(p.x, p.y, 0) }) + .call(() => { + if (callback) callback() + }) + .start() + } + + onDisable() { + Tween.stopAllByTarget(this.node) + } } diff --git a/assets/FishSingle/script/game/prefab/ShaderMaterialPrefab.ts b/assets/FishSingle/script/game/prefab/ShaderMaterialPrefab.ts index 47e7e28..447e0fc 100644 --- a/assets/FishSingle/script/game/prefab/ShaderMaterialPrefab.ts +++ b/assets/FishSingle/script/game/prefab/ShaderMaterialPrefab.ts @@ -1,4 +1,5 @@ -import { _decorator, Component, instantiate, Material, Node, Prefab } from 'cc' +import { Component, Material, Node, Prefab, _decorator, instantiate } from 'cc' + import PrefabLoader from '../../engine/utils/PrefabLoader' import { GameConfig } from '../config/GameConfig' @@ -13,29 +14,36 @@ export default class ShaderMaterialPrefab extends Component { @property({ type: Material }) public grayMaterial: Material | null = null + @property({ type: Material }) public oldPhoto: Material | null = null + @property({ type: Material }) public glowInner: Material | null = null + @property({ type: Material }) public mosaic: Material | null = null + @property({ type: Material }) public roundCornerCrop: Material | null = null + @property({ type: Material }) public flashLight: Material | null = null + @property({ type: Material }) public flag: Material | null = null + @property({ type: Material }) public gaussian: Material | null = null public static preLoad(): Promise { return new Promise((resolve, reject) => { PrefabLoader.loadPrefab( - GameConfig.GameName + '/' + 'game/prefab/ShaderMaterialPrefab', + `${GameConfig.GameName}/game/prefab/ShaderMaterialPrefab`, (loadedResource: Prefab) => { ShaderMaterialPrefab.instance = instantiate(loadedResource) resolve() - } + }, ) }) } diff --git a/assets/FishSingle/script/game/scene/FishGameScene.ts b/assets/FishSingle/script/game/scene/FishGameScene.ts index 9200b4f..abd4d93 100644 --- a/assets/FishSingle/script/game/scene/FishGameScene.ts +++ b/assets/FishSingle/script/game/scene/FishGameScene.ts @@ -1,37 +1,63 @@ -import { _decorator, instantiate, Node, Prefab, Sprite, Tween, Vec3 } from 'cc' -import SceneBase from './SceneBase' -import TextureMgr from '../../engine/uicomponent/TextureMgr' -import RandomUtil from '../../engine/utils/RandomUtil' +import { + Component, + Game, + Node, + Prefab, + Sprite, + Tween, + Vec3, + _decorator, + director, + game, + instantiate, +} from 'cc' + import FishMover from '../../../fish/script/FishMover' -import { FishPathInfo } from '../config/FishPathInfo' -import { FishPathConfig } from '../config/FishPathConfig' -import { Logger } from '../../engine/utils/Logger' import FishWiki from '../../../fish/script/FishWiki' +import TextureMgr from '../../engine/uicomponent/TextureMgr' +import { Logger } from '../../engine/utils/Logger' +import RandomUtil from '../../engine/utils/RandomUtil' +import { FishPathConfig } from '../config/FishPathConfig' +import { FishPathInfo } from '../config/FishPathInfo' +import WsManager from '../manager/WsManager' import GameMusicHelper from '../utils/GameMusicHelper' +import CommonTips from '../../engine/uicomponent/CommonTips' const { ccclass, property } = _decorator @ccclass('FishGameScene') -export default class FishGameScene extends SceneBase { +export default class FishGameScene extends Component { @property(Sprite) private bg: Sprite | null = null + @property({ type: [Prefab] }) private fishPrefabList: Array | null = [] + private showNode: Node | null = null + onLoad() { + this.onLoadMe() + } + + onDestroy() { + this.onDestroyMe() + } + onLoadMe() { + WsManager.instance.init() GameMusicHelper.playBg() - FishPathConfig.init() - this.initBg() + WsManager.instance.on(400, this.showMsg, this) + // FishPathConfig.init() + // this.initBg() // this.testPathPlay() + game.on(Game.EVENT_HIDE, this.onHide, this) + game.on(Game.EVENT_SHOW, this.onAppShow, this) } private initBg() { - let textureMgr: TextureMgr = this.bg.getComponent(TextureMgr) + const textureMgr: TextureMgr = this.bg.getComponent(TextureMgr) this.bg.spriteFrame = - textureMgr.Spriteset[ - RandomUtil.nextInt(0, textureMgr.Spriteset.length - 1) - ] + textureMgr.Spriteset[RandomUtil.nextInt(0, textureMgr.Spriteset.length - 1)] } private initShowNode() { @@ -39,10 +65,9 @@ export default class FishGameScene extends SceneBase { this.showNode.destroy() this.showNode = null } - let fishType: number = 29 - if (fishType < 1 || fishType > 29) { - return - } + const fishType: number = 29 + if (fishType < 1 || fishType > 29) return + this.showNode = instantiate(this.fishPrefabList[fishType - 1]) this.showNode.getComponent(FishMover).speed = 2 this.showNode.getComponent(FishMover).node.setScale(new Vec3(2, 2, 1)) @@ -51,10 +76,10 @@ export default class FishGameScene extends SceneBase { private testPathPlay() { this.initShowNode() - let pathInfo: FishPathInfo = FishPathConfig.getPathInfo(3) + const pathInfo: FishPathInfo = FishPathConfig.getPathInfo(3) Logger.log('testPathPlay=pathInfo=', pathInfo) - let params = pathInfo.path - let param0 = params[0] + const params = pathInfo.path + const param0 = params[0] Logger.log('testPathPlay=11=', param0) this.showNode.setPosition(new Vec3(param0.x, param0.y, 0)) this.showNode.getComponent(FishMover).bezierPList = params @@ -65,9 +90,22 @@ export default class FishGameScene extends SceneBase { FishWiki.show() } + private showMsg(res: any) { + Logger.log('showMsg=res=', res) + CommonTips.showMsg(res.msg) + } + onDestroyMe() { this.unscheduleAllCallbacks() - //this.node.stopAllActions(); + // this.node.stopAllActions(); Tween.stopAllByTarget(this.node) } + + onHide() { + director.pause() + } + + onAppShow() { + director.resume() + } } diff --git a/assets/FishSingle/script/game/scene/LoadingScene.ts b/assets/FishSingle/script/game/scene/LoadingScene.ts index cab76b9..9c848e1 100644 --- a/assets/FishSingle/script/game/scene/LoadingScene.ts +++ b/assets/FishSingle/script/game/scene/LoadingScene.ts @@ -1,4 +1,14 @@ -import { _decorator, DynamicAtlasManager, Node, PhysicsSystem2D, profiler, sys } from 'cc' +import { + _decorator, + Node, + sys, + profiler, + DynamicAtlasManager, + PhysicsSystem2D, + Component, +} from 'cc' +const { ccclass, property } = _decorator + import MusicConfig from '../../engine/config/MusicConfig' import CommonTips from '../../engine/uicomponent/CommonTips' import Progress from '../../engine/uicomponent/Progress' @@ -7,74 +17,69 @@ import HotUpdate from '../../engine/utils/HotUpdate' import { Logger } from '../../engine/utils/Logger' import VersionManager from '../../engine/utils/VersionManager' import ResourcePreload from '../utils/ResourcePreload' -import SceneBase from './SceneBase' import SceneManager from './SceneManager' - -const { ccclass, property } = _decorator +import { FishConfig } from '../config/FishConfig' @ccclass('LoadingScene') -export default class LoadingScene extends SceneBase { +export default class LoadingScene extends Component { public static scriptName: string = 'LoadingScene' @property({ type: Node }) private progressNode: Node | null = null - async onLoadMe() { + protected onLoad(): void { + this.onLoadMe() + } + + protected onDestroy(): void { + this.onDestroyMe() + } + + onLoadMe() { this.baseInit() - EventManager.instance.addListener( - HotUpdate.Event_On_NeedUpdate, - this.onNeedUpdate, - this - ) - EventManager.instance.addListener( - HotUpdate.Event_On_Progress, - this.onUpdateProgress, - this - ) - EventManager.instance.addListener( - HotUpdate.Event_On_Fail_Update, - this.onUpdateFail, - this - ) - EventManager.instance.addListener( - HotUpdate.Event_Finish_Update, - this.onUpdateFinish, - this - ) + EventManager.instance.addListener(HotUpdate.Event_On_NeedUpdate, this.onNeedUpdate, this) + EventManager.instance.addListener(HotUpdate.Event_On_Progress, this.onUpdateProgress, this) + EventManager.instance.addListener(HotUpdate.Event_On_Fail_Update, this.onUpdateFail, this) + EventManager.instance.addListener(HotUpdate.Event_Finish_Update, this.onUpdateFinish, this) EventManager.instance.addListener( HotUpdate.Event_On_ALREADY_UP_TO_DATE, this.onUpdateFinish, - this + this, ) if (sys.isNative && VersionManager.instance.isOpenHotUpdate) { this.checkUpdate() } else { - await this.preLoadRes() + this.preLoadRes() } } - private baseInit() { - profiler.hideStats() //showStats - //let collisionManager:cc.CollisionManager = director.getCollisionManager(); - PhysicsSystem2D.instance.enable = true + private async baseInit() { + try { + await FishConfig.init() + profiler.hideStats() //showStats + //let collisionManager:cc.CollisionManager = director.getCollisionManager(); + PhysicsSystem2D.instance.enable = true - // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb | - // EPhysics2DDrawFlags.Pair | - // EPhysics2DDrawFlags.CenterOfMass | - // EPhysics2DDrawFlags.Joint | - // EPhysics2DDrawFlags.Shape; + // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb | + // EPhysics2DDrawFlags.Pair | + // EPhysics2DDrawFlags.CenterOfMass | + // EPhysics2DDrawFlags.Joint | + // EPhysics2DDrawFlags.Shape; - //if(collisionManager){ - //collisionManager.enabled = true; - // collisionManager.enabledDebugDraw = true; - // collisionManager.enabledDrawBoundingBox = true; - //} + //if(collisionManager){ + //collisionManager.enabled = true; + // collisionManager.enabledDebugDraw = true; + // collisionManager.enabledDrawBoundingBox = true; + //} - if (DynamicAtlasManager.instance) { - DynamicAtlasManager.instance.enabled = false + if (DynamicAtlasManager.instance) { + DynamicAtlasManager.instance.enabled = false + } + MusicConfig.init() + // cc.director.getCollisionManager().enabled=true;//这是一个全局属性，开启后就代表碰撞检测组件可以进行检测了 + // cc.director.getCollisionManager().enabledDebugDraw = true; //绘制碰撞区域 + } catch (error) { + Logger.error(this, error) } - MusicConfig.init() - // cc.director.getCollisionManager().enabled=true;//这是一个全局属性，开启后就代表碰撞检测组件可以进行检测了 - // cc.director.getCollisionManager().enabledDebugDraw = true; //绘制碰撞区域 } private checkUpdate() { @@ -89,13 +94,10 @@ export default class LoadingScene extends SceneBase { } } - private onUpdateProgress(event: Function, loadedFiles: number, totalFiles: number, key: string) { + private onUpdateProgress(event, loadedFiles, totalFiles, key) { if (key == VersionManager.Config_Key[0]) { - let msg: string = - Math.min(100, (loadedFiles / totalFiles) * 100).toFixed(2) + '%' - this.progressNode - .getComponent(Progress) - .updateProgress(loadedFiles, totalFiles, msg) + let msg: string = Math.min(100, (loadedFiles / totalFiles) * 100).toFixed(2) + '%' + this.progressNode.getComponent(Progress).updateProgress(loadedFiles, totalFiles, msg) } } @@ -126,25 +128,10 @@ export default class LoadingScene extends SceneBase { } onDestroyMe() { - EventManager.instance.removeListener( - HotUpdate.Event_On_NeedUpdate, - this.onNeedUpdate - ) - EventManager.instance.removeListener( - HotUpdate.Event_On_Progress, - this.onUpdateProgress - ) - EventManager.instance.removeListener( - HotUpdate.Event_On_Fail_Update, - this.onUpdateFail - ) - EventManager.instance.removeListener( - HotUpdate.Event_Finish_Update, - this.onUpdateFinish - ) - EventManager.instance.removeListener( - HotUpdate.Event_On_ALREADY_UP_TO_DATE, - this.onUpdateFinish - ) + EventManager.instance.removeListener(HotUpdate.Event_On_NeedUpdate, this.onNeedUpdate) + EventManager.instance.removeListener(HotUpdate.Event_On_Progress, this.onUpdateProgress) + EventManager.instance.removeListener(HotUpdate.Event_On_Fail_Update, this.onUpdateFail) + EventManager.instance.removeListener(HotUpdate.Event_Finish_Update, this.onUpdateFinish) + EventManager.instance.removeListener(HotUpdate.Event_On_ALREADY_UP_TO_DATE, this.onUpdateFinish) } } diff --git a/assets/FishSingle/script/game/scene/SceneBase.ts b/assets/FishSingle/script/game/scene/SceneBase.ts deleted file mode 100644 index bf142b6..0000000 --- a/assets/FishSingle/script/game/scene/SceneBase.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { _decorator, Component } from 'cc' -import AdapterHelper from '../../engine/utils/AdapterHelper' - -const { ccclass, property } = _decorator - -@ccclass('SceneBase') -export default class SceneBase extends Component { - public static scriptName: string = 'SceneBase' - - onLoad() { - AdapterHelper.fixApdater() - this.onLoadMe() - } - - onLoadMe() { - } - - start() { - this.onStartMe() - } - - onStartMe() { - } - - onDestroy() { - this.onDestroyMe() - } - - onDestroyMe() { - } -} diff --git a/assets/FishSingle/script/game/scene/SceneBase.ts.meta b/assets/FishSingle/script/game/scene/SceneBase.ts.meta deleted file mode 100644 index 364d1c9..0000000 --- a/assets/FishSingle/script/game/scene/SceneBase.ts.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "4.0.23", - "importer": "typescript", - "imported": true, - "uuid": "544253ea-8aa0-4349-9d6c-efb97841d976", - "files": [], - "subMetas": {}, - "userData": { - "simulateGlobals": [] - } -} diff --git a/assets/FishSingle/script/game/scene/SceneManager.ts b/assets/FishSingle/script/game/scene/SceneManager.ts index a540e58..62d7c71 100644 --- a/assets/FishSingle/script/game/scene/SceneManager.ts +++ b/assets/FishSingle/script/game/scene/SceneManager.ts @@ -1,9 +1,10 @@ -import { director, SceneAsset, sys } from 'cc' -import { Logger } from '../../engine/utils/Logger' -import LoadingScenePrefab from '../../engine/uicomponent/LoadingScenePrefab' -import CommonTips from '../../engine/uicomponent/CommonTips' -import EventManager from '../../engine/utils/EventManager' +import { SceneAsset, director, sys } from 'cc' + import CommonEvent from '../../engine/config/CommonEvent' +import CommonTips from '../../engine/uicomponent/CommonTips' +import LoadingScenePrefab from '../../engine/uicomponent/LoadingScenePrefab' +import EventManager from '../../engine/utils/EventManager' +import { Logger } from '../../engine/utils/Logger' export default class SceneManager { public static instance: SceneManager = new SceneManager() @@ -23,7 +24,7 @@ export default class SceneManager { } public async sceneSwitch(name: string, showProgress: boolean = false) { - if (this.loadingSceneName == name) return + if (this.loadingSceneName === name) return Logger.log(this, 'sceneSwitch==', name) if (sys.isBrowser) { // showProgress = true; @@ -42,13 +43,13 @@ export default class SceneManager { Logger.warn(this, 'preloadScene=error', error.message) CommonTips.showMsg('加载场景失败') } else { - //director.getScene().destroy();//director.getScene().cleanup(); + // director.getScene().destroy();//director.getScene().cleanup(); director.loadScene(name, this.loadSceneOK.bind(this)) } - } + }, ) } else { - //director.getScene().destroy();//director.getScene().cleanup(); + // director.getScene().destroy();//director.getScene().cleanup(); director.loadScene(name, this.loadSceneOK.bind(this)) } } @@ -65,7 +66,7 @@ export default class SceneManager { public preloadScene( sceneName: string, onProgressCallback: any = null, - onLoadedCallback: any = null + onLoadedCallback: any = null, ) { director.preloadScene(sceneName, onProgressCallback, onLoadedCallback) } diff --git a/assets/FishSingle/script/game/scene/StartScene.ts b/assets/FishSingle/script/game/scene/StartScene.ts deleted file mode 100644 index e281979..0000000 --- a/assets/FishSingle/script/game/scene/StartScene.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { _decorator } from 'cc' -import SceneBase from './SceneBase' - -const { ccclass, property } = _decorator - -@ccclass('StartScene') -export default class StartScene extends SceneBase { - public static scriptName: string = 'StartScene' - - onLoadMe() { - } - - update() { - } - - onDestroyMe() { - } -} diff --git a/assets/FishSingle/script/game/uicomponent/Astar.ts b/assets/FishSingle/script/game/uicomponent/Astar.ts index 2509cbb..8f97ba5 100644 --- a/assets/FishSingle/script/game/uicomponent/Astar.ts +++ b/assets/FishSingle/script/game/uicomponent/Astar.ts @@ -1,11 +1,11 @@ -import { _decorator, Component, Vec2 } from 'cc' +import { Component, Vec2, _decorator } from 'cc' const { ccclass, property } = _decorator export enum AstarGridType { - Hider = 0, //不能走 - Normal = 1, //能走 - End = 2, //终点 + Hider = 0, // 不能走 + Normal = 1, // 能走 + End = 2, // 终点 } @ccclass('Astar') @@ -28,8 +28,7 @@ export class Astar extends Component { private path: Array = [] private gridsList: Array> = [] - onLoad() { - } + onLoad() {} /** * @param mapW 宽格子数 @@ -51,15 +50,12 @@ export class Astar extends Component { this.closeList = [] this.path = [] // 初始化格子二维数组 - this.gridsList = new Array(this.mapW + 1) - for (let col = 0; col < this.gridsList.length; col++) { - this.gridsList[col] = new Array(this.mapH + 1) - } - for (let col = 0; col <= this.mapW; col++) { - for (let row = 0; row <= this.mapH; row++) { - this.addGrid(col, row, AstarGridType.Normal) - } - } + this.gridsList = Array.from({ length: this.mapW + 1 }) + for (let col = 0; col < this.gridsList.length; col++) + this.gridsList[col] = Array.from({ length: this.mapH + 1 }) + + for (let col = 0; col <= this.mapW; col++) + for (let row = 0; row <= this.mapH; row++) this.addGrid(col, row, AstarGridType.Normal) } /** @@ -69,7 +65,7 @@ export class Astar extends Component { * @param type */ private addGrid(x: number, y: number, type: number = AstarGridType.Hider) { - let grid = new AstarGrid() + const grid = new AstarGrid() grid.x = x grid.y = y grid.type = type @@ -83,7 +79,7 @@ export class Astar extends Component { * @param type */ public setGridType(x: number, y: number, type: number) { - let curGrid: AstarGrid = this.gridsList[x][y] + const curGrid: AstarGrid = this.gridsList[x][y] curGrid.type = type } @@ -94,70 +90,59 @@ export class Astar extends Component { * @param callback */ public findPath(startPos: Vec2, endPos: Vec2, callback: Function = null) { - let startGrid = this.gridsList[startPos.x][startPos.y] + const startGrid = this.gridsList[startPos.x][startPos.y] this.openList.push(startGrid) let curGrid: AstarGrid = this.openList[0] - while (this.openList.length > 0 && curGrid.type != AstarGridType.End) { + while (this.openList.length > 0 && curGrid.type !== AstarGridType.End) { // 每次都取出f值最小的节点进行查找 curGrid = this.openList[0] - if (curGrid.type == AstarGridType.End) { + if (curGrid.type === AstarGridType.End) { // Logger.log(this,"find path success."); this.generatePath(curGrid) - if (callback) { - callback(this.path) - } + if (callback) callback(this.path) + return } for (let i: number = -1; i <= 1; i++) { for (let j: number = -1; j <= 1; j++) { - if (i != 0 || j != 0) { - let col = curGrid.x + i - let row = curGrid.y + j + if (i !== 0 || j !== 0) { + const col = curGrid.x + i + const row = curGrid.y + j if ( - col >= 0 && - row >= 0 && - col <= this.mapW && - row <= this.mapH && - this.gridsList[col][row].type != AstarGridType.Hider && - this.closeList.indexOf(this.gridsList[col][row]) < 0 + col >= 0 + && row >= 0 + && col <= this.mapW + && row <= this.mapH + && this.gridsList[col][row].type !== AstarGridType.Hider + && !this.closeList.includes(this.gridsList[col][row]) ) { if (this.is8dir) { // 8方向 斜向走动时要考虑相邻的是不是障碍物 if ( - this.gridsList[col - i][row].type == AstarGridType.Hider || - this.gridsList[col][row - j].type == AstarGridType.Hider - ) { + this.gridsList[col - i][row].type === AstarGridType.Hider + || this.gridsList[col][row - j].type === AstarGridType.Hider + ) continue - } } else { // 四方形行走 - if (Math.abs(i) == Math.abs(j)) { - continue - } + if (Math.abs(i) === Math.abs(j)) continue } // 计算g值 - let g = - curGrid.g + - Math.floor(Math.sqrt(Math.pow(i * 10, 2)) + Math.pow(j * 10, 2)) - if ( - this.gridsList[col][row].g == 0 || - this.gridsList[col][row].g > g - ) { + const g = curGrid.g + Math.floor(Math.sqrt((i * 10) ** 2) + (j * 10) ** 2) + if (this.gridsList[col][row].g === 0 || this.gridsList[col][row].g > g) { this.gridsList[col][row].g = g // 更新父节点 this.gridsList[col][row].parent = curGrid } // 计算h值 manhattan估算法 - this.gridsList[col][row].h = - Math.abs(endPos.x - col) + Math.abs(endPos.y - row) + this.gridsList[col][row].h = Math.abs(endPos.x - col) + Math.abs(endPos.y - row) // 更新f值 - this.gridsList[col][row].f = - this.gridsList[col][row].g + this.gridsList[col][row].h + this.gridsList[col][row].f = this.gridsList[col][row].g + this.gridsList[col][row].h // 如果不在开放列表里则添加到开放列表里 - if (this.openList.indexOf(this.gridsList[col][row]) < 0) { + if (!this.openList.includes(this.gridsList[col][row])) this.openList.push(this.gridsList[col][row]) - } + // // 重新按照f值排序（升序排列) } } @@ -170,9 +155,8 @@ export class Astar extends Component { if (this.openList.length <= 0) { // Logger.log(this,"find path failed."); this.path = [] - if (callback) { - callback(this.path) - } + if (callback) callback(this.path) + break } // 重新按照f值排序（升序排列) @@ -195,6 +179,5 @@ export class Astar extends Component { return this.path } - onDestroy() { - } + onDestroy() {} } diff --git a/assets/FishSingle/script/game/utils/GameMusicHelper.ts b/assets/FishSingle/script/game/utils/GameMusicHelper.ts index 071d032..6fdaac5 100644 --- a/assets/FishSingle/script/game/utils/GameMusicHelper.ts +++ b/assets/FishSingle/script/game/utils/GameMusicHelper.ts @@ -1,15 +1,15 @@ -import SoundPrefab from '../../engine/uicomponent/SoundPrefab' import MusicPrefab from '../../engine/uicomponent/MusicPrefab' +import SoundPrefab from '../../engine/uicomponent/SoundPrefab' import RandomUtil from '../../engine/utils/RandomUtil' export default class GameMusicHelper { public static playBg() { - let randomIndex: number = RandomUtil.nextInt(1, 3) - MusicPrefab.play('background_' + randomIndex) + const randomIndex: number = RandomUtil.nextInt(1, 3) + MusicPrefab.play(`background_${randomIndex}`) } public static playFishDead(fishType: number) { - SoundPrefab.play('deadfish_' + fishType) + SoundPrefab.play(`deadfish_${fishType}`) } public static playFire() { diff --git a/assets/FishSingle/script/game/utils/ResourcePreload.ts b/assets/FishSingle/script/game/utils/ResourcePreload.ts index e1a716a..c44d2d9 100644 --- a/assets/FishSingle/script/game/utils/ResourcePreload.ts +++ b/assets/FishSingle/script/game/utils/ResourcePreload.ts @@ -1,4 +1,5 @@ import { error, game } from 'cc' + import DarkLayer from '../../engine/uicomponent/DarkLayer' import LoadingPrefab from '../../engine/uicomponent/LoadingPrefab' import LoadingScenePrefab from '../../engine/uicomponent/LoadingScenePrefab' @@ -22,29 +23,28 @@ export default class ResourcePreload { } this.isPreloaded = true this.progress = progress - if (this.progress) { + if (this.progress) progress.updateProgress(this.nowIndex, this.totalNum) - } - await LoadingPrefab.preLoad() //1 + + await LoadingPrefab.preLoad() // 1 this.finishOneItemLoad() - await DarkLayer.preLoad() //2 + await DarkLayer.preLoad() // 2 this.finishOneItemLoad() - await MusicPrefab.preLoad() //3 + await MusicPrefab.preLoad() // 3 this.finishOneItemLoad() - await SoundPrefab.preLoad() //4 + await SoundPrefab.preLoad() // 4 this.finishOneItemLoad() - await ResourcePrefab.preLoad() //5 + await ResourcePrefab.preLoad() // 5 this.finishOneItemLoad() - await ShaderMaterialPrefab.preLoad() //6 + await ShaderMaterialPrefab.preLoad() // 6 this.finishOneItemLoad() // callback() } private finishOneItemLoad() { this.nowIndex++ - if (this.progress) { + if (this.progress) this.progress.updateProgress(this.nowIndex, this.totalNum) - } } public restartGame() { @@ -53,7 +53,7 @@ export default class ResourcePreload { LoadingScenePrefab.clear() LoadingPrefab.clear() error('需要获取游戏里所有的AudioSource停止音乐') - //audioEngine.stopAll(); + // audioEngine.stopAll(); // VersionManager.instance.releaseAll(); MusicPrefab.destory() diff --git a/assets/FishSingle/script/game/utils/UIRoot.ts b/assets/FishSingle/script/game/utils/UIRoot.ts index 782bb00..a95df1c 100644 --- a/assets/FishSingle/script/game/utils/UIRoot.ts +++ b/assets/FishSingle/script/game/utils/UIRoot.ts @@ -1,14 +1,16 @@ -import { _decorator, Component } from 'cc' +import { Component, _decorator } from 'cc' const { ccclass, property } = _decorator @ccclass('UIRoot') export class UIRoot extends Component { - public static Instance: UIRoot - onLoad() { - UIRoot.Instance = this - } - onDestroy() { - UIRoot.Instance = null - } + public static Instance: UIRoot + + onLoad() { + UIRoot.Instance = this + } + + onDestroy() { + UIRoot.Instance = null + } } diff --git a/assets/resources.meta b/assets/resources.meta index 52dec34..dfeb240 100644 --- a/assets/resources.meta +++ b/assets/resources.meta @@ -9,6 +9,8 @@ "isBundle": true, "bundleName": "resources", "priority": 8, - "bundleConfigID": "auto_cbE1A9R1RLTIElrWNnw4oz" + "bundleConfigID": "auto_cbE1A9R1RLTIElrWNnw4oz", + "compressionType": {}, + "isRemoteBundle": {} } } diff --git a/assets/resources/.DS_Store b/assets/resources/.DS_Store index 1d70101..e248bb5 100644 Binary files a/assets/resources/.DS_Store and b/assets/resources/.DS_Store differ diff --git a/assets/resources/FishSingle/game/dialog/FishWiki.prefab b/assets/resources/FishSingle/game/dialog/FishWiki.prefab index 2f3ca6f..50b32d5 100644 --- a/assets/resources/FishSingle/game/dialog/FishWiki.prefab +++ b/assets/resources/FishSingle/game/dialog/FishWiki.prefab @@ -1010,12 +1010,11 @@ "_styleFlags": 0, "_id": "", "_enableOutline": true, - "_outlineWidth": 3, "_outlineColor": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 } }, diff --git a/assets/resources/FishSingle/share/uicomponent/CommonTips.prefab b/assets/resources/FishSingle/share/uicomponent/CommonTips.prefab index b91a8b7..6f99b9a 100644 --- a/assets/resources/FishSingle/share/uicomponent/CommonTips.prefab +++ b/assets/resources/FishSingle/share/uicomponent/CommonTips.prefab @@ -330,7 +330,6 @@ "_batchAsBitmap": false, "_id": "", "_enableOutline": true, - "_outlineWidth": 4, "_outlineColor": { "__type__": "cc.Color", "r": 0, diff --git a/assets/resources/FishSingle/share/uicomponent/LoadingScenePrefab.prefab b/assets/resources/FishSingle/share/uicomponent/LoadingScenePrefab.prefab index 9ea6898..fc17363 100644 --- a/assets/resources/FishSingle/share/uicomponent/LoadingScenePrefab.prefab +++ b/assets/resources/FishSingle/share/uicomponent/LoadingScenePrefab.prefab @@ -821,7 +821,6 @@ "_styleFlags": 0, "_id": "", "_enableOutline": true, - "_outlineWidth": 3, "_outlineColor": { "__type__": "cc.Color", "r": 0, diff --git a/build-templates/templates-version.json b/build-templates/templates-version.json new file mode 100644 index 0000000..eb2014e --- /dev/null +++ b/build-templates/templates-version.json @@ -0,0 +1,3 @@ +{ + "web-mobile": "1.0.0" +} diff --git a/build-templates/web-mobile/index.ejs b/build-templates/web-mobile/index.ejs new file mode 100644 index 0000000..63f7db0 --- /dev/null +++ b/build-templates/web-mobile/index.ejs @@ -0,0 +1,47 @@ + + + + + + 捷兑通 | 捕鱼达人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+ <%- include(cocosTemplate, {}) %> + + diff --git a/eslint.config.js b/eslint.config.js index 56408a7..44dca83 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -17,19 +17,22 @@ module.exports = antfu( 'node/prefer-global/process': 'off', 'node/prefer-global/buffer': 'off', 'antfu/if-newline': 'off', + 'style/brace-style': 'off', + 'style/operator-linebreak': 'off', + 'no-case-declarations': 'off', 'import/order': [ 2, { - pathGroups: [ + 'pathGroups': [ { pattern: '~/**', group: 'external', position: 'after', }, ], - alphabetize: { order: 'asc', caseInsensitive: false }, + 'alphabetize': { order: 'asc', caseInsensitive: false }, 'newlines-between': 'always-and-inside-groups', - warnOnUnassignedImports: true, + 'warnOnUnassignedImports': true, }, ], }, diff --git a/package.json b/package.json index f034d5b..a82513c 100644 --- a/package.json +++ b/package.json @@ -8,17 +8,16 @@ "_sourceId": "f769f6bf-2fe4-41a7-b7ad-f38f57e2d1b9", "_storeId": "2898572b8dca79ebffc4f4584f234c2c", "devDependencies": { + "@antfu/eslint-config": "^2.15.0", "@eslint/eslintrc": "^3.0.2", "@eslint/js": "^9.0.0", - "@typescript-eslint/eslint-plugin": "^6.4.0", + "@typescript-eslint/eslint-plugin": "^6.21.0", "acorn": "^8.11.3", "eslint": "^9.0.0", - "eslint-config-standard-with-typescript": "^43.0.1", - "eslint-plugin-import": "^2.29.1", - "eslint-plugin-n": "^16.6.2", - "eslint-plugin-promise": "^6.1.1", - "globals": "^15.0.0", "prettier": "^3.2.5", "typescript": "^5.4.5" + }, + "dependencies": { + "uuid": "^9.0.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 038bd50..b1a99cb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,72 +1,1540 @@ -lockfileVersion: '6.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true excludeLinksFromLockfile: false -devDependencies: - '@eslint/eslintrc': - specifier: ^3.0.2 - version: 3.0.2 - '@eslint/js': - specifier: ^9.0.0 - version: 9.0.0 - '@typescript-eslint/eslint-plugin': - specifier: ^6.4.0 - version: 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@9.0.0)(typescript@5.4.5) - acorn: - specifier: ^8.11.3 - version: 8.11.3 - eslint: - specifier: ^9.0.0 - version: 9.0.0 - eslint-config-standard-with-typescript: - specifier: ^43.0.1 - version: 43.0.1(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@9.0.0)(typescript@5.4.5) - eslint-plugin-import: - specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@9.0.0) - eslint-plugin-n: - specifier: ^16.6.2 - version: 16.6.2(eslint@9.0.0) - eslint-plugin-promise: - specifier: ^6.1.1 - version: 6.1.1(eslint@9.0.0) - globals: - specifier: ^15.0.0 - version: 15.0.0 - prettier: - specifier: ^3.2.5 - version: 3.2.5 - typescript: - specifier: ^5.4.5 - version: 5.4.5 +importers: + + .: + dependencies: + uuid: + specifier: ^9.0.1 + version: 9.0.1 + devDependencies: + '@antfu/eslint-config': + specifier: ^2.15.0 + version: 2.15.0(@vue/compiler-sfc@3.4.23)(eslint@9.0.0)(typescript@5.4.5) + '@eslint/eslintrc': + specifier: ^3.0.2 + version: 3.0.2 + '@eslint/js': + specifier: ^9.0.0 + version: 9.0.0 + '@typescript-eslint/eslint-plugin': + specifier: ^6.21.0 + version: 6.21.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5) + acorn: + specifier: ^8.11.3 + version: 8.11.3 + eslint: + specifier: ^9.0.0 + version: 9.0.0 + prettier: + specifier: ^3.2.5 + version: 3.2.5 + typescript: + specifier: ^5.4.5 + version: 5.4.5 packages: - /@aashutoshrathi/word-wrap@1.2.6: + '@aashutoshrathi/word-wrap@1.2.6': resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} - dev: true - /@eslint-community/eslint-utils@4.4.0(eslint@9.0.0): + '@antfu/eslint-config@2.15.0': + resolution: {integrity: sha512-qoqw+0N8bqz0vBIigGJamaIf1LdzXcmCDuleygJAF3EtACLieKyIMvpOdc2TU9AnuPbMBFCkN40340UWRChELw==} + hasBin: true + peerDependencies: + '@eslint-react/eslint-plugin': ^1.5.8 + '@unocss/eslint-plugin': '>=0.50.0' + astro-eslint-parser: ^0.16.3 + eslint: '>=8.40.0' + eslint-plugin-astro: ^0.31.4 + eslint-plugin-format: '>=0.1.0' + eslint-plugin-react-hooks: ^4.6.0 + eslint-plugin-react-refresh: ^0.4.4 + eslint-plugin-solid: ^0.13.2 + eslint-plugin-svelte: '>=2.35.1' + prettier-plugin-astro: ^0.13.0 + prettier-plugin-slidev: ^1.0.5 + svelte-eslint-parser: ^0.33.1 + peerDependenciesMeta: + '@eslint-react/eslint-plugin': + optional: true + '@unocss/eslint-plugin': + optional: true + astro-eslint-parser: + optional: true + eslint-plugin-astro: + optional: true + eslint-plugin-format: + optional: true + eslint-plugin-react-hooks: + optional: true + eslint-plugin-react-refresh: + optional: true + eslint-plugin-solid: + optional: true + eslint-plugin-svelte: + optional: true + prettier-plugin-astro: + optional: true + prettier-plugin-slidev: + optional: true + svelte-eslint-parser: + optional: true + + '@antfu/install-pkg@0.3.2': + resolution: {integrity: sha512-FFYqME8+UHlPnRlX/vn+8cTD4Wo/nG/lzRxpABs3XANBmdJdNImVz3QvjNAE/W3PSCNbG387FOz8o5WelnWOlg==} + + '@babel/code-frame@7.24.2': + resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-string-parser@7.24.1': + resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} + engines: {node: '>=6.9.0'} + + '@babel/helper-validator-identifier@7.22.20': + resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} + engines: {node: '>=6.9.0'} + + '@babel/highlight@7.24.2': + resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} + engines: {node: '>=6.9.0'} + + '@babel/parser@7.24.4': + resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==} + engines: {node: '>=6.0.0'} + hasBin: true + + '@babel/types@7.24.0': + resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} + engines: {node: '>=6.9.0'} + + '@clack/core@0.3.4': + resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==} + + '@clack/prompts@0.7.0': + resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} + bundledDependencies: + - is-unicode-supported + + '@es-joy/jsdoccomment@0.42.0': + resolution: {integrity: sha512-R1w57YlVA6+YE01wch3GPYn6bCsrOV3YW/5oGGE2tmX6JcL9Nr+b5IikrjMPF+v9CV3ay+obImEdsDhovhJrzw==} + engines: {node: '>=16'} + + '@eslint-community/eslint-utils@4.4.0': resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + + '@eslint-community/regexpp@4.10.0': + resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} + engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} + + '@eslint/eslintrc@2.1.4': + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + '@eslint/eslintrc@3.0.2': + resolution: {integrity: sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@eslint/js@9.0.0': + resolution: {integrity: sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + '@humanwhocodes/config-array@0.12.3': + resolution: {integrity: sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==} + engines: {node: '>=10.10.0'} + + '@humanwhocodes/module-importer@1.0.1': + resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} + engines: {node: '>=12.22'} + + '@humanwhocodes/object-schema@2.0.3': + resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} + + '@jridgewell/sourcemap-codec@1.4.15': + resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + + '@nodelib/fs.scandir@2.1.5': + resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} + engines: {node: '>= 8'} + + '@nodelib/fs.stat@2.0.5': + resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} + engines: {node: '>= 8'} + + '@nodelib/fs.walk@1.2.8': + resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} + engines: {node: '>= 8'} + + '@stylistic/eslint-plugin-js@1.7.2': + resolution: {integrity: sha512-ZYX7C5p7zlHbACwFLU+lISVh6tdcRP/++PWegh2Sy0UgMT5kU0XkPa2tKWEtJYzZmPhJxu9LxbnWcnE/tTwSDQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: '>=8.40.0' + + '@stylistic/eslint-plugin-jsx@1.7.2': + resolution: {integrity: sha512-lNZR5PR0HLJPs+kY0y8fy6KroKlYqA5PwsYWpVYWzqZWiL5jgAeUo4s9yLFYjJjzildJ5MsTVMy/xP81Qz6GXg==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: '>=8.40.0' + + '@stylistic/eslint-plugin-plus@1.7.2': + resolution: {integrity: sha512-luUfRVbBVtt0+/FNt8/76BANJEzb/nHWasHD7UUjyMrch2U9xUKpObrkTCzqBuisKek+uFupwGjqXqDP07+fQw==} + peerDependencies: + eslint: '*' + + '@stylistic/eslint-plugin-ts@1.7.2': + resolution: {integrity: sha512-szX89YPocwCe4T0eT3alj7MwEzDHt5+B+kb/vQfSSLIjI9CGgoWrgj50zU8PtaDctTh4ZieFBzU/lRmkSUo0RQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: '>=8.40.0' + + '@stylistic/eslint-plugin@1.7.2': + resolution: {integrity: sha512-TesaPR4AOCeD4unwu9gZCdTe8SsUpykriICuwXV8GFBgESuVbfVp+S8g6xTWe9ntVR803bNMtnr2UhxHW0iFqg==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: '>=8.40.0' + + '@types/eslint@8.56.9': + resolution: {integrity: sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg==} + + '@types/estree@1.0.5': + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + + '@types/json-schema@7.0.15': + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + + '@types/mdast@3.0.15': + resolution: {integrity: sha512-LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ==} + + '@types/normalize-package-data@2.4.4': + resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} + + '@types/semver@7.5.8': + resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} + + '@types/unist@2.0.10': + resolution: {integrity: sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==} + + '@typescript-eslint/eslint-plugin@6.21.0': + resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/eslint-plugin@7.7.0': + resolution: {integrity: sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + '@typescript-eslint/parser': ^7.0.0 + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/parser@7.7.0': + resolution: {integrity: sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/scope-manager@6.21.0': + resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} + engines: {node: ^16.0.0 || >=18.0.0} + + '@typescript-eslint/scope-manager@7.7.0': + resolution: {integrity: sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==} + engines: {node: ^18.18.0 || >=20.0.0} + + '@typescript-eslint/type-utils@6.21.0': + resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/type-utils@7.7.0': + resolution: {integrity: sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/types@6.21.0': + resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} + engines: {node: ^16.0.0 || >=18.0.0} + + '@typescript-eslint/types@7.7.0': + resolution: {integrity: sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==} + engines: {node: ^18.18.0 || >=20.0.0} + + '@typescript-eslint/typescript-estree@6.21.0': + resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/typescript-estree@7.7.0': + resolution: {integrity: sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + + '@typescript-eslint/utils@6.21.0': + resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + + '@typescript-eslint/utils@7.7.0': + resolution: {integrity: sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==} + engines: {node: ^18.18.0 || >=20.0.0} + peerDependencies: + eslint: ^8.56.0 + + '@typescript-eslint/visitor-keys@6.21.0': + resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} + engines: {node: ^16.0.0 || >=18.0.0} + + '@typescript-eslint/visitor-keys@7.7.0': + resolution: {integrity: sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==} + engines: {node: ^18.18.0 || >=20.0.0} + + '@vue/compiler-core@3.4.23': + resolution: {integrity: sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==} + + '@vue/compiler-dom@3.4.23': + resolution: {integrity: sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==} + + '@vue/compiler-sfc@3.4.23': + resolution: {integrity: sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==} + + '@vue/compiler-ssr@3.4.23': + resolution: {integrity: sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==} + + '@vue/shared@3.4.23': + resolution: {integrity: sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==} + + acorn-jsx@5.3.2: + resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} + peerDependencies: + acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + + acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + engines: {node: '>=0.4.0'} + hasBin: true + + ajv@6.12.6: + resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + + ansi-regex@5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} + engines: {node: '>=8'} + + ansi-styles@3.2.1: + resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} + engines: {node: '>=4'} + + ansi-styles@4.3.0: + resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} + engines: {node: '>=8'} + + are-docs-informative@0.0.2: + resolution: {integrity: sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==} + engines: {node: '>=14'} + + argparse@2.0.1: + resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + + array-union@2.1.0: + resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} + engines: {node: '>=8'} + + balanced-match@1.0.2: + resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + + boolbase@1.0.0: + resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} + + brace-expansion@1.1.11: + resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} + + brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + + braces@3.0.2: + resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} + engines: {node: '>=8'} + + browserslist@4.23.0: + resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + + builtin-modules@3.3.0: + resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} + engines: {node: '>=6'} + + callsites@3.1.0: + resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} + engines: {node: '>=6'} + + caniuse-lite@1.0.30001611: + resolution: {integrity: sha512-19NuN1/3PjA3QI8Eki55N8my4LzfkMCRLgCVfrl/slbSAchQfV0+GwjPrK3rq37As4UCLlM/DHajbKkAqbv92Q==} + + chalk@2.4.2: + resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} + engines: {node: '>=4'} + + chalk@4.1.2: + resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} + engines: {node: '>=10'} + + character-entities-legacy@1.1.4: + resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==} + + character-entities@1.2.4: + resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==} + + character-reference-invalid@1.1.4: + resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==} + + ci-info@4.0.0: + resolution: {integrity: sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==} + engines: {node: '>=8'} + + clean-regexp@1.0.0: + resolution: {integrity: sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==} + engines: {node: '>=4'} + + cliui@8.0.1: + resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} + engines: {node: '>=12'} + + color-convert@1.9.3: + resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} + + color-convert@2.0.1: + resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} + engines: {node: '>=7.0.0'} + + color-name@1.1.3: + resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} + + color-name@1.1.4: + resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + + comment-parser@1.4.1: + resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==} + engines: {node: '>= 12.0.0'} + + concat-map@0.0.1: + resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + + core-js-compat@3.37.0: + resolution: {integrity: sha512-vYq4L+T8aS5UuFg4UwDhc7YNRWVeVZwltad9C/jV3R2LgVOpS9BDr7l/WL6BN0dbV3k1XejPTHqqEzJgsa0frA==} + + cross-spawn@7.0.3: + resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} + engines: {node: '>= 8'} + + cssesc@3.0.0: + resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==} + engines: {node: '>=4'} + hasBin: true + + debug@3.2.7: + resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + + debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + + deep-is@0.1.4: + resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} + + dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + + doctrine@3.0.0: + resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} + engines: {node: '>=6.0.0'} + + electron-to-chromium@1.4.740: + resolution: {integrity: sha512-Yvg5i+iyv7Xm18BRdVPVm8lc7kgxM3r6iwqCH2zB7QZy1kZRNmd0Zqm0zcD9XoFREE5/5rwIuIAOT+/mzGcnZg==} + + emoji-regex@8.0.0: + resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} + + enhanced-resolve@5.16.0: + resolution: {integrity: sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==} + engines: {node: '>=10.13.0'} + + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + + error-ex@1.3.2: + resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} + + escalade@3.1.2: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} + engines: {node: '>=6'} + + escape-string-regexp@1.0.5: + resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} + engines: {node: '>=0.8.0'} + + escape-string-regexp@4.0.0: + resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} + engines: {node: '>=10'} + + eslint-compat-utils@0.5.0: + resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==} + engines: {node: '>=12'} + peerDependencies: + eslint: '>=6.0.0' + + eslint-config-flat-gitignore@0.1.5: + resolution: {integrity: sha512-hEZLwuZjDBGDERA49c2q7vxc8sCGv8EdBp6PQYzGOMcHIgrfG9YOM6s/4jx24zhD+wnK9AI8mgN5RxSss5nClQ==} + + eslint-flat-config-utils@0.2.3: + resolution: {integrity: sha512-tfrMNXZfuN4q7sFi1Cr//BN3qdI7c8fLJhbshlp8l9PZIqZ7eVeeyd2Regtu/P9kjOlv18lRlBALzsZaF7ByUg==} + + eslint-import-resolver-node@0.3.9: + resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} + + eslint-merge-processors@0.1.0: + resolution: {integrity: sha512-IvRXXtEajLeyssvW4wJcZ2etxkR9mUf4zpNwgI+m/Uac9RfXHskuJefkHUcawVzePnd6xp24enp5jfgdHzjRdQ==} + peerDependencies: + eslint: '*' + + eslint-plugin-antfu@2.1.2: + resolution: {integrity: sha512-s7ZTOM3uq0iqpp6gF0UEotnvup7f2PHBUftCytLZX0+6C9j9KadKZQh6bVVngAyFgsmeD9+gcBopOYLClb2oDg==} + peerDependencies: + eslint: '*' + + eslint-plugin-es-x@7.6.0: + resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + eslint: '>=8' + + eslint-plugin-eslint-comments@3.2.0: + resolution: {integrity: sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ==} + engines: {node: '>=6.5.0'} + peerDependencies: + eslint: '>=4.19.1' + + eslint-plugin-import-x@0.5.0: + resolution: {integrity: sha512-C7R8Z4IzxmsoOPMtSzwuOBW5FH6iRlxHR6iTks+MzVlrk3r3TUxokkWTx3ypdj9nGOEP+CG/5e6ebZzHbxgbbQ==} + engines: {node: '>=16'} + peerDependencies: + eslint: ^8.56.0 || ^9.0.0-0 + + eslint-plugin-jsdoc@48.2.3: + resolution: {integrity: sha512-r9DMAmFs66VNvNqRLLjHejdnJtILrt3xGi+Qx0op0oRfFGVpOR1Hb3BC++MacseHx93d8SKYPhyrC9BS7Os2QA==} + engines: {node: '>=18'} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 + + eslint-plugin-jsonc@2.15.1: + resolution: {integrity: sha512-PVFrqIJa8BbM/e828RSn0SwB/Z5ye+2LDuy2XqG6AymNgPsfApRRcznsbxP7VrjdLEU4Nb+g9n/d6opyp0jp9A==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + + eslint-plugin-markdown@4.0.1: + resolution: {integrity: sha512-5/MnGvYU0i8MbHH5cg8S+Vl3DL+bqRNYshk1xUO86DilNBaxtTkhH+5FD0/yO03AmlI6+lfNFdk2yOw72EPzpA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: '>=8' + + eslint-plugin-n@17.2.1: + resolution: {integrity: sha512-uW1+df2bo06kR7ix6nB614RUlvjRPrYxlaX832O6e1MCJp4V7YozEdvMgCYuvn4ltnjPu1FVYhQ2KRrmTNoJfg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: '>=8.23.0' + + eslint-plugin-no-only-tests@3.1.0: + resolution: {integrity: sha512-Lf4YW/bL6Un1R6A76pRZyE1dl1vr31G/ev8UzIc/geCgFWyrKil8hVjYqWVKGB/UIGmb6Slzs9T0wNezdSVegw==} + engines: {node: '>=5.0.0'} + + eslint-plugin-perfectionist@2.9.0: + resolution: {integrity: sha512-ipFtDrqtF99qVVo+FE1fo6aHyLLp7hg6PNGfzY5KxQjcl0XCbyEFvjtR1NfkHDTN9rdFeEDxg59LLOv3VOAHAw==} + peerDependencies: + astro-eslint-parser: ^0.16.0 + eslint: '>=8.0.0' + svelte: '>=3.0.0' + svelte-eslint-parser: ^0.33.0 + vue-eslint-parser: '>=9.0.0' + peerDependenciesMeta: + astro-eslint-parser: + optional: true + svelte: + optional: true + svelte-eslint-parser: + optional: true + vue-eslint-parser: + optional: true + + eslint-plugin-toml@0.11.0: + resolution: {integrity: sha512-sau+YvPU4fWTjB+qtBt3n8WS87aoDCs+BVbSUAemGaIsRNbvR9uEk+Tt892iLHTGvp/DPWYoCX4/8DoyAbB+sQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + + eslint-plugin-unicorn@52.0.0: + resolution: {integrity: sha512-1Yzm7/m+0R4djH0tjDjfVei/ju2w3AzUGjG6q8JnuNIL5xIwsflyCooW5sfBvQp2pMYQFSWWCFONsjCax1EHng==} + engines: {node: '>=16'} + peerDependencies: + eslint: '>=8.56.0' + + eslint-plugin-unused-imports@3.1.0: + resolution: {integrity: sha512-9l1YFCzXKkw1qtAru1RWUtG2EVDZY0a0eChKXcL+EZ5jitG7qxdctu4RnvhOJHv4xfmUf7h+JJPINlVpGhZMrw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + '@typescript-eslint/eslint-plugin': 6 - 7 + eslint: '8' + peerDependenciesMeta: + '@typescript-eslint/eslint-plugin': + optional: true + + eslint-plugin-vitest@0.5.3: + resolution: {integrity: sha512-D0iu6ppP6FmNSZP4cdhEXqyI+fuW6JwwWdECRrNymd1jiVgUmDgSvtryytonNxHQQWhGNmZM3V/qvpXttH1rRQ==} + engines: {node: ^18.0.0 || >= 20.0.0} + peerDependencies: + '@typescript-eslint/eslint-plugin': '*' + eslint: ^8.57.0 || ^9.0.0 + vitest: '*' + peerDependenciesMeta: + '@typescript-eslint/eslint-plugin': + optional: true + vitest: + optional: true + + eslint-plugin-vue@9.25.0: + resolution: {integrity: sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 + + eslint-plugin-yml@1.14.0: + resolution: {integrity: sha512-ESUpgYPOcAYQO9czugcX5OqRvn/ydDVwGCPXY4YjPqc09rHaUVUA6IE6HLQys4rXk/S+qx3EwTd1wHCwam/OWQ==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + + eslint-processor-vue-blocks@0.1.2: + resolution: {integrity: sha512-PfpJ4uKHnqeL/fXUnzYkOax3aIenlwewXRX8jFinA1a2yCFnLgMuiH3xvCgvHHUlV2xJWQHbCTdiJWGwb3NqpQ==} + peerDependencies: + '@vue/compiler-sfc': ^3.3.0 + eslint: ^8.50.0 || ^9.0.0 + + eslint-rule-composer@0.3.0: + resolution: {integrity: sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==} + engines: {node: '>=4.0.0'} + + eslint-scope@7.2.2: + resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + eslint-scope@8.0.1: + resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + eslint-visitor-keys@3.4.3: + resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + eslint-visitor-keys@4.0.0: + resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + eslint@9.0.0: + resolution: {integrity: sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + hasBin: true + + espree@10.0.1: + resolution: {integrity: sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + + espree@9.6.1: + resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + esquery@1.5.0: + resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} + engines: {node: '>=0.10'} + + esrecurse@4.3.0: + resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} + engines: {node: '>=4.0'} + + estraverse@5.3.0: + resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} + engines: {node: '>=4.0'} + + estree-walker@2.0.2: + resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + + esutils@2.0.3: + resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} + engines: {node: '>=0.10.0'} + + execa@8.0.1: + resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} + engines: {node: '>=16.17'} + + fast-deep-equal@3.1.3: + resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} + + fast-glob@3.3.2: + resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} + engines: {node: '>=8.6.0'} + + fast-json-stable-stringify@2.1.0: + resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} + + fast-levenshtein@2.0.6: + resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} + + fastq@1.17.1: + resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + + file-entry-cache@8.0.0: + resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} + engines: {node: '>=16.0.0'} + + fill-range@7.0.1: + resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} + engines: {node: '>=8'} + + find-up@4.1.0: + resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} + engines: {node: '>=8'} + + find-up@5.0.0: + resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} + engines: {node: '>=10'} + + find-up@7.0.0: + resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==} + engines: {node: '>=18'} + + flat-cache@4.0.1: + resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} + engines: {node: '>=16'} + + flatted@3.3.1: + resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} + + function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} + + get-caller-file@2.0.5: + resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} + engines: {node: 6.* || 8.* || >= 10.*} + + get-stream@8.0.1: + resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} + engines: {node: '>=16'} + + get-tsconfig@4.7.3: + resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} + + glob-parent@5.1.2: + resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} + engines: {node: '>= 6'} + + glob-parent@6.0.2: + resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} + engines: {node: '>=10.13.0'} + + globals@13.24.0: + resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} + engines: {node: '>=8'} + + globals@14.0.0: + resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} + engines: {node: '>=18'} + + globals@15.0.0: + resolution: {integrity: sha512-m/C/yR4mjO6pXDTm9/R/SpYTAIyaUB4EOzcaaMEl7mds7Mshct9GfejiJNQGjHHbdMPey13Kpu4TMbYi9ex1pw==} + engines: {node: '>=18'} + + globby@11.1.0: + resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} + engines: {node: '>=10'} + + graceful-fs@4.2.11: + resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} + + graphemer@1.4.0: + resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} + + has-flag@3.0.0: + resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} + engines: {node: '>=4'} + + has-flag@4.0.0: + resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} + engines: {node: '>=8'} + + hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} + engines: {node: '>= 0.4'} + + hosted-git-info@2.8.9: + resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} + + human-signals@5.0.0: + resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} + engines: {node: '>=16.17.0'} + + ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} + engines: {node: '>= 4'} + + import-fresh@3.3.0: + resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} + engines: {node: '>=6'} + + imurmurhash@0.1.4: + resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} + engines: {node: '>=0.8.19'} + + indent-string@4.0.0: + resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} + engines: {node: '>=8'} + + is-alphabetical@1.0.4: + resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==} + + is-alphanumerical@1.0.4: + resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==} + + is-arrayish@0.2.1: + resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} + + is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + + is-core-module@2.13.1: + resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} + + is-decimal@1.0.4: + resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==} + + is-extglob@2.1.1: + resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} + engines: {node: '>=0.10.0'} + + is-fullwidth-code-point@3.0.0: + resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} + engines: {node: '>=8'} + + is-glob@4.0.3: + resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} + engines: {node: '>=0.10.0'} + + is-hexadecimal@1.0.4: + resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==} + + is-number@7.0.0: + resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} + engines: {node: '>=0.12.0'} + + is-path-inside@3.0.3: + resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} + engines: {node: '>=8'} + + is-stream@3.0.0: + resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + isexe@2.0.0: + resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + + js-tokens@4.0.0: + resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + + js-yaml@4.1.0: + resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} + hasBin: true + + jsdoc-type-pratt-parser@4.0.0: + resolution: {integrity: sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==} + engines: {node: '>=12.0.0'} + + jsesc@0.5.0: + resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} + hasBin: true + + jsesc@3.0.2: + resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + engines: {node: '>=6'} + hasBin: true + + json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + + json-parse-even-better-errors@2.3.1: + resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + + json-schema-traverse@0.4.1: + resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} + + json-stable-stringify-without-jsonify@1.0.1: + resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} + + jsonc-eslint-parser@2.4.0: + resolution: {integrity: sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + jsonc-parser@3.2.1: + resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} + + keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + + levn@0.4.1: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + + lines-and-columns@1.2.4: + resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + + local-pkg@0.5.0: + resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} + engines: {node: '>=14'} + + locate-path@5.0.0: + resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} + engines: {node: '>=8'} + + locate-path@6.0.0: + resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} + engines: {node: '>=10'} + + locate-path@7.2.0: + resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + lodash.merge@4.6.2: + resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} + + lodash@4.17.21: + resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + + lru-cache@6.0.0: + resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} + engines: {node: '>=10'} + + magic-string@0.30.10: + resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + + mdast-util-from-markdown@0.8.5: + resolution: {integrity: sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==} + + mdast-util-to-string@2.0.0: + resolution: {integrity: sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==} + + merge-stream@2.0.0: + resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} + + merge2@1.4.1: + resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} + engines: {node: '>= 8'} + + micromark@2.11.4: + resolution: {integrity: sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==} + + micromatch@4.0.5: + resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} + engines: {node: '>=8.6'} + + mimic-fn@4.0.0: + resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} + engines: {node: '>=12'} + + min-indent@1.0.1: + resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} + engines: {node: '>=4'} + + minimatch@3.1.2: + resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} + + minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + + minimatch@9.0.4: + resolution: {integrity: sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==} + engines: {node: '>=16 || 14 >=14.17'} + + mlly@1.6.1: + resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==} + + ms@2.1.2: + resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + + ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + + nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} + hasBin: true + + natural-compare-lite@1.4.0: + resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} + + natural-compare@1.4.0: + resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + + node-releases@2.0.14: + resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==} + + normalize-package-data@2.5.0: + resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} + + npm-run-path@5.3.0: + resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + nth-check@2.1.1: + resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} + + onetime@6.0.0: + resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} + engines: {node: '>=12'} + + optionator@0.9.3: + resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} + engines: {node: '>= 0.8.0'} + + p-limit@2.3.0: + resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} + engines: {node: '>=6'} + + p-limit@3.1.0: + resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} + engines: {node: '>=10'} + + p-limit@4.0.0: + resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + p-locate@4.1.0: + resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} + engines: {node: '>=8'} + + p-locate@5.0.0: + resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} + engines: {node: '>=10'} + + p-locate@6.0.0: + resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + p-try@2.2.0: + resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} + engines: {node: '>=6'} + + parent-module@1.0.1: + resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} + engines: {node: '>=6'} + + parse-entities@2.0.0: + resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==} + + parse-gitignore@2.0.0: + resolution: {integrity: sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==} + engines: {node: '>=14'} + + parse-json@5.2.0: + resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} + engines: {node: '>=8'} + + path-exists@4.0.0: + resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} + engines: {node: '>=8'} + + path-exists@5.0.0: + resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + path-key@3.1.1: + resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} + engines: {node: '>=8'} + + path-key@4.0.0: + resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} + engines: {node: '>=12'} + + path-parse@1.0.7: + resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + + path-type@4.0.0: + resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} + engines: {node: '>=8'} + + pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + + picocolors@1.0.0: + resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + + picomatch@2.3.1: + resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} + engines: {node: '>=8.6'} + + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + engines: {node: '>=12'} + + pkg-types@1.0.3: + resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} + + pluralize@8.0.0: + resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==} + engines: {node: '>=4'} + + postcss-selector-parser@6.0.16: + resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==} + engines: {node: '>=4'} + + postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + engines: {node: ^10 || ^12 || >=14} + + prelude-ls@1.2.1: + resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} + engines: {node: '>= 0.8.0'} + + prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + engines: {node: '>=14'} + hasBin: true + + punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} + engines: {node: '>=6'} + + queue-microtask@1.2.3: + resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + + read-pkg-up@7.0.1: + resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} + engines: {node: '>=8'} + + read-pkg@5.2.0: + resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} + engines: {node: '>=8'} + + regexp-tree@0.1.27: + resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==} + hasBin: true + + regjsparser@0.10.0: + resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==} + hasBin: true + + require-directory@2.1.1: + resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} + engines: {node: '>=0.10.0'} + + resolve-from@4.0.0: + resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} + engines: {node: '>=4'} + + resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + + resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + hasBin: true + + reusify@1.0.4: + resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} + engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + + run-parallel@1.2.0: + resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + + semver@5.7.2: + resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} + hasBin: true + + semver@7.6.0: + resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + engines: {node: '>=10'} + hasBin: true + + shebang-command@2.0.0: + resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} + engines: {node: '>=8'} + + shebang-regex@3.0.0: + resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} + engines: {node: '>=8'} + + signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + + sisteransi@1.0.5: + resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} + + slash@3.0.0: + resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} + engines: {node: '>=8'} + + source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + + spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + + spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + + spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + + spdx-expression-parse@4.0.0: + resolution: {integrity: sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==} + + spdx-license-ids@3.0.17: + resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} + + string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + + strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + + strip-final-newline@3.0.0: + resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} + engines: {node: '>=12'} + + strip-indent@3.0.0: + resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} + engines: {node: '>=8'} + + strip-json-comments@3.1.1: + resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} + engines: {node: '>=8'} + + supports-color@5.5.0: + resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} + engines: {node: '>=4'} + + supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + + supports-preserve-symlinks-flag@1.0.0: + resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} + engines: {node: '>= 0.4'} + + synckit@0.6.2: + resolution: {integrity: sha512-Vhf+bUa//YSTYKseDiiEuQmhGCoIF3CVBhunm3r/DQnYiGT4JssmnKQc44BIyOZRK2pKjXXAgbhfmbeoC9CJpA==} + engines: {node: '>=12.20'} + + tapable@2.2.1: + resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} + engines: {node: '>=6'} + + text-table@0.2.0: + resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + + to-fast-properties@2.0.0: + resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} + engines: {node: '>=4'} + + to-regex-range@5.0.1: + resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} + engines: {node: '>=8.0'} + + toml-eslint-parser@0.9.3: + resolution: {integrity: sha512-moYoCvkNUAPCxSW9jmHmRElhm4tVJpHL8ItC/+uYD0EpPSFXbck7yREz9tNdJVTSpHVod8+HoipcpbQ0oE6gsw==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + + ts-api-utils@1.3.0: + resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} + engines: {node: '>=16'} + peerDependencies: + typescript: '>=4.2.0' + + tslib@2.6.2: + resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + + type-check@0.4.0: + resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} + engines: {node: '>= 0.8.0'} + + type-fest@0.20.2: + resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} + engines: {node: '>=10'} + + type-fest@0.6.0: + resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} + engines: {node: '>=8'} + + type-fest@0.8.1: + resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} + engines: {node: '>=8'} + + typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + engines: {node: '>=14.17'} + hasBin: true + + ufo@1.5.3: + resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==} + + unicorn-magic@0.1.0: + resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} + engines: {node: '>=18'} + + unist-util-stringify-position@2.0.3: + resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==} + + update-browserslist-db@1.0.13: + resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + + uri-js@4.4.1: + resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + + util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + + uuid@9.0.1: + resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==} + hasBin: true + + validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + + vue-eslint-parser@9.4.2: + resolution: {integrity: sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==} + engines: {node: ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '>=6.0.0' + + which@2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + + wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + + xml-name-validator@4.0.0: + resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} + engines: {node: '>=12'} + + y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + + yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + + yaml-eslint-parser@1.2.2: + resolution: {integrity: sha512-pEwzfsKbTrB8G3xc/sN7aw1v6A6c/pKxLAkjclnAyo5g5qOh6eL9WGu0o3cSDQZKrTNk4KL4lQSwZW+nBkANEg==} + engines: {node: ^14.17.0 || >=16.0.0} + + yaml@2.4.1: + resolution: {integrity: sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==} + engines: {node: '>= 14'} + hasBin: true + + yargs-parser@21.1.1: + resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} + engines: {node: '>=12'} + + yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + + yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} + engines: {node: '>=10'} + + yocto-queue@1.0.0: + resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} + engines: {node: '>=12.20'} + +snapshots: + + '@aashutoshrathi/word-wrap@1.2.6': {} + + '@antfu/eslint-config@2.15.0(@vue/compiler-sfc@3.4.23)(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@antfu/install-pkg': 0.3.2 + '@clack/prompts': 0.7.0 + '@stylistic/eslint-plugin': 1.7.2(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/eslint-plugin': 7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + eslint: 9.0.0 + eslint-config-flat-gitignore: 0.1.5 + eslint-flat-config-utils: 0.2.3 + eslint-merge-processors: 0.1.0(eslint@9.0.0) + eslint-plugin-antfu: 2.1.2(eslint@9.0.0) + eslint-plugin-eslint-comments: 3.2.0(eslint@9.0.0) + eslint-plugin-import-x: 0.5.0(eslint@9.0.0)(typescript@5.4.5) + eslint-plugin-jsdoc: 48.2.3(eslint@9.0.0) + eslint-plugin-jsonc: 2.15.1(eslint@9.0.0) + eslint-plugin-markdown: 4.0.1(eslint@9.0.0) + eslint-plugin-n: 17.2.1(eslint@9.0.0) + eslint-plugin-no-only-tests: 3.1.0 + eslint-plugin-perfectionist: 2.9.0(eslint@9.0.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.0.0)) + eslint-plugin-toml: 0.11.0(eslint@9.0.0) + eslint-plugin-unicorn: 52.0.0(eslint@9.0.0) + eslint-plugin-unused-imports: 3.1.0(@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0) + eslint-plugin-vitest: 0.5.3(@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5) + eslint-plugin-vue: 9.25.0(eslint@9.0.0) + eslint-plugin-yml: 1.14.0(eslint@9.0.0) + eslint-processor-vue-blocks: 0.1.2(@vue/compiler-sfc@3.4.23)(eslint@9.0.0) + globals: 15.0.0 + jsonc-eslint-parser: 2.4.0 + local-pkg: 0.5.0 + parse-gitignore: 2.0.0 + picocolors: 1.0.0 + toml-eslint-parser: 0.9.3 + vue-eslint-parser: 9.4.2(eslint@9.0.0) + yaml-eslint-parser: 1.2.2 + yargs: 17.7.2 + transitivePeerDependencies: + - '@vue/compiler-sfc' + - supports-color + - svelte + - typescript + - vitest + + '@antfu/install-pkg@0.3.2': + dependencies: + execa: 8.0.1 + + '@babel/code-frame@7.24.2': + dependencies: + '@babel/highlight': 7.24.2 + picocolors: 1.0.0 + + '@babel/helper-string-parser@7.24.1': {} + + '@babel/helper-validator-identifier@7.22.20': {} + + '@babel/highlight@7.24.2': + dependencies: + '@babel/helper-validator-identifier': 7.22.20 + chalk: 2.4.2 + js-tokens: 4.0.0 + picocolors: 1.0.0 + + '@babel/parser@7.24.4': + dependencies: + '@babel/types': 7.24.0 + + '@babel/types@7.24.0': + dependencies: + '@babel/helper-string-parser': 7.24.1 + '@babel/helper-validator-identifier': 7.22.20 + to-fast-properties: 2.0.0 + + '@clack/core@0.3.4': + dependencies: + picocolors: 1.0.0 + sisteransi: 1.0.5 + + '@clack/prompts@0.7.0': + dependencies: + '@clack/core': 0.3.4 + picocolors: 1.0.0 + sisteransi: 1.0.5 + + '@es-joy/jsdoccomment@0.42.0': + dependencies: + comment-parser: 1.4.1 + esquery: 1.5.0 + jsdoc-type-pratt-parser: 4.0.0 + + '@eslint-community/eslint-utils@4.4.0(eslint@9.0.0)': dependencies: eslint: 9.0.0 eslint-visitor-keys: 3.4.3 - dev: true - /@eslint-community/regexpp@4.10.0: - resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} - engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - dev: true + '@eslint-community/regexpp@4.10.0': {} - /@eslint/eslintrc@3.0.2: - resolution: {integrity: sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/eslintrc@2.1.4': + dependencies: + ajv: 6.12.6 + debug: 4.3.4 + espree: 9.6.1 + globals: 13.24.0 + ignore: 5.3.1 + import-fresh: 3.3.0 + js-yaml: 4.1.0 + minimatch: 3.1.2 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + + '@eslint/eslintrc@3.0.2': dependencies: ajv: 6.12.6 debug: 4.3.4 @@ -79,79 +1547,106 @@ packages: strip-json-comments: 3.1.1 transitivePeerDependencies: - supports-color - dev: true - /@eslint/js@9.0.0: - resolution: {integrity: sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - dev: true + '@eslint/js@9.0.0': {} - /@humanwhocodes/config-array@0.12.3: - resolution: {integrity: sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==} - engines: {node: '>=10.10.0'} + '@humanwhocodes/config-array@0.12.3': dependencies: '@humanwhocodes/object-schema': 2.0.3 debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color - dev: true - /@humanwhocodes/module-importer@1.0.1: - resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} - engines: {node: '>=12.22'} - dev: true + '@humanwhocodes/module-importer@1.0.1': {} - /@humanwhocodes/object-schema@2.0.3: - resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} - dev: true + '@humanwhocodes/object-schema@2.0.3': {} - /@nodelib/fs.scandir@2.1.5: - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} + '@jridgewell/sourcemap-codec@1.4.15': {} + + '@nodelib/fs.scandir@2.1.5': dependencies: '@nodelib/fs.stat': 2.0.5 run-parallel: 1.2.0 - dev: true - /@nodelib/fs.stat@2.0.5: - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - dev: true + '@nodelib/fs.stat@2.0.5': {} - /@nodelib/fs.walk@1.2.8: - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} + '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - dev: true - /@types/json-schema@7.0.15: - resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - dev: true + '@stylistic/eslint-plugin-js@1.7.2(eslint@9.0.0)': + dependencies: + '@types/eslint': 8.56.9 + acorn: 8.11.3 + escape-string-regexp: 4.0.0 + eslint: 9.0.0 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 - /@types/json5@0.0.29: - resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} - dev: true + '@stylistic/eslint-plugin-jsx@1.7.2(eslint@9.0.0)': + dependencies: + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.0.0) + '@types/eslint': 8.56.9 + eslint: 9.0.0 + estraverse: 5.3.0 + picomatch: 4.0.2 - /@types/semver@7.5.8: - resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - dev: true + '@stylistic/eslint-plugin-plus@1.7.2(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@types/eslint': 8.56.9 + '@typescript-eslint/utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) + eslint: 9.0.0 + transitivePeerDependencies: + - supports-color + - typescript - /@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0)(eslint@9.0.0)(typescript@5.4.5): - resolution: {integrity: sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@stylistic/eslint-plugin-ts@1.7.2(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.0.0) + '@types/eslint': 8.56.9 + '@typescript-eslint/utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) + eslint: 9.0.0 + transitivePeerDependencies: + - supports-color + - typescript + + '@stylistic/eslint-plugin@1.7.2(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@stylistic/eslint-plugin-js': 1.7.2(eslint@9.0.0) + '@stylistic/eslint-plugin-jsx': 1.7.2(eslint@9.0.0) + '@stylistic/eslint-plugin-plus': 1.7.2(eslint@9.0.0)(typescript@5.4.5) + '@stylistic/eslint-plugin-ts': 1.7.2(eslint@9.0.0)(typescript@5.4.5) + '@types/eslint': 8.56.9 + eslint: 9.0.0 + transitivePeerDependencies: + - supports-color + - typescript + + '@types/eslint@8.56.9': + dependencies: + '@types/estree': 1.0.5 + '@types/json-schema': 7.0.15 + + '@types/estree@1.0.5': {} + + '@types/json-schema@7.0.15': {} + + '@types/mdast@3.0.15': + dependencies: + '@types/unist': 2.0.10 + + '@types/normalize-package-data@2.4.4': {} + + '@types/semver@7.5.8': {} + + '@types/unist@2.0.10': {} + + '@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5)': dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.21.0(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.7.0(eslint@9.0.0)(typescript@5.4.5) '@typescript-eslint/scope-manager': 6.21.0 '@typescript-eslint/type-utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) '@typescript-eslint/utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) @@ -163,73 +1658,83 @@ packages: natural-compare: 1.4.0 semver: 7.6.0 ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/parser@6.21.0(eslint@9.0.0)(typescript@5.4.5): - resolution: {integrity: sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5)': dependencies: - '@typescript-eslint/scope-manager': 6.21.0 - '@typescript-eslint/types': 6.21.0 - '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5) - '@typescript-eslint/visitor-keys': 6.21.0 + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/scope-manager': 7.7.0 + '@typescript-eslint/type-utils': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/utils': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.7.0 debug: 4.3.4 eslint: 9.0.0 + graphemer: 1.4.0 + ignore: 5.3.1 + natural-compare: 1.4.0 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/scope-manager@6.21.0: - resolution: {integrity: sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==} - engines: {node: ^16.0.0 || >=18.0.0} + '@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@typescript-eslint/scope-manager': 7.7.0 + '@typescript-eslint/types': 7.7.0 + '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) + '@typescript-eslint/visitor-keys': 7.7.0 + debug: 4.3.4 + eslint: 9.0.0 + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/scope-manager@6.21.0': dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - dev: true - /@typescript-eslint/type-utils@6.21.0(eslint@9.0.0)(typescript@5.4.5): - resolution: {integrity: sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@typescript-eslint/scope-manager@7.7.0': + dependencies: + '@typescript-eslint/types': 7.7.0 + '@typescript-eslint/visitor-keys': 7.7.0 + + '@typescript-eslint/type-utils@6.21.0(eslint@9.0.0)(typescript@5.4.5)': dependencies: '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.4.5) '@typescript-eslint/utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) debug: 4.3.4 eslint: 9.0.0 ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/types@6.21.0: - resolution: {integrity: sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==} - engines: {node: ^16.0.0 || >=18.0.0} - dev: true + '@typescript-eslint/type-utils@7.7.0(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) + '@typescript-eslint/utils': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + debug: 4.3.4 + eslint: 9.0.0 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color - /@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.5): - resolution: {integrity: sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + '@typescript-eslint/types@6.21.0': {} + + '@typescript-eslint/types@7.7.0': {} + + '@typescript-eslint/typescript-estree@6.21.0(typescript@5.4.5)': dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 @@ -239,16 +1744,27 @@ packages: minimatch: 9.0.3 semver: 7.6.0 ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: typescript: 5.4.5 transitivePeerDependencies: - supports-color - dev: true - /@typescript-eslint/utils@6.21.0(eslint@9.0.0)(typescript@5.4.5): - resolution: {integrity: sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + '@typescript-eslint/typescript-estree@7.7.0(typescript@5.4.5)': + dependencies: + '@typescript-eslint/types': 7.7.0 + '@typescript-eslint/visitor-keys': 7.7.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.4 + semver: 7.6.0 + ts-api-utils: 1.3.0(typescript@5.4.5) + optionalDependencies: + typescript: 5.4.5 + transitivePeerDependencies: + - supports-color + + '@typescript-eslint/utils@6.21.0(eslint@9.0.0)(typescript@5.4.5)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) '@types/json-schema': 7.0.15 @@ -261,587 +1777,432 @@ packages: transitivePeerDependencies: - supports-color - typescript - dev: true - /@typescript-eslint/visitor-keys@6.21.0: - resolution: {integrity: sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==} - engines: {node: ^16.0.0 || >=18.0.0} + '@typescript-eslint/utils@7.7.0(eslint@9.0.0)(typescript@5.4.5)': + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) + '@types/json-schema': 7.0.15 + '@types/semver': 7.5.8 + '@typescript-eslint/scope-manager': 7.7.0 + '@typescript-eslint/types': 7.7.0 + '@typescript-eslint/typescript-estree': 7.7.0(typescript@5.4.5) + eslint: 9.0.0 + semver: 7.6.0 + transitivePeerDependencies: + - supports-color + - typescript + + '@typescript-eslint/visitor-keys@6.21.0': dependencies: '@typescript-eslint/types': 6.21.0 eslint-visitor-keys: 3.4.3 - dev: true - /acorn-jsx@5.3.2(acorn@8.11.3): - resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} - peerDependencies: - acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 + '@typescript-eslint/visitor-keys@7.7.0': + dependencies: + '@typescript-eslint/types': 7.7.0 + eslint-visitor-keys: 3.4.3 + + '@vue/compiler-core@3.4.23': + dependencies: + '@babel/parser': 7.24.4 + '@vue/shared': 3.4.23 + entities: 4.5.0 + estree-walker: 2.0.2 + source-map-js: 1.2.0 + + '@vue/compiler-dom@3.4.23': + dependencies: + '@vue/compiler-core': 3.4.23 + '@vue/shared': 3.4.23 + + '@vue/compiler-sfc@3.4.23': + dependencies: + '@babel/parser': 7.24.4 + '@vue/compiler-core': 3.4.23 + '@vue/compiler-dom': 3.4.23 + '@vue/compiler-ssr': 3.4.23 + '@vue/shared': 3.4.23 + estree-walker: 2.0.2 + magic-string: 0.30.10 + postcss: 8.4.38 + source-map-js: 1.2.0 + + '@vue/compiler-ssr@3.4.23': + dependencies: + '@vue/compiler-dom': 3.4.23 + '@vue/shared': 3.4.23 + + '@vue/shared@3.4.23': {} + + acorn-jsx@5.3.2(acorn@8.11.3): dependencies: acorn: 8.11.3 - dev: true - /acorn@8.11.3: - resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} - engines: {node: '>=0.4.0'} - hasBin: true - dev: true + acorn@8.11.3: {} - /ajv@6.12.6: - resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} + ajv@6.12.6: dependencies: fast-deep-equal: 3.1.3 fast-json-stable-stringify: 2.1.0 json-schema-traverse: 0.4.1 uri-js: 4.4.1 - dev: true - /ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - dev: true + ansi-regex@5.0.1: {} - /ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} + ansi-styles@3.2.1: + dependencies: + color-convert: 1.9.3 + + ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 - dev: true - /argparse@2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - dev: true + are-docs-informative@0.0.2: {} - /array-buffer-byte-length@1.0.1: - resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - is-array-buffer: 3.0.4 - dev: true + argparse@2.0.1: {} - /array-includes@3.1.8: - resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-object-atoms: 1.0.0 - get-intrinsic: 1.2.4 - is-string: 1.0.7 - dev: true + array-union@2.1.0: {} - /array-union@2.1.0: - resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} - engines: {node: '>=8'} - dev: true + balanced-match@1.0.2: {} - /array.prototype.findlastindex@1.2.5: - resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-errors: 1.3.0 - es-object-atoms: 1.0.0 - es-shim-unscopables: 1.0.2 - dev: true + boolbase@1.0.0: {} - /array.prototype.flat@1.3.2: - resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-shim-unscopables: 1.0.2 - dev: true - - /array.prototype.flatmap@1.3.2: - resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-shim-unscopables: 1.0.2 - dev: true - - /arraybuffer.prototype.slice@1.0.3: - resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==} - engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - is-array-buffer: 3.0.4 - is-shared-array-buffer: 1.0.3 - dev: true - - /available-typed-arrays@1.0.7: - resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} - engines: {node: '>= 0.4'} - dependencies: - possible-typed-array-names: 1.0.0 - dev: true - - /balanced-match@1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true - - /brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} + brace-expansion@1.1.11: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 - dev: true - /brace-expansion@2.0.1: - resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + brace-expansion@2.0.1: dependencies: balanced-match: 1.0.2 - dev: true - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} + braces@3.0.2: dependencies: fill-range: 7.0.1 - dev: true - /builtin-modules@3.3.0: - resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} - engines: {node: '>=6'} - dev: true - - /builtins@5.1.0: - resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} + browserslist@4.23.0: dependencies: - semver: 7.6.0 - dev: true + caniuse-lite: 1.0.30001611 + electron-to-chromium: 1.4.740 + node-releases: 2.0.14 + update-browserslist-db: 1.0.13(browserslist@4.23.0) - /call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} - engines: {node: '>= 0.4'} + builtin-modules@3.3.0: {} + + callsites@3.1.0: {} + + caniuse-lite@1.0.30001611: {} + + chalk@2.4.2: dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - dev: true + ansi-styles: 3.2.1 + escape-string-regexp: 1.0.5 + supports-color: 5.5.0 - /callsites@3.1.0: - resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} - engines: {node: '>=6'} - dev: true - - /chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} + chalk@4.1.2: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 - dev: true - /color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} + character-entities-legacy@1.1.4: {} + + character-entities@1.2.4: {} + + character-reference-invalid@1.1.4: {} + + ci-info@4.0.0: {} + + clean-regexp@1.0.0: + dependencies: + escape-string-regexp: 1.0.5 + + cliui@8.0.1: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + + color-convert@1.9.3: + dependencies: + color-name: 1.1.3 + + color-convert@2.0.1: dependencies: color-name: 1.1.4 - dev: true - /color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - dev: true + color-name@1.1.3: {} - /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - dev: true + color-name@1.1.4: {} - /cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} + comment-parser@1.4.1: {} + + concat-map@0.0.1: {} + + core-js-compat@3.37.0: + dependencies: + browserslist: 4.23.0 + + cross-spawn@7.0.3: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 which: 2.0.2 - dev: true - /data-view-buffer@1.0.1: - resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} - engines: {node: '>= 0.4'} + cssesc@3.0.0: {} + + debug@3.2.7: dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true + ms: 2.1.3 - /data-view-byte-length@1.0.1: - resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true - - /data-view-byte-offset@1.0.0: - resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true - - /debug@3.2.7: - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true + debug@4.3.4: dependencies: ms: 2.1.2 - dev: true - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true + deep-is@0.1.4: {} - /deep-is@0.1.4: - resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - dev: true - - /define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 - dev: true - - /define-properties@1.2.1: - resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - has-property-descriptors: 1.0.2 - object-keys: 1.1.1 - dev: true - - /dir-glob@3.0.1: - resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} - engines: {node: '>=8'} + dir-glob@3.0.1: dependencies: path-type: 4.0.0 - dev: true - /doctrine@2.1.0: - resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} - engines: {node: '>=0.10.0'} + doctrine@3.0.0: dependencies: esutils: 2.0.3 - dev: true - /es-abstract@1.23.3: - resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} - engines: {node: '>= 0.4'} + electron-to-chromium@1.4.740: {} + + emoji-regex@8.0.0: {} + + enhanced-resolve@5.16.0: dependencies: - array-buffer-byte-length: 1.0.1 - arraybuffer.prototype.slice: 1.0.3 - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - data-view-buffer: 1.0.1 - data-view-byte-length: 1.0.1 - data-view-byte-offset: 1.0.0 - es-define-property: 1.0.0 - es-errors: 1.3.0 - es-object-atoms: 1.0.0 - es-set-tostringtag: 2.0.3 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 - get-symbol-description: 1.0.2 - globalthis: 1.0.3 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - internal-slot: 1.0.7 - is-array-buffer: 3.0.4 - is-callable: 1.2.7 - is-data-view: 1.0.1 - is-negative-zero: 2.0.3 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.3 - is-string: 1.0.7 - is-typed-array: 1.1.13 - is-weakref: 1.0.2 - object-inspect: 1.13.1 - object-keys: 1.1.1 - object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 - safe-array-concat: 1.1.2 - safe-regex-test: 1.0.3 - string.prototype.trim: 1.2.9 - string.prototype.trimend: 1.0.8 - string.prototype.trimstart: 1.0.8 - typed-array-buffer: 1.0.2 - typed-array-byte-length: 1.0.1 - typed-array-byte-offset: 1.0.2 - typed-array-length: 1.0.6 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.15 - dev: true + graceful-fs: 4.2.11 + tapable: 2.2.1 - /es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} + entities@4.5.0: {} + + error-ex@1.3.2: dependencies: - get-intrinsic: 1.2.4 - dev: true + is-arrayish: 0.2.1 - /es-errors@1.3.0: - resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} - engines: {node: '>= 0.4'} - dev: true + escalade@3.1.2: {} - /es-object-atoms@1.0.0: - resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} - engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - dev: true + escape-string-regexp@1.0.5: {} - /es-set-tostringtag@2.0.3: - resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} - engines: {node: '>= 0.4'} - dependencies: - get-intrinsic: 1.2.4 - has-tostringtag: 1.0.2 - hasown: 2.0.2 - dev: true + escape-string-regexp@4.0.0: {} - /es-shim-unscopables@1.0.2: - resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} - dependencies: - hasown: 2.0.2 - dev: true - - /es-to-primitive@1.2.1: - resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} - engines: {node: '>= 0.4'} - dependencies: - is-callable: 1.2.7 - is-date-object: 1.0.5 - is-symbol: 1.0.4 - dev: true - - /escape-string-regexp@4.0.0: - resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} - engines: {node: '>=10'} - dev: true - - /eslint-compat-utils@0.5.0(eslint@9.0.0): - resolution: {integrity: sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg==} - engines: {node: '>=12'} - peerDependencies: - eslint: '>=6.0.0' + eslint-compat-utils@0.5.0(eslint@9.0.0): dependencies: eslint: 9.0.0 semver: 7.6.0 - dev: true - /eslint-config-standard-with-typescript@43.0.1(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@9.0.0)(typescript@5.4.5): - resolution: {integrity: sha512-WfZ986+qzIzX6dcr4yGUyVb/l9N3Z8wPXCc5z/70fljs3UbWhhV+WxrfgsqMToRzuuyX9MqZ974pq2UPhDTOcA==} - deprecated: Please use eslint-config-love, instead. - peerDependencies: - '@typescript-eslint/eslint-plugin': ^6.4.0 - eslint: ^8.0.1 - eslint-plugin-import: ^2.25.2 - eslint-plugin-n: '^15.0.0 || ^16.0.0 ' - eslint-plugin-promise: ^6.0.0 - typescript: '*' + eslint-config-flat-gitignore@0.1.5: dependencies: - '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@9.0.0)(typescript@5.4.5) - '@typescript-eslint/parser': 6.21.0(eslint@9.0.0)(typescript@5.4.5) - eslint: 9.0.0 - eslint-config-standard: 17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@9.0.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@9.0.0) - eslint-plugin-n: 16.6.2(eslint@9.0.0) - eslint-plugin-promise: 6.1.1(eslint@9.0.0) - typescript: 5.4.5 - transitivePeerDependencies: - - supports-color - dev: true + find-up: 7.0.0 + parse-gitignore: 2.0.0 - /eslint-config-standard@17.1.0(eslint-plugin-import@2.29.1)(eslint-plugin-n@16.6.2)(eslint-plugin-promise@6.1.1)(eslint@9.0.0): - resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==} - engines: {node: '>=12.0.0'} - peerDependencies: - eslint: ^8.0.1 - eslint-plugin-import: ^2.25.2 - eslint-plugin-n: '^15.0.0 || ^16.0.0 ' - eslint-plugin-promise: ^6.0.0 + eslint-flat-config-utils@0.2.3: dependencies: - eslint: 9.0.0 - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0)(eslint@9.0.0) - eslint-plugin-n: 16.6.2(eslint@9.0.0) - eslint-plugin-promise: 6.1.1(eslint@9.0.0) - dev: true + '@types/eslint': 8.56.9 + pathe: 1.1.2 - /eslint-import-resolver-node@0.3.9: - resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==} + eslint-import-resolver-node@0.3.9: dependencies: debug: 3.2.7 is-core-module: 2.13.1 resolve: 1.22.8 transitivePeerDependencies: - supports-color - dev: true - /eslint-module-utils@2.8.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@9.0.0): - resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: '*' - eslint-import-resolver-node: '*' - eslint-import-resolver-typescript: '*' - eslint-import-resolver-webpack: '*' - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true - eslint: - optional: true - eslint-import-resolver-node: - optional: true - eslint-import-resolver-typescript: - optional: true - eslint-import-resolver-webpack: - optional: true + eslint-merge-processors@0.1.0(eslint@9.0.0): dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@9.0.0)(typescript@5.4.5) - debug: 3.2.7 eslint: 9.0.0 - eslint-import-resolver-node: 0.3.9 - transitivePeerDependencies: - - supports-color - dev: true - /eslint-plugin-es-x@7.6.0(eslint@9.0.0): - resolution: {integrity: sha512-I0AmeNgevgaTR7y2lrVCJmGYF0rjoznpDvqV/kIkZSZbZ8Rw3eu4cGlvBBULScfkSOCzqKbff5LR4CNrV7mZHA==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - eslint: '>=8' + eslint-plugin-antfu@2.1.2(eslint@9.0.0): + dependencies: + eslint: 9.0.0 + + eslint-plugin-es-x@7.6.0(eslint@9.0.0): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) '@eslint-community/regexpp': 4.10.0 eslint: 9.0.0 eslint-compat-utils: 0.5.0(eslint@9.0.0) - dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0)(eslint@9.0.0): - resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==} - engines: {node: '>=4'} - peerDependencies: - '@typescript-eslint/parser': '*' - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - peerDependenciesMeta: - '@typescript-eslint/parser': - optional: true + eslint-plugin-eslint-comments@3.2.0(eslint@9.0.0): dependencies: - '@typescript-eslint/parser': 6.21.0(eslint@9.0.0)(typescript@5.4.5) - array-includes: 3.1.8 - array.prototype.findlastindex: 1.2.5 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 - debug: 3.2.7 - doctrine: 2.1.0 + escape-string-regexp: 1.0.5 + eslint: 9.0.0 + ignore: 5.3.1 + + eslint-plugin-import-x@0.5.0(eslint@9.0.0)(typescript@5.4.5): + dependencies: + '@typescript-eslint/utils': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + debug: 4.3.4 + doctrine: 3.0.0 eslint: 9.0.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@9.0.0) - hasown: 2.0.2 - is-core-module: 2.13.1 + get-tsconfig: 4.7.3 is-glob: 4.0.3 - minimatch: 3.1.2 - object.fromentries: 2.0.8 - object.groupby: 1.0.3 - object.values: 1.2.0 - semver: 6.3.1 - tsconfig-paths: 3.15.0 + minimatch: 9.0.4 + semver: 7.6.0 transitivePeerDependencies: - - eslint-import-resolver-typescript - - eslint-import-resolver-webpack - supports-color - dev: true + - typescript - /eslint-plugin-n@16.6.2(eslint@9.0.0): - resolution: {integrity: sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==} - engines: {node: '>=16.0.0'} - peerDependencies: - eslint: '>=7.0.0' + eslint-plugin-jsdoc@48.2.3(eslint@9.0.0): + dependencies: + '@es-joy/jsdoccomment': 0.42.0 + are-docs-informative: 0.0.2 + comment-parser: 1.4.1 + debug: 4.3.4 + escape-string-regexp: 4.0.0 + eslint: 9.0.0 + esquery: 1.5.0 + is-builtin-module: 3.2.1 + semver: 7.6.0 + spdx-expression-parse: 4.0.0 + transitivePeerDependencies: + - supports-color + + eslint-plugin-jsonc@2.15.1(eslint@9.0.0): dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) - builtins: 5.1.0 + eslint: 9.0.0 + eslint-compat-utils: 0.5.0(eslint@9.0.0) + espree: 9.6.1 + graphemer: 1.4.0 + jsonc-eslint-parser: 2.4.0 + natural-compare: 1.4.0 + synckit: 0.6.2 + + eslint-plugin-markdown@4.0.1(eslint@9.0.0): + dependencies: + eslint: 9.0.0 + mdast-util-from-markdown: 0.8.5 + transitivePeerDependencies: + - supports-color + + eslint-plugin-n@17.2.1(eslint@9.0.0): + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) + enhanced-resolve: 5.16.0 eslint: 9.0.0 eslint-plugin-es-x: 7.6.0(eslint@9.0.0) get-tsconfig: 4.7.3 - globals: 13.24.0 + globals: 14.0.0 ignore: 5.3.1 - is-builtin-module: 3.2.1 - is-core-module: 2.13.1 - minimatch: 3.1.2 - resolve: 1.22.8 + minimatch: 9.0.4 semver: 7.6.0 - dev: true - /eslint-plugin-promise@6.1.1(eslint@9.0.0): - resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint-plugin-no-only-tests@3.1.0: {} + + eslint-plugin-perfectionist@2.9.0(eslint@9.0.0)(typescript@5.4.5)(vue-eslint-parser@9.4.2(eslint@9.0.0)): + dependencies: + '@typescript-eslint/utils': 6.21.0(eslint@9.0.0)(typescript@5.4.5) + eslint: 9.0.0 + minimatch: 9.0.4 + natural-compare-lite: 1.4.0 + optionalDependencies: + vue-eslint-parser: 9.4.2(eslint@9.0.0) + transitivePeerDependencies: + - supports-color + - typescript + + eslint-plugin-toml@0.11.0(eslint@9.0.0): + dependencies: + debug: 4.3.4 + eslint: 9.0.0 + eslint-compat-utils: 0.5.0(eslint@9.0.0) + lodash: 4.17.21 + toml-eslint-parser: 0.9.3 + transitivePeerDependencies: + - supports-color + + eslint-plugin-unicorn@52.0.0(eslint@9.0.0): + dependencies: + '@babel/helper-validator-identifier': 7.22.20 + '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) + '@eslint/eslintrc': 2.1.4 + ci-info: 4.0.0 + clean-regexp: 1.0.0 + core-js-compat: 3.37.0 + eslint: 9.0.0 + esquery: 1.5.0 + indent-string: 4.0.0 + is-builtin-module: 3.2.1 + jsesc: 3.0.2 + pluralize: 8.0.0 + read-pkg-up: 7.0.1 + regexp-tree: 0.1.27 + regjsparser: 0.10.0 + semver: 7.6.0 + strip-indent: 3.0.0 + transitivePeerDependencies: + - supports-color + + eslint-plugin-unused-imports@3.1.0(@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0): dependencies: eslint: 9.0.0 - dev: true + eslint-rule-composer: 0.3.0 + optionalDependencies: + '@typescript-eslint/eslint-plugin': 7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5) - /eslint-scope@8.0.1: - resolution: {integrity: sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + eslint-plugin-vitest@0.5.3(@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5): + dependencies: + '@typescript-eslint/utils': 7.7.0(eslint@9.0.0)(typescript@5.4.5) + eslint: 9.0.0 + optionalDependencies: + '@typescript-eslint/eslint-plugin': 7.7.0(@typescript-eslint/parser@7.7.0(eslint@9.0.0)(typescript@5.4.5))(eslint@9.0.0)(typescript@5.4.5) + transitivePeerDependencies: + - supports-color + - typescript + + eslint-plugin-vue@9.25.0(eslint@9.0.0): + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) + eslint: 9.0.0 + globals: 13.24.0 + natural-compare: 1.4.0 + nth-check: 2.1.1 + postcss-selector-parser: 6.0.16 + semver: 7.6.0 + vue-eslint-parser: 9.4.2(eslint@9.0.0) + xml-name-validator: 4.0.0 + transitivePeerDependencies: + - supports-color + + eslint-plugin-yml@1.14.0(eslint@9.0.0): + dependencies: + debug: 4.3.4 + eslint: 9.0.0 + eslint-compat-utils: 0.5.0(eslint@9.0.0) + lodash: 4.17.21 + natural-compare: 1.4.0 + yaml-eslint-parser: 1.2.2 + transitivePeerDependencies: + - supports-color + + eslint-processor-vue-blocks@0.1.2(@vue/compiler-sfc@3.4.23)(eslint@9.0.0): + dependencies: + '@vue/compiler-sfc': 3.4.23 + eslint: 9.0.0 + + eslint-rule-composer@0.3.0: {} + + eslint-scope@7.2.2: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 - dev: true - /eslint-visitor-keys@3.4.3: - resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: true + eslint-scope@8.0.1: + dependencies: + esrecurse: 4.3.0 + estraverse: 5.3.0 - /eslint-visitor-keys@4.0.0: - resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - dev: true + eslint-visitor-keys@3.4.3: {} - /eslint@9.0.0: - resolution: {integrity: sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - hasBin: true + eslint-visitor-keys@4.0.0: {} + + eslint@9.0.0: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.0.0) '@eslint-community/regexpp': 4.10.0 @@ -879,195 +2240,121 @@ packages: text-table: 0.2.0 transitivePeerDependencies: - supports-color - dev: true - /espree@10.0.1: - resolution: {integrity: sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + espree@10.0.1: dependencies: acorn: 8.11.3 acorn-jsx: 5.3.2(acorn@8.11.3) eslint-visitor-keys: 4.0.0 - dev: true - /esquery@1.5.0: - resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} - engines: {node: '>=0.10'} + espree@9.6.1: + dependencies: + acorn: 8.11.3 + acorn-jsx: 5.3.2(acorn@8.11.3) + eslint-visitor-keys: 3.4.3 + + esquery@1.5.0: dependencies: estraverse: 5.3.0 - dev: true - /esrecurse@4.3.0: - resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} - engines: {node: '>=4.0'} + esrecurse@4.3.0: dependencies: estraverse: 5.3.0 - dev: true - /estraverse@5.3.0: - resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} - engines: {node: '>=4.0'} - dev: true + estraverse@5.3.0: {} - /esutils@2.0.3: - resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} - engines: {node: '>=0.10.0'} - dev: true + estree-walker@2.0.2: {} - /fast-deep-equal@3.1.3: - resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} - dev: true + esutils@2.0.3: {} - /fast-glob@3.3.2: - resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} - engines: {node: '>=8.6.0'} + execa@8.0.1: + dependencies: + cross-spawn: 7.0.3 + get-stream: 8.0.1 + human-signals: 5.0.0 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.3.0 + onetime: 6.0.0 + signal-exit: 4.1.0 + strip-final-newline: 3.0.0 + + fast-deep-equal@3.1.3: {} + + fast-glob@3.3.2: dependencies: '@nodelib/fs.stat': 2.0.5 '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 micromatch: 4.0.5 - dev: true - /fast-json-stable-stringify@2.1.0: - resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - dev: true + fast-json-stable-stringify@2.1.0: {} - /fast-levenshtein@2.0.6: - resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - dev: true + fast-levenshtein@2.0.6: {} - /fastq@1.17.1: - resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + fastq@1.17.1: dependencies: reusify: 1.0.4 - dev: true - /file-entry-cache@8.0.0: - resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} - engines: {node: '>=16.0.0'} + file-entry-cache@8.0.0: dependencies: flat-cache: 4.0.1 - dev: true - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} + fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 - dev: true - /find-up@5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} + find-up@4.1.0: + dependencies: + locate-path: 5.0.0 + path-exists: 4.0.0 + + find-up@5.0.0: dependencies: locate-path: 6.0.0 path-exists: 4.0.0 - dev: true - /flat-cache@4.0.1: - resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==} - engines: {node: '>=16'} + find-up@7.0.0: + dependencies: + locate-path: 7.2.0 + path-exists: 5.0.0 + unicorn-magic: 0.1.0 + + flat-cache@4.0.1: dependencies: flatted: 3.3.1 keyv: 4.5.4 - dev: true - /flatted@3.3.1: - resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==} - dev: true + flatted@3.3.1: {} - /for-each@0.3.3: - resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} - dependencies: - is-callable: 1.2.7 - dev: true + function-bind@1.1.2: {} - /function-bind@1.1.2: - resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - dev: true + get-caller-file@2.0.5: {} - /function.prototype.name@1.1.6: - resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - functions-have-names: 1.2.3 - dev: true + get-stream@8.0.1: {} - /functions-have-names@1.2.3: - resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - dev: true - - /get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - dev: true - - /get-symbol-description@1.0.2: - resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - dev: true - - /get-tsconfig@4.7.3: - resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==} + get-tsconfig@4.7.3: dependencies: resolve-pkg-maps: 1.0.0 - dev: true - /glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} + glob-parent@5.1.2: dependencies: is-glob: 4.0.3 - dev: true - /glob-parent@6.0.2: - resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==} - engines: {node: '>=10.13.0'} + glob-parent@6.0.2: dependencies: is-glob: 4.0.3 - dev: true - /globals@13.24.0: - resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} - engines: {node: '>=8'} + globals@13.24.0: dependencies: type-fest: 0.20.2 - dev: true - /globals@14.0.0: - resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} - engines: {node: '>=18'} - dev: true + globals@14.0.0: {} - /globals@15.0.0: - resolution: {integrity: sha512-m/C/yR4mjO6pXDTm9/R/SpYTAIyaUB4EOzcaaMEl7mds7Mshct9GfejiJNQGjHHbdMPey13Kpu4TMbYi9ex1pw==} - engines: {node: '>=18'} - dev: true + globals@15.0.0: {} - /globalthis@1.0.3: - resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} - engines: {node: '>= 0.4'} - dependencies: - define-properties: 1.2.1 - dev: true - - /globby@11.1.0: - resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} - engines: {node: '>=10'} + globby@11.1.0: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 @@ -1075,368 +2362,223 @@ packages: ignore: 5.3.1 merge2: 1.4.1 slash: 3.0.0 - dev: true - /gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - dependencies: - get-intrinsic: 1.2.4 - dev: true + graceful-fs@4.2.11: {} - /graphemer@1.4.0: - resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} - dev: true + graphemer@1.4.0: {} - /has-bigints@1.0.2: - resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} - dev: true + has-flag@3.0.0: {} - /has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - dev: true + has-flag@4.0.0: {} - /has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - dependencies: - es-define-property: 1.0.0 - dev: true - - /has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - dev: true - - /has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - dev: true - - /has-tostringtag@1.0.2: - resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} - engines: {node: '>= 0.4'} - dependencies: - has-symbols: 1.0.3 - dev: true - - /hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} - engines: {node: '>= 0.4'} + hasown@2.0.2: dependencies: function-bind: 1.1.2 - dev: true - /ignore@5.3.1: - resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} - engines: {node: '>= 4'} - dev: true + hosted-git-info@2.8.9: {} - /import-fresh@3.3.0: - resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} - engines: {node: '>=6'} + human-signals@5.0.0: {} + + ignore@5.3.1: {} + + import-fresh@3.3.0: dependencies: parent-module: 1.0.1 resolve-from: 4.0.0 - dev: true - /imurmurhash@0.1.4: - resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} - engines: {node: '>=0.8.19'} - dev: true + imurmurhash@0.1.4: {} - /internal-slot@1.0.7: - resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} - engines: {node: '>= 0.4'} + indent-string@4.0.0: {} + + is-alphabetical@1.0.4: {} + + is-alphanumerical@1.0.4: dependencies: - es-errors: 1.3.0 - hasown: 2.0.2 - side-channel: 1.0.6 - dev: true + is-alphabetical: 1.0.4 + is-decimal: 1.0.4 - /is-array-buffer@3.0.4: - resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - dev: true + is-arrayish@0.2.1: {} - /is-bigint@1.0.4: - resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} - dependencies: - has-bigints: 1.0.2 - dev: true - - /is-boolean-object@1.1.2: - resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - dev: true - - /is-builtin-module@3.2.1: - resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} - engines: {node: '>=6'} + is-builtin-module@3.2.1: dependencies: builtin-modules: 3.3.0 - dev: true - /is-callable@1.2.7: - resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} - engines: {node: '>= 0.4'} - dev: true - - /is-core-module@2.13.1: - resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} + is-core-module@2.13.1: dependencies: hasown: 2.0.2 - dev: true - /is-data-view@1.0.1: - resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} - engines: {node: '>= 0.4'} - dependencies: - is-typed-array: 1.1.13 - dev: true + is-decimal@1.0.4: {} - /is-date-object@1.0.5: - resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} - engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true + is-extglob@2.1.1: {} - /is-extglob@2.1.1: - resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} - engines: {node: '>=0.10.0'} - dev: true + is-fullwidth-code-point@3.0.0: {} - /is-glob@4.0.3: - resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} - engines: {node: '>=0.10.0'} + is-glob@4.0.3: dependencies: is-extglob: 2.1.1 - dev: true - /is-negative-zero@2.0.3: - resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} - engines: {node: '>= 0.4'} - dev: true + is-hexadecimal@1.0.4: {} - /is-number-object@1.0.7: - resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} - engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true + is-number@7.0.0: {} - /is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - dev: true + is-path-inside@3.0.3: {} - /is-path-inside@3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - dev: true + is-stream@3.0.0: {} - /is-regex@1.1.4: - resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - dev: true + isexe@2.0.0: {} - /is-shared-array-buffer@1.0.3: - resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - dev: true + js-tokens@4.0.0: {} - /is-string@1.0.7: - resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} - engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true - - /is-symbol@1.0.4: - resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} - engines: {node: '>= 0.4'} - dependencies: - has-symbols: 1.0.3 - dev: true - - /is-typed-array@1.1.13: - resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} - engines: {node: '>= 0.4'} - dependencies: - which-typed-array: 1.1.15 - dev: true - - /is-weakref@1.0.2: - resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} - dependencies: - call-bind: 1.0.7 - dev: true - - /isarray@2.0.5: - resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - dev: true - - /isexe@2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - dev: true - - /js-yaml@4.1.0: - resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} - hasBin: true + js-yaml@4.1.0: dependencies: argparse: 2.0.1 - dev: true - /json-buffer@3.0.1: - resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} - dev: true + jsdoc-type-pratt-parser@4.0.0: {} - /json-schema-traverse@0.4.1: - resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} - dev: true + jsesc@0.5.0: {} - /json-stable-stringify-without-jsonify@1.0.1: - resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - dev: true + jsesc@3.0.2: {} - /json5@1.0.2: - resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} - hasBin: true + json-buffer@3.0.1: {} + + json-parse-even-better-errors@2.3.1: {} + + json-schema-traverse@0.4.1: {} + + json-stable-stringify-without-jsonify@1.0.1: {} + + jsonc-eslint-parser@2.4.0: dependencies: - minimist: 1.2.8 - dev: true + acorn: 8.11.3 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + semver: 7.6.0 - /keyv@4.5.4: - resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + jsonc-parser@3.2.1: {} + + keyv@4.5.4: dependencies: json-buffer: 3.0.1 - dev: true - /levn@0.4.1: - resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} - engines: {node: '>= 0.8.0'} + levn@0.4.1: dependencies: prelude-ls: 1.2.1 type-check: 0.4.0 - dev: true - /locate-path@6.0.0: - resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} - engines: {node: '>=10'} + lines-and-columns@1.2.4: {} + + local-pkg@0.5.0: + dependencies: + mlly: 1.6.1 + pkg-types: 1.0.3 + + locate-path@5.0.0: + dependencies: + p-locate: 4.1.0 + + locate-path@6.0.0: dependencies: p-locate: 5.0.0 - dev: true - /lodash.merge@4.6.2: - resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==} - dev: true + locate-path@7.2.0: + dependencies: + p-locate: 6.0.0 - /lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} + lodash.merge@4.6.2: {} + + lodash@4.17.21: {} + + lru-cache@6.0.0: dependencies: yallist: 4.0.0 - dev: true - /merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - dev: true + magic-string@0.30.10: + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} + mdast-util-from-markdown@0.8.5: + dependencies: + '@types/mdast': 3.0.15 + mdast-util-to-string: 2.0.0 + micromark: 2.11.4 + parse-entities: 2.0.0 + unist-util-stringify-position: 2.0.3 + transitivePeerDependencies: + - supports-color + + mdast-util-to-string@2.0.0: {} + + merge-stream@2.0.0: {} + + merge2@1.4.1: {} + + micromark@2.11.4: + dependencies: + debug: 4.3.4 + parse-entities: 2.0.0 + transitivePeerDependencies: + - supports-color + + micromatch@4.0.5: dependencies: braces: 3.0.2 picomatch: 2.3.1 - dev: true - /minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} + mimic-fn@4.0.0: {} + + min-indent@1.0.1: {} + + minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 - dev: true - /minimatch@9.0.3: - resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} - engines: {node: '>=16 || 14 >=14.17'} + minimatch@9.0.3: dependencies: brace-expansion: 2.0.1 - dev: true - /minimist@1.2.8: - resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - dev: true - - /ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - dev: true - - /natural-compare@1.4.0: - resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - dev: true - - /object-inspect@1.13.1: - resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - dev: true - - /object-keys@1.1.1: - resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} - engines: {node: '>= 0.4'} - dev: true - - /object.assign@4.1.5: - resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} - engines: {node: '>= 0.4'} + minimatch@9.0.4: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - has-symbols: 1.0.3 - object-keys: 1.1.1 - dev: true + brace-expansion: 2.0.1 - /object.fromentries@2.0.8: - resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==} - engines: {node: '>= 0.4'} + mlly@1.6.1: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-object-atoms: 1.0.0 - dev: true + acorn: 8.11.3 + pathe: 1.1.2 + pkg-types: 1.0.3 + ufo: 1.5.3 - /object.groupby@1.0.3: - resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==} - engines: {node: '>= 0.4'} + ms@2.1.2: {} + + ms@2.1.3: {} + + nanoid@3.3.7: {} + + natural-compare-lite@1.4.0: {} + + natural-compare@1.4.0: {} + + node-releases@2.0.14: {} + + normalize-package-data@2.5.0: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - dev: true + hosted-git-info: 2.8.9 + resolve: 1.22.8 + semver: 5.7.2 + validate-npm-package-license: 3.0.4 - /object.values@1.2.0: - resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==} - engines: {node: '>= 0.4'} + npm-run-path@5.3.0: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - dev: true + path-key: 4.0.0 - /optionator@0.9.3: - resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} - engines: {node: '>= 0.8.0'} + nth-check@2.1.1: + dependencies: + boolbase: 1.0.0 + + onetime@6.0.0: + dependencies: + mimic-fn: 4.0.0 + + optionator@0.9.3: dependencies: '@aashutoshrathi/word-wrap': 1.2.6 deep-is: 0.1.4 @@ -1444,394 +2586,318 @@ packages: levn: 0.4.1 prelude-ls: 1.2.1 type-check: 0.4.0 - dev: true - /p-limit@3.1.0: - resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} - engines: {node: '>=10'} + p-limit@2.3.0: + dependencies: + p-try: 2.2.0 + + p-limit@3.1.0: dependencies: yocto-queue: 0.1.0 - dev: true - /p-locate@5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} + p-limit@4.0.0: + dependencies: + yocto-queue: 1.0.0 + + p-locate@4.1.0: + dependencies: + p-limit: 2.3.0 + + p-locate@5.0.0: dependencies: p-limit: 3.1.0 - dev: true - /parent-module@1.0.1: - resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} - engines: {node: '>=6'} + p-locate@6.0.0: + dependencies: + p-limit: 4.0.0 + + p-try@2.2.0: {} + + parent-module@1.0.1: dependencies: callsites: 3.1.0 - dev: true - /path-exists@4.0.0: - resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} - engines: {node: '>=8'} - dev: true - - /path-key@3.1.1: - resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} - engines: {node: '>=8'} - dev: true - - /path-parse@1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - dev: true - - /path-type@4.0.0: - resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} - engines: {node: '>=8'} - dev: true - - /picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - dev: true - - /possible-typed-array-names@1.0.0: - resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} - engines: {node: '>= 0.4'} - dev: true - - /prelude-ls@1.2.1: - resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} - engines: {node: '>= 0.8.0'} - dev: true - - /prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} - engines: {node: '>=14'} - hasBin: true - dev: true - - /punycode@2.3.1: - resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} - engines: {node: '>=6'} - dev: true - - /queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - dev: true - - /regexp.prototype.flags@1.5.2: - resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} - engines: {node: '>= 0.4'} + parse-entities@2.0.0: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-errors: 1.3.0 - set-function-name: 2.0.2 - dev: true + character-entities: 1.2.4 + character-entities-legacy: 1.1.4 + character-reference-invalid: 1.1.4 + is-alphanumerical: 1.0.4 + is-decimal: 1.0.4 + is-hexadecimal: 1.0.4 - /resolve-from@4.0.0: - resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} - engines: {node: '>=4'} - dev: true + parse-gitignore@2.0.0: {} - /resolve-pkg-maps@1.0.0: - resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - dev: true + parse-json@5.2.0: + dependencies: + '@babel/code-frame': 7.24.2 + error-ex: 1.3.2 + json-parse-even-better-errors: 2.3.1 + lines-and-columns: 1.2.4 - /resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} - hasBin: true + path-exists@4.0.0: {} + + path-exists@5.0.0: {} + + path-key@3.1.1: {} + + path-key@4.0.0: {} + + path-parse@1.0.7: {} + + path-type@4.0.0: {} + + pathe@1.1.2: {} + + picocolors@1.0.0: {} + + picomatch@2.3.1: {} + + picomatch@4.0.2: {} + + pkg-types@1.0.3: + dependencies: + jsonc-parser: 3.2.1 + mlly: 1.6.1 + pathe: 1.1.2 + + pluralize@8.0.0: {} + + postcss-selector-parser@6.0.16: + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + + postcss@8.4.38: + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + + prelude-ls@1.2.1: {} + + prettier@3.2.5: {} + + punycode@2.3.1: {} + + queue-microtask@1.2.3: {} + + read-pkg-up@7.0.1: + dependencies: + find-up: 4.1.0 + read-pkg: 5.2.0 + type-fest: 0.8.1 + + read-pkg@5.2.0: + dependencies: + '@types/normalize-package-data': 2.4.4 + normalize-package-data: 2.5.0 + parse-json: 5.2.0 + type-fest: 0.6.0 + + regexp-tree@0.1.27: {} + + regjsparser@0.10.0: + dependencies: + jsesc: 0.5.0 + + require-directory@2.1.1: {} + + resolve-from@4.0.0: {} + + resolve-pkg-maps@1.0.0: {} + + resolve@1.22.8: dependencies: is-core-module: 2.13.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 - dev: true - /reusify@1.0.4: - resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - dev: true + reusify@1.0.4: {} - /run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 - dev: true - /safe-array-concat@1.1.2: - resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} - engines: {node: '>=0.4'} - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 - isarray: 2.0.5 - dev: true + semver@5.7.2: {} - /safe-regex-test@1.0.3: - resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-regex: 1.1.4 - dev: true - - /semver@6.3.1: - resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} - hasBin: true - dev: true - - /semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} - engines: {node: '>=10'} - hasBin: true + semver@7.6.0: dependencies: lru-cache: 6.0.0 - dev: true - /set-function-length@1.2.2: - resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - dev: true - - /set-function-name@2.0.2: - resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} - engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - functions-have-names: 1.2.3 - has-property-descriptors: 1.0.2 - dev: true - - /shebang-command@2.0.0: - resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} - engines: {node: '>=8'} + shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 - dev: true - /shebang-regex@3.0.0: - resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} - engines: {node: '>=8'} - dev: true + shebang-regex@3.0.0: {} - /side-channel@1.0.6: - resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} - engines: {node: '>= 0.4'} + signal-exit@4.1.0: {} + + sisteransi@1.0.5: {} + + slash@3.0.0: {} + + source-map-js@1.2.0: {} + + spdx-correct@3.2.0: dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.1 - dev: true + spdx-expression-parse: 3.0.1 + spdx-license-ids: 3.0.17 - /slash@3.0.0: - resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} - engines: {node: '>=8'} - dev: true + spdx-exceptions@2.5.0: {} - /string.prototype.trim@1.2.9: - resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} - engines: {node: '>= 0.4'} + spdx-expression-parse@3.0.1: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-object-atoms: 1.0.0 - dev: true + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 - /string.prototype.trimend@1.0.8: - resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} + spdx-expression-parse@4.0.0: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - dev: true + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 - /string.prototype.trimstart@1.0.8: - resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} - engines: {node: '>= 0.4'} + spdx-license-ids@3.0.17: {} + + string-width@4.2.3: dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - dev: true + emoji-regex: 8.0.0 + is-fullwidth-code-point: 3.0.0 + strip-ansi: 6.0.1 - /strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} + strip-ansi@6.0.1: dependencies: ansi-regex: 5.0.1 - dev: true - /strip-bom@3.0.0: - resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} - engines: {node: '>=4'} - dev: true + strip-final-newline@3.0.0: {} - /strip-json-comments@3.1.1: - resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} - engines: {node: '>=8'} - dev: true + strip-indent@3.0.0: + dependencies: + min-indent: 1.0.1 - /supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} + strip-json-comments@3.1.1: {} + + supports-color@5.5.0: + dependencies: + has-flag: 3.0.0 + + supports-color@7.2.0: dependencies: has-flag: 4.0.0 - dev: true - /supports-preserve-symlinks-flag@1.0.0: - resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} - engines: {node: '>= 0.4'} - dev: true + supports-preserve-symlinks-flag@1.0.0: {} - /text-table@0.2.0: - resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} - dev: true + synckit@0.6.2: + dependencies: + tslib: 2.6.2 - /to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} + tapable@2.2.1: {} + + text-table@0.2.0: {} + + to-fast-properties@2.0.0: {} + + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 - dev: true - /ts-api-utils@1.3.0(typescript@5.4.5): - resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==} - engines: {node: '>=16'} - peerDependencies: - typescript: '>=4.2.0' + toml-eslint-parser@0.9.3: + dependencies: + eslint-visitor-keys: 3.4.3 + + ts-api-utils@1.3.0(typescript@5.4.5): dependencies: typescript: 5.4.5 - dev: true - /tsconfig-paths@3.15.0: - resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==} - dependencies: - '@types/json5': 0.0.29 - json5: 1.0.2 - minimist: 1.2.8 - strip-bom: 3.0.0 - dev: true + tslib@2.6.2: {} - /type-check@0.4.0: - resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} - engines: {node: '>= 0.8.0'} + type-check@0.4.0: dependencies: prelude-ls: 1.2.1 - dev: true - /type-fest@0.20.2: - resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} - engines: {node: '>=10'} - dev: true + type-fest@0.20.2: {} - /typed-array-buffer@1.0.2: - resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} - engines: {node: '>= 0.4'} + type-fest@0.6.0: {} + + type-fest@0.8.1: {} + + typescript@5.4.5: {} + + ufo@1.5.3: {} + + unicorn-magic@0.1.0: {} + + unist-util-stringify-position@2.0.3: dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-typed-array: 1.1.13 - dev: true + '@types/unist': 2.0.10 - /typed-array-byte-length@1.0.1: - resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} - engines: {node: '>= 0.4'} + update-browserslist-db@1.0.13(browserslist@4.23.0): dependencies: - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - dev: true + browserslist: 4.23.0 + escalade: 3.1.2 + picocolors: 1.0.0 - /typed-array-byte-offset@1.0.2: - resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} - engines: {node: '>= 0.4'} - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - dev: true - - /typed-array-length@1.0.6: - resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - possible-typed-array-names: 1.0.0 - dev: true - - /typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} - engines: {node: '>=14.17'} - hasBin: true - dev: true - - /unbox-primitive@1.0.2: - resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} - dependencies: - call-bind: 1.0.7 - has-bigints: 1.0.2 - has-symbols: 1.0.3 - which-boxed-primitive: 1.0.2 - dev: true - - /uri-js@4.4.1: - resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} + uri-js@4.4.1: dependencies: punycode: 2.3.1 - dev: true - /which-boxed-primitive@1.0.2: - resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} + util-deprecate@1.0.2: {} + + uuid@9.0.1: {} + + validate-npm-package-license@3.0.4: dependencies: - is-bigint: 1.0.4 - is-boolean-object: 1.1.2 - is-number-object: 1.0.7 - is-string: 1.0.7 - is-symbol: 1.0.4 - dev: true + spdx-correct: 3.2.0 + spdx-expression-parse: 3.0.1 - /which-typed-array@1.1.15: - resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} - engines: {node: '>= 0.4'} + vue-eslint-parser@9.4.2(eslint@9.0.0): dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-tostringtag: 1.0.2 - dev: true + debug: 4.3.4 + eslint: 9.0.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + lodash: 4.17.21 + semver: 7.6.0 + transitivePeerDependencies: + - supports-color - /which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true + which@2.0.2: dependencies: isexe: 2.0.0 - dev: true - /yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true + wrap-ansi@7.0.0: + dependencies: + ansi-styles: 4.3.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 - /yocto-queue@0.1.0: - resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} - engines: {node: '>=10'} - dev: true + xml-name-validator@4.0.0: {} + + y18n@5.0.8: {} + + yallist@4.0.0: {} + + yaml-eslint-parser@1.2.2: + dependencies: + eslint-visitor-keys: 3.4.3 + lodash: 4.17.21 + yaml: 2.4.1 + + yaml@2.4.1: {} + + yargs-parser@21.1.1: {} + + yargs@17.7.2: + dependencies: + cliui: 8.0.1 + escalade: 3.1.2 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.1.1 + + yocto-queue@0.1.0: {} + + yocto-queue@1.0.0: {} diff --git a/settings/v2/packages/builder.json b/settings/v2/packages/builder.json index afb43c6..9accaf3 100644 --- a/settings/v2/packages/builder.json +++ b/settings/v2/packages/builder.json @@ -1,7 +1,7 @@ { "__version__": "1.3.7", "textureCompressConfig": { - "genMipmaps": true + "genMipmaps": false }, "bundleConfig": { "custom": { diff --git a/settings/v2/packages/cocos-service.json b/settings/v2/packages/cocos-service.json index fdc6e57..2d6871b 100644 --- a/settings/v2/packages/cocos-service.json +++ b/settings/v2/packages/cocos-service.json @@ -1,14 +1,18 @@ { - "__version__": "3.0.5", + "__version__": "3.0.7", "game": { - "name": "UNKNOW GAME", - "app_id": "UNKNOW", - "c_id": "0" + "app_id": "643781816", + "c_id": "0", + "name": "捷兑通-捕鱼达人" }, "appConfigMaps": [ { "app_id": "UNKNOW", "config_id": "d827d3" + }, + { + "app_id": "643781816", + "config_id": "269bee" } ], "configs": [ @@ -18,6 +22,13 @@ "config_name": "Default", "config_remarks": "", "services": [] + }, + { + "app_id": "643781816", + "config_id": "269bee", + "config_name": "Default", + "config_remarks": "", + "services": [] } ] } diff --git a/settings/v2/packages/information.json b/settings/v2/packages/information.json index 94848de..5a63c41 100644 --- a/settings/v2/packages/information.json +++ b/settings/v2/packages/information.json @@ -4,19 +4,19 @@ "customSplash": { "id": "customSplash", "label": "customSplash", - "enable": false, + "enable": true, "customSplash": { - "complete": false, - "form": "https://creator-api.cocos.com/api/form/show?" + "complete": true, + "form": "https://creator-api.cocos.com/api/form/show?sid=5d73e8c847732207609c34c0adf271fb" } }, "removeSplash": { "id": "removeSplash", "label": "removeSplash", - "enable": false, + "enable": true, "removeSplash": { - "complete": false, - "form": "https://creator-api.cocos.com/api/form/show?" + "complete": true, + "form": "https://creator-api.cocos.com/api/form/show?sid=5d73e8c847732207609c34c0adf271fb" } } } diff --git a/settings/v2/packages/project.json b/settings/v2/packages/project.json index e27f1e0..0250ecc 100644 --- a/settings/v2/packages/project.json +++ b/settings/v2/packages/project.json @@ -27,8 +27,8 @@ "designResolution": { "width": 2280, "height": 1242, - "fitWidth": false, - "fitHeight": true + "fitWidth": true, + "fitHeight": false }, "highQuality": false }, diff --git a/tsconfig.json b/tsconfig.json index 7e17eed..9c98761 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { /* Base configuration. Do not edit this field. */ - "extends": "./temp/tsconfig.cocos.json", - + "extends": "./temp/tsconfig.cocos.json", /* Add your custom configuration here. */ "compilerOptions": { - "strict": false + "strict": false, + "target": "es2019" } }