diff --git a/assets/Scene/Home/Home.fire b/assets/Scene/Home/Home.fire index 7e75e56..ef7bf96 100755 --- a/assets/Scene/Home/Home.fire +++ b/assets/Scene/Home/Home.fire @@ -192,7 +192,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -1213,7 +1213,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 335.99, + "width": 306, "height": 63.28 }, "_anchorPoint": { @@ -1264,8 +1264,8 @@ } ], "_useOriginalSize": false, - "_string": "写作对我来说是一种特殊的行动\n是对”我“的存在的理解,消化和修正的过程", - "_N$string": "写作对我来说是一种特殊的行动\n是对”我“的存在的理解,消化和修正的过程", + "_string": "写作是一种特殊的行动\n是自我存在的理解,消化和修正的过程", + "_N$string": "写作是一种特殊的行动\n是自我存在的理解,消化和修正的过程", "_fontSize": 18, "_lineHeight": 28, "_enableWrapText": true, diff --git a/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.effect.meta b/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.effect.meta index 7d24684..175fb26 100644 --- a/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.effect.meta +++ b/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.effect.meta @@ -1,6 +1,6 @@ { "ver": "1.0.25", - "uuid": "6af67cb9-1430-48c0-8704-792a7406fa41", + "uuid": "921642d4-e655-42a1-ab60-63753338243d", "compiledShaders": [ { "glsl1": { diff --git a/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.mtl b/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.mtl index 92e2eab..9b879fa 100644 --- a/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.mtl +++ b/assets/Scene/SwitchScene__DoomScreen/Materials/DoomScreen.mtl @@ -4,21 +4,13 @@ "_objFlags": 0, "_native": "", "_effectAsset": { - "__uuid__": "6af67cb9-1430-48c0-8704-792a7406fa41" + "__uuid__": "921642d4-e655-42a1-ab60-63753338243d" }, "_techniqueIndex": 0, "_techniqueData": { "0": { - "defines": {}, - "props": { - "bars": 50, - "texture": { - "__uuid__": "bdc5b1b7-faf4-4186-9895-f5ee7ed31093" - }, - "texture2": { - "__uuid__": "c8b7f468-dad7-41d2-892a-13b1e106ec06" - } - } + "props": {}, + "defines": {} } } } \ No newline at end of file diff --git a/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.fire b/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.fire index 47946c7..54fc320 100644 --- a/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.fire +++ b/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -284,7 +284,7 @@ "_id": "29zXboiXFBKoIV4PQ2liTe" }, { - "__type__": "de7b0bzLFVNZL9kgmLxYXHO", + "__type__": "22731LgD/dJ8YARF90bY3L+", "_name": "", "_objFlags": 0, "node": { @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "5c7f62b2-44b3-4ef2-b133-825e35b654ec" + "__uuid__": "bffa7f0c-2421-4a15-8dd1-eb6165061c96" }, "spriteFrame2": { - "__uuid__": "145047e6-73a5-4a19-bd7c-9dee1e5bc19f" + "__uuid__": "2165c7f4-7432-4741-8838-cd5ca4d1a33e" }, "bgSprite": { "__id__": 10 @@ -306,7 +306,7 @@ "material": { "__uuid__": "94d8d991-9e84-4d88-89f7-33d14f1bc9bf" }, - "_id": "bcrHoyt8lHbpmm6ciYSB5M" + "_id": "72/BLB24JD0KqHv/0jfPJP" }, { "__type__": "cc.Node", @@ -674,7 +674,7 @@ "__id__": 2 }, "component": "", - "_componentId": "de7b0bzLFVNZL9kgmLxYXHO", + "_componentId": "22731LgD/dJ8YARF90bY3L+", "handler": "switchSceneByTransition", "customEventData": "0" }, diff --git a/assets/Scene/SwitchScene__DoomScreen/SwitchScene.ts b/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.ts similarity index 100% rename from assets/Scene/SwitchScene__DoomScreen/SwitchScene.ts rename to assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.ts diff --git a/assets/Scene/SwitchScene__DoomScreen/SwitchScene.ts.meta b/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.ts.meta similarity index 74% rename from assets/Scene/SwitchScene__DoomScreen/SwitchScene.ts.meta rename to assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.ts.meta index d8f4b5a..86f6a59 100644 --- a/assets/Scene/SwitchScene__DoomScreen/SwitchScene.ts.meta +++ b/assets/Scene/SwitchScene__DoomScreen/SwitchScene__DoomScreen.ts.meta @@ -1,6 +1,6 @@ { "ver": "1.0.5", - "uuid": "de7b06f3-2c55-4d64-bf64-8262f16171ce", + "uuid": "227312e0-0ff7-49f1-8011-17dd1b6372fe", "isPlugin": false, "loadPluginInWeb": true, "loadPluginInNative": true, diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg b/assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg.meta similarity index 62% rename from assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg.meta rename to assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg.meta index d06d017..4fdfee7 100644 --- a/assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg.meta +++ b/assets/Scene/SwitchScene__DoomScreen/Texture/1.jpeg.meta @@ -1,20 +1,20 @@ { "ver": "2.3.4", - "uuid": "508bd902-9298-4b07-a5a9-883e21c06a45", + "uuid": "5695b104-715c-4697-8740-f7cb94b9901a", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1600, - "height": 1200, + "width": 768, + "height": 408, "platformSettings": {}, "subMetas": { - "bg2": { + "1": { "ver": "1.0.4", - "uuid": "145047e6-73a5-4a19-bd7c-9dee1e5bc19f", - "rawTextureUuid": "508bd902-9298-4b07-a5a9-883e21c06a45", + "uuid": "bffa7f0c-2421-4a15-8dd1-eb6165061c96", + "rawTextureUuid": "5695b104-715c-4697-8740-f7cb94b9901a", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -22,10 +22,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg b/assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg.meta similarity index 62% rename from assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg.meta rename to assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg.meta index 50d0fb1..913ceff 100644 --- a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg.meta +++ b/assets/Scene/SwitchScene__DoomScreen/Texture/2.jpeg.meta @@ -1,20 +1,20 @@ { "ver": "2.3.4", - "uuid": "ee75dca6-9cb2-4f08-b996-5e990ded448d", + "uuid": "cf23c673-03d2-427b-b433-4a7b0f4c48fd", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1600, - "height": 1200, + "width": 768, + "height": 407, "platformSettings": {}, "subMetas": { - "bg1": { + "2": { "ver": "1.0.4", - "uuid": "a448d81c-fa36-426d-affc-78eedc0b3118", - "rawTextureUuid": "ee75dca6-9cb2-4f08-b996-5e990ded448d", + "uuid": "2165c7f4-7432-4741-8838-cd5ca4d1a33e", + "rawTextureUuid": "cf23c673-03d2-427b-b433-4a7b0f4c48fd", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -22,10 +22,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg b/assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg b/assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__DoomScreen/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__GlitchMemories/SwitchScene__GlitchMemories.fire b/assets/Scene/SwitchScene__GlitchMemories/SwitchScene__GlitchMemories.fire index bbf2f1b..5b85067 100644 --- a/assets/Scene/SwitchScene__GlitchMemories/SwitchScene__GlitchMemories.fire +++ b/assets/Scene/SwitchScene__GlitchMemories/SwitchScene__GlitchMemories.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "a448d81c-fa36-426d-affc-78eedc0b3118" + "__uuid__": "dfd419b8-2f3b-459d-9e09-90320d8b8d29" }, "spriteFrame2": { - "__uuid__": "50328db8-b67b-4c51-a2b3-92fbc75407ad" + "__uuid__": "387bcdbd-e548-43f9-8957-f08af6eb90a2" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg b/assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg.meta similarity index 62% rename from assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg.meta rename to assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg.meta index b330da3..8fbc672 100644 --- a/assets/Scene/SwitchScene__DoomScreen/Texture/bg1.jpeg.meta +++ b/assets/Scene/SwitchScene__GlitchMemories/Texture/1.jpeg.meta @@ -1,20 +1,20 @@ { "ver": "2.3.4", - "uuid": "fba8ea3c-e39c-495c-a135-ccb2c418ca04", + "uuid": "f56be694-723d-40f9-8e06-65082028608b", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1600, - "height": 1200, + "width": 768, + "height": 408, "platformSettings": {}, "subMetas": { - "bg1": { + "1": { "ver": "1.0.4", - "uuid": "5c7f62b2-44b3-4ef2-b133-825e35b654ec", - "rawTextureUuid": "fba8ea3c-e39c-495c-a135-ccb2c418ca04", + "uuid": "dfd419b8-2f3b-459d-9e09-90320d8b8d29", + "rawTextureUuid": "f56be694-723d-40f9-8e06-65082028608b", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -22,10 +22,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg b/assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg.meta similarity index 62% rename from assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg.meta rename to assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg.meta index 73f6508..1762ea8 100644 --- a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg.meta +++ b/assets/Scene/SwitchScene__GlitchMemories/Texture/2.jpeg.meta @@ -1,20 +1,20 @@ { "ver": "2.3.4", - "uuid": "d6c1cbd3-3ac4-4297-b2ac-b833bc5fed54", + "uuid": "c6439a58-a647-4113-b956-0c31497e60cb", "type": "sprite", "wrapMode": "clamp", "filterMode": "bilinear", "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1600, - "height": 1200, + "width": 768, + "height": 407, "platformSettings": {}, "subMetas": { - "bg2": { + "2": { "ver": "1.0.4", - "uuid": "50328db8-b67b-4c51-a2b3-92fbc75407ad", - "rawTextureUuid": "d6c1cbd3-3ac4-4297-b2ac-b833bc5fed54", + "uuid": "387bcdbd-e548-43f9-8957-f08af6eb90a2", + "rawTextureUuid": "c6439a58-a647-4113-b956-0c31497e60cb", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -22,10 +22,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg b/assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg b/assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__GlitchMemories/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Morph/SwitchScene__Morph.fire b/assets/Scene/SwitchScene__Morph/SwitchScene__Morph.fire index 9eb91d1..a322a15 100644 --- a/assets/Scene/SwitchScene__Morph/SwitchScene__Morph.fire +++ b/assets/Scene/SwitchScene__Morph/SwitchScene__Morph.fire @@ -20,7 +20,7 @@ "__id__": 11 }, { - "__id__": 14 + "__id__": 13 }, { "__id__": 8 @@ -91,9 +91,6 @@ }, { "__id__": 7 - }, - { - "__id__": 13 } ], "_prefab": null, @@ -183,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -298,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "86051da6-3207-4804-9640-0e749a937e66" + "__uuid__": "cf40bdc5-31a2-4069-87d0-325229b3ba39" }, "spriteFrame2": { - "__uuid__": "4b6b758b-cb14-48cf-8228-328c894f8ff3" + "__uuid__": "d0c32043-107c-431a-ba2c-c1a9ba623e51" }, "bgSprite": { "__id__": 10 @@ -529,31 +526,6 @@ "_originalHeight": 445, "_id": "711M5JfuBPs5F7P5bDVb/1" }, - { - "__type__": "75ff9DV6TxDfp7lelS5SRve", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "separator": { - "__id__": 8 - }, - "spriteFrame1": { - "__uuid__": "86051da6-3207-4804-9640-0e749a937e66" - }, - "spriteFrame2": { - "__uuid__": "4b6b758b-cb14-48cf-8228-328c894f8ff3" - }, - "bgSprite": { - "__id__": 10 - }, - "material": { - "__uuid__": "acd92272-4481-49c6-81ef-5ae28e699ecf" - }, - "_id": "dePdhkKnZN/pBfcawhApa9" - }, { "__type__": "cc.Node", "_name": "Btn", @@ -565,13 +537,13 @@ "_active": true, "_components": [ { - "__id__": 15 + "__id__": 14 + }, + { + "__id__": 16 }, { "__id__": 17 - }, - { - "__id__": 18 } ], "_prefab": null, @@ -627,7 +599,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "_normalMaterial": null, @@ -636,7 +608,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 16 + "__id__": 15 } ], "_N$interactable": true, @@ -692,7 +664,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 14 + "__id__": 13 }, "_id": "fdJg28i7pE6pi4D1ovRRp0" }, @@ -711,7 +683,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "_materials": [ @@ -743,7 +715,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 14 + "__id__": 13 }, "_enabled": true, "alignMode": 1, diff --git a/assets/Scene/SwitchScene__Morph/Texture/1.jpeg b/assets/Scene/SwitchScene__Morph/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__Morph/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__Morph/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__Morph/Texture/1.jpeg.meta new file mode 100644 index 0000000..66c0b7e --- /dev/null +++ b/assets/Scene/SwitchScene__Morph/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "76a4ffad-bd4a-4e36-b51d-791390b13ac6", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "cf40bdc5-31a2-4069-87d0-325229b3ba39", + "rawTextureUuid": "76a4ffad-bd4a-4e36-b51d-791390b13ac6", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Morph/Texture/2.jpeg b/assets/Scene/SwitchScene__Morph/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__Morph/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__Morph/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__Morph/Texture/2.jpeg.meta new file mode 100644 index 0000000..25178c6 --- /dev/null +++ b/assets/Scene/SwitchScene__Morph/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "6c7b23c5-2e1e-4e91-ab24-9dd5a1fa5c14", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "d0c32043-107c-431a-ba2c-c1a9ba623e51", + "rawTextureUuid": "6c7b23c5-2e1e-4e91-ab24-9dd5a1fa5c14", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg b/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg.meta deleted file mode 100644 index 002ce96..0000000 --- a/assets/Scene/SwitchScene__Morph/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "629244c4-e709-4d5e-a4ac-e250b052ebe3", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "86051da6-3207-4804-9640-0e749a937e66", - "rawTextureUuid": "629244c4-e709-4d5e-a4ac-e250b052ebe3", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg b/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg.meta deleted file mode 100644 index e3aa5e2..0000000 --- a/assets/Scene/SwitchScene__Morph/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "6739472e-4b5d-4f1b-8dc1-2915cd7493d1", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "4b6b758b-cb14-48cf-8228-328c894f8ff3", - "rawTextureUuid": "6739472e-4b5d-4f1b-8dc1-2915cd7493d1", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Perlin/SwitchScene__Perlin.fire b/assets/Scene/SwitchScene__Perlin/SwitchScene__Perlin.fire index 8ec900d..8021cdc 100644 --- a/assets/Scene/SwitchScene__Perlin/SwitchScene__Perlin.fire +++ b/assets/Scene/SwitchScene__Perlin/SwitchScene__Perlin.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "8ef474f4-5038-4363-8a35-cd2c2df2d8d6" + "__uuid__": "ebeeebe9-f6a8-43e6-883b-14b3bed57a99" }, "spriteFrame2": { - "__uuid__": "5ff63ec2-5294-40af-9a60-4f837d09d814" + "__uuid__": "e1f2ac31-6eb0-4b14-8c8e-aab6f58468a4" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg b/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg.meta new file mode 100644 index 0000000..fa46437 --- /dev/null +++ b/assets/Scene/SwitchScene__Perlin/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "843b3025-c475-4036-9d47-5ee78c4b2ab5", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "ebeeebe9-f6a8-43e6-883b-14b3bed57a99", + "rawTextureUuid": "843b3025-c475-4036-9d47-5ee78c4b2ab5", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg b/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg.meta new file mode 100644 index 0000000..0fe8c2f --- /dev/null +++ b/assets/Scene/SwitchScene__Perlin/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "0c6c1fc2-b0ee-4c6e-a763-1655a1e1778e", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "e1f2ac31-6eb0-4b14-8c8e-aab6f58468a4", + "rawTextureUuid": "0c6c1fc2-b0ee-4c6e-a763-1655a1e1778e", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg b/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg.meta deleted file mode 100644 index c31d50c..0000000 --- a/assets/Scene/SwitchScene__Perlin/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "7f5e5fa1-b48c-44e3-80f4-324d5286ac51", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "8ef474f4-5038-4363-8a35-cd2c2df2d8d6", - "rawTextureUuid": "7f5e5fa1-b48c-44e3-80f4-324d5286ac51", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg b/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg.meta deleted file mode 100644 index d104e3d..0000000 --- a/assets/Scene/SwitchScene__Perlin/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "ce5595f3-8df9-478a-9e41-4a165be77c71", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "5ff63ec2-5294-40af-9a60-4f837d09d814", - "rawTextureUuid": "ce5595f3-8df9-478a-9e41-4a165be77c71", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/SwitchScene__PolkaDotsCurtain.fire b/assets/Scene/SwitchScene__PolkaDotsCurtain/SwitchScene__PolkaDotsCurtain.fire index 2302b1c..31ba90a 100644 --- a/assets/Scene/SwitchScene__PolkaDotsCurtain/SwitchScene__PolkaDotsCurtain.fire +++ b/assets/Scene/SwitchScene__PolkaDotsCurtain/SwitchScene__PolkaDotsCurtain.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "40bfcf63-95f8-4023-9b53-f46addfc260c" + "__uuid__": "5ad694b6-feb0-46c7-bdbf-fd55e37b3396" }, "spriteFrame2": { - "__uuid__": "d459a6d4-cd68-474a-bc44-33996165b2e7" + "__uuid__": "90329a7f-2b9a-4781-95dd-f767d865d0e8" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg.meta new file mode 100644 index 0000000..d5065f6 --- /dev/null +++ b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "ce226956-ea51-4b59-905b-556d72f74cd4", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "5ad694b6-feb0-46c7-bdbf-fd55e37b3396", + "rawTextureUuid": "ce226956-ea51-4b59-905b-556d72f74cd4", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg.meta new file mode 100644 index 0000000..115d8ef --- /dev/null +++ b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "ba7d63e0-f08e-4953-8626-047757f56571", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "90329a7f-2b9a-4781-95dd-f767d865d0e8", + "rawTextureUuid": "ba7d63e0-f08e-4953-8626-047757f56571", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg.meta deleted file mode 100644 index 9a1f70d..0000000 --- a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "7b3ab555-1089-4fd4-9d54-7c8106aaf851", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "40bfcf63-95f8-4023-9b53-f46addfc260c", - "rawTextureUuid": "7b3ab555-1089-4fd4-9d54-7c8106aaf851", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg.meta deleted file mode 100644 index e0abeab..0000000 --- a/assets/Scene/SwitchScene__PolkaDotsCurtain/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "fe4f9866-9815-41fe-b68f-db9ece82bd26", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "d459a6d4-cd68-474a-bc44-33996165b2e7", - "rawTextureUuid": "fe4f9866-9815-41fe-b68f-db9ece82bd26", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__SquaresWire/SwitchScene__SquaresWire.fire b/assets/Scene/SwitchScene__SquaresWire/SwitchScene__SquaresWire.fire index e4bacc7..76fa4a6 100644 --- a/assets/Scene/SwitchScene__SquaresWire/SwitchScene__SquaresWire.fire +++ b/assets/Scene/SwitchScene__SquaresWire/SwitchScene__SquaresWire.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "4e0f593c-d4b5-4485-83a0-0934fbc70808" + "__uuid__": "e455470b-a713-4ea2-bc9c-36490474a650" }, "spriteFrame2": { - "__uuid__": "01d6486a-e29c-4227-854c-6b3cf263f243" + "__uuid__": "a2918eaa-e6a6-4c5a-9fe7-ecc8debfeff9" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg b/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg.meta new file mode 100644 index 0000000..b8181a2 --- /dev/null +++ b/assets/Scene/SwitchScene__SquaresWire/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "2353591d-9f81-4a2a-9989-eaa7ba18a03c", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "e455470b-a713-4ea2-bc9c-36490474a650", + "rawTextureUuid": "2353591d-9f81-4a2a-9989-eaa7ba18a03c", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg b/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg.meta new file mode 100644 index 0000000..e44627f --- /dev/null +++ b/assets/Scene/SwitchScene__SquaresWire/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "d1c68c8c-66f4-4a7d-8fea-31bc1b566ef6", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "a2918eaa-e6a6-4c5a-9fe7-ecc8debfeff9", + "rawTextureUuid": "d1c68c8c-66f4-4a7d-8fea-31bc1b566ef6", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg b/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg.meta deleted file mode 100644 index 324d253..0000000 --- a/assets/Scene/SwitchScene__SquaresWire/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "bdc5b1b7-faf4-4186-9895-f5ee7ed31093", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "4e0f593c-d4b5-4485-83a0-0934fbc70808", - "rawTextureUuid": "bdc5b1b7-faf4-4186-9895-f5ee7ed31093", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg b/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg.meta deleted file mode 100644 index 5d6a5eb..0000000 --- a/assets/Scene/SwitchScene__SquaresWire/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "c8b7f468-dad7-41d2-892a-13b1e106ec06", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "01d6486a-e29c-4227-854c-6b3cf263f243", - "rawTextureUuid": "c8b7f468-dad7-41d2-892a-13b1e106ec06", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Strip/SwitchScene__Strip.fire b/assets/Scene/SwitchScene__Strip/SwitchScene__Strip.fire index 7b98e31..0bfc408 100644 --- a/assets/Scene/SwitchScene__Strip/SwitchScene__Strip.fire +++ b/assets/Scene/SwitchScene__Strip/SwitchScene__Strip.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "fadd364e-5cc6-4fe1-a458-93dc172c36af" + "__uuid__": "73ffccf5-27dd-4e15-bd03-2974b1ddacbc" }, "spriteFrame2": { - "__uuid__": "24e8b90f-3d1d-4078-90fa-567b5d3a78a8" + "__uuid__": "d304f64e-c76a-4c38-8ad2-dbd92cde6e44" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__Strip/Texture/1.jpeg b/assets/Scene/SwitchScene__Strip/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__Strip/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__Strip/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__Strip/Texture/1.jpeg.meta new file mode 100644 index 0000000..c840a82 --- /dev/null +++ b/assets/Scene/SwitchScene__Strip/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "9cb5e3df-2f1e-44df-a8a6-553829d1f8e9", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "73ffccf5-27dd-4e15-bd03-2974b1ddacbc", + "rawTextureUuid": "9cb5e3df-2f1e-44df-a8a6-553829d1f8e9", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Strip/Texture/2.jpeg b/assets/Scene/SwitchScene__Strip/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__Strip/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__Strip/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__Strip/Texture/2.jpeg.meta new file mode 100644 index 0000000..9b90644 --- /dev/null +++ b/assets/Scene/SwitchScene__Strip/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "17bddddd-a1a1-4d30-ab66-097329334b8d", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "d304f64e-c76a-4c38-8ad2-dbd92cde6e44", + "rawTextureUuid": "17bddddd-a1a1-4d30-ab66-097329334b8d", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg b/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg.meta deleted file mode 100644 index 902b9fa..0000000 --- a/assets/Scene/SwitchScene__Strip/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "9038deed-cca8-46ff-9027-551eddadd35c", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "fadd364e-5cc6-4fe1-a458-93dc172c36af", - "rawTextureUuid": "9038deed-cca8-46ff-9027-551eddadd35c", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg b/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg.meta deleted file mode 100644 index d81dd46..0000000 --- a/assets/Scene/SwitchScene__Strip/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "c3bc747f-2cef-4c27-911d-37cb1f4ca5f2", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "24e8b90f-3d1d-4078-90fa-567b5d3a78a8", - "rawTextureUuid": "c3bc747f-2cef-4c27-911d-37cb1f4ca5f2", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Wind/SwitchScene__Wind.fire b/assets/Scene/SwitchScene__Wind/SwitchScene__Wind.fire index 440a340..a87ec55 100644 --- a/assets/Scene/SwitchScene__Wind/SwitchScene__Wind.fire +++ b/assets/Scene/SwitchScene__Wind/SwitchScene__Wind.fire @@ -180,7 +180,7 @@ "array": [ 0, 0, - 452.93128617926146, + 443.4050067376326, 0, 0, 0, @@ -295,10 +295,10 @@ "__id__": 8 }, "spriteFrame1": { - "__uuid__": "6b5b98b4-55cb-4aae-a6aa-58b7edc91500" + "__uuid__": "5fcabad5-7c95-4e6f-99bf-ca13f2d99ad5" }, "spriteFrame2": { - "__uuid__": "2bd4baf2-cc8f-4a82-b8bf-c619a9a8d6d1" + "__uuid__": "787409d1-3a04-4ca4-8c29-80efb927b43e" }, "bgSprite": { "__id__": 10 diff --git a/assets/Scene/SwitchScene__Wind/Texture/1.jpeg b/assets/Scene/SwitchScene__Wind/Texture/1.jpeg new file mode 100644 index 0000000..83d15a3 Binary files /dev/null and b/assets/Scene/SwitchScene__Wind/Texture/1.jpeg differ diff --git a/assets/Scene/SwitchScene__Wind/Texture/1.jpeg.meta b/assets/Scene/SwitchScene__Wind/Texture/1.jpeg.meta new file mode 100644 index 0000000..d11e707 --- /dev/null +++ b/assets/Scene/SwitchScene__Wind/Texture/1.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "b2f4e362-dd02-49d6-a06b-906c3ca02672", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 408, + "platformSettings": {}, + "subMetas": { + "1": { + "ver": "1.0.4", + "uuid": "5fcabad5-7c95-4e6f-99bf-ca13f2d99ad5", + "rawTextureUuid": "b2f4e362-dd02-49d6-a06b-906c3ca02672", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 408, + "rawWidth": 768, + "rawHeight": 408, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Wind/Texture/2.jpeg b/assets/Scene/SwitchScene__Wind/Texture/2.jpeg new file mode 100644 index 0000000..76561bb Binary files /dev/null and b/assets/Scene/SwitchScene__Wind/Texture/2.jpeg differ diff --git a/assets/Scene/SwitchScene__Wind/Texture/2.jpeg.meta b/assets/Scene/SwitchScene__Wind/Texture/2.jpeg.meta new file mode 100644 index 0000000..7012499 --- /dev/null +++ b/assets/Scene/SwitchScene__Wind/Texture/2.jpeg.meta @@ -0,0 +1,36 @@ +{ + "ver": "2.3.4", + "uuid": "eeb34b6b-b1c6-4817-b294-c80ec548ead1", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 768, + "height": 407, + "platformSettings": {}, + "subMetas": { + "2": { + "ver": "1.0.4", + "uuid": "787409d1-3a04-4ca4-8c29-80efb927b43e", + "rawTextureUuid": "eeb34b6b-b1c6-4817-b294-c80ec548ead1", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 768, + "height": 407, + "rawWidth": 768, + "rawHeight": 407, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg b/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg deleted file mode 100644 index f905b16..0000000 Binary files a/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg.meta b/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg.meta deleted file mode 100644 index 08fc4eb..0000000 --- a/assets/Scene/SwitchScene__Wind/Texture/bg1.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "bf3864af-9883-4b6b-86f4-ce52935cc0b9", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg1": { - "ver": "1.0.4", - "uuid": "6b5b98b4-55cb-4aae-a6aa-58b7edc91500", - "rawTextureUuid": "bf3864af-9883-4b6b-86f4-ce52935cc0b9", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg b/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg deleted file mode 100644 index a5a3c9c..0000000 Binary files a/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg and /dev/null differ diff --git a/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg.meta b/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg.meta deleted file mode 100644 index 0dc9a52..0000000 --- a/assets/Scene/SwitchScene__Wind/Texture/bg2.jpeg.meta +++ /dev/null @@ -1,36 +0,0 @@ -{ - "ver": "2.3.4", - "uuid": "7da0567d-59bf-4c28-9df4-cfa55be5d55d", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1600, - "height": 1200, - "platformSettings": {}, - "subMetas": { - "bg2": { - "ver": "1.0.4", - "uuid": "2bd4baf2-cc8f-4a82-b8bf-c619a9a8d6d1", - "rawTextureUuid": "7da0567d-59bf-4c28-9df4-cfa55be5d55d", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1600, - "height": 1200, - "rawWidth": 1600, - "rawHeight": 1200, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/settings/builder.json b/settings/builder.json index 64ace0a..104ebe6 100755 --- a/settings/builder.json +++ b/settings/builder.json @@ -8,7 +8,7 @@ }, "packageName": "org.cocos2d.helloworld", "startScene": "2d2f792f-a40c-49bb-a189-ed176a246e49", - "title": "hello_world", + "title": "cocos-awesome", "webOrientation": "landscape", "includeSDKBox": false, "inlineSpriteFrames": true, diff --git a/settings/project.json b/settings/project.json index 69d52a1..092a20b 100755 --- a/settings/project.json +++ b/settings/project.json @@ -34,7 +34,7 @@ "height": 640, "width": 960 }, - "last-module-event-record-time": 1591504473893, + "last-module-event-record-time": 1727188221616, "assets-sort-type": "name", "facebook": { "appID": "",