diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index c0114ff..1243c3a 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -12477,7 +12477,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "0089d8d5-1af7-49f8-9d65-7a958b73a895" + "__uuid__": "8699379d-f029-4548-81f3-b5560ac153e1" }, "_type": 0, "_sizeMode": 0, @@ -17582,7 +17582,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "0ddbaa55-7724-43ec-a9e5-7d80a31edacf" + "__uuid__": "b51c6577-3f31-4777-bf4a-6bfad58f0612" }, "_type": 0, "_sizeMode": 1, @@ -19894,8 +19894,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 328, - "height": 66 + "width": 251, + "height": 71 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -26351,7 +26351,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 1080, + "width": 2000, "height": 2600 }, "_anchorPoint": { diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 34c0085..e1ec6ec 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -173,61 +173,61 @@ "__uuid__": "998a24bd-ffa0-4f96-bc39-a9789f42bd9b" }, "adhesive": { - "__uuid__": "217fb6de-e58f-4ff4-878c-a96149c09072" + "__uuid__": "df157ae8-c751-4be5-882b-a7ac2ef6a8b7" }, "freezeBlock": { - "__uuid__": "3a2547c9-d478-4b6c-9feb-39be7e668cdb" + "__uuid__": "9a40b6dd-fe63-4c9b-889b-a4c47ed46cbb" }, "freezeDoor": { - "__uuid__": "fb99c029-2209-426a-bcdc-00c44e829d5b" + "__uuid__": "8a308761-8192-4597-8315-65591ef9b4db" }, "hammer": { - "__uuid__": "482dced8-1d86-4348-a495-e8f7cb5ed097" + "__uuid__": "4a1713d2-c65c-448a-8aba-a29368062363" }, "lockBlock1": { - "__uuid__": "5db2afa1-2d5f-4143-8e75-2d60d53e2b5f" + "__uuid__": "c21b69c0-ab69-472e-9881-72bf2dbb9069" }, "lockBlock2": { - "__uuid__": "cd625c6f-0ec7-4b0a-8578-f9c09c960775" + "__uuid__": "9dc0d948-aa37-4930-b35e-adf8e89cfb81" }, "lockDoor": { - "__uuid__": "ed4f44ae-4f40-4651-a2b1-dc6b2421c6aa" + "__uuid__": "8294e950-449c-403e-a350-740a4d80fb3e" }, "magic1": { - "__uuid__": "df660816-bc8c-43c6-a69d-8696414f97cd" + "__uuid__": "def9458b-4365-40fe-bb61-c7ef3383316f" }, "magic2": { - "__uuid__": "64e6a285-a1ba-4f79-a229-badd784d058c" + "__uuid__": "8629071d-cb1a-42db-b45a-682c1c16ab51" }, "simpleColor": { - "__uuid__": "df5a25cc-713b-48de-b8f7-8e1b3749ab95" + "__uuid__": "a5b58c9e-74be-4c0f-bc1e-10155ecc43eb" }, "stacking": { - "__uuid__": "0f500623-1e6c-400e-9697-f4b5fe52c0c8" + "__uuid__": "3aee0a86-116d-46eb-97ed-bbdb6d62e325" }, "starBlock": { - "__uuid__": "6670d9e7-174f-45b3-9261-d9ac243cc872" + "__uuid__": "c18157da-f131-4808-afc9-dd4b93da0921" }, "timePause1": { - "__uuid__": "aaffceb4-ac2c-4157-b8b6-5525948c09b0" + "__uuid__": "e12beab1-71a4-43cc-a83c-0728fd6b54e0" }, "timePause2": { - "__uuid__": "6d1fd977-6646-41e8-996c-10e889259494" + "__uuid__": "fe65680a-ea0e-40df-83ce-9f6d9ff33ea6" }, "hit1": { - "__uuid__": "6294d41c-881a-4925-9e3a-dfe26b619bcc" + "__uuid__": "73cf4586-058b-46e0-8b76-fa6503225426" }, "hit2": { - "__uuid__": "5336e8fe-c92a-45c1-83cc-75b39c49f2e4" + "__uuid__": "4d23463f-c6fd-471f-ae81-06887ae7ebf9" }, "hit3": { - "__uuid__": "f88118e6-b9f7-4464-a73b-7d44634f3beb" + "__uuid__": "79b137f1-a2ff-441d-9f71-f82c811d264d" }, "hit4": { - "__uuid__": "f2b2f4e1-85cf-40e1-a9ec-f6fd3a252102" + "__uuid__": "c803eb49-bc7b-4b51-9761-998ceee3601a" }, "hit5": { - "__uuid__": "412a25e4-4df5-4426-b0e0-2b3898cd45a4" + "__uuid__": "a2a1098f-bac9-4bb0-b35f-a41bcee2766d" }, "_id": "24lN1LYRdNia3ZOiLsINIp" }, @@ -261,11 +261,14 @@ { "__id__": 8 }, + { + "__id__": 11 + }, { "__id__": 289 }, { - "__id__": 69 + "__id__": 72 }, { "__id__": 333 @@ -441,6 +444,130 @@ "_alignWithScreen": true, "_id": "81GN3uXINKVLeW4+iKSlim" }, + { + "__type__": "cc.Node", + "_name": "bg", + "_objFlags": 0, + "_parent": { + "__id__": 5 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 10 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 1080, + "height": 1920 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "e2DtJec2tHzprX4psCclS5" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 8 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "f79670d6-8e4a-4e61-b781-a48fe0de6044" + }, + "_type": 0, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "47rxTBxMlBq5TBHiYjLPlp" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 8 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 1080, + "_originalHeight": 2340, + "_id": "0a5XlUuGZCprz0fwaiG835" + }, { "__type__": "cc.Node", "_name": "Load", @@ -449,9 +576,6 @@ "__id__": 5 }, "_children": [ - { - "__id__": 9 - }, { "__id__": 12 }, @@ -462,7 +586,10 @@ "__id__": 26 }, { - "__id__": 225 + "__id__": 66 + }, + { + "__id__": 68 }, { "__id__": 227 @@ -531,136 +658,12 @@ "groupIndex": 0, "_id": "b2/1NmDPVCXovcyHPoKEHX" }, - { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "_parent": { - "__id__": 8 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 11 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 1920 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "e2DtJec2tHzprX4psCclS5" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 9 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "f79670d6-8e4a-4e61-b781-a48fe0de6044" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "47rxTBxMlBq5TBHiYjLPlp" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 9 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 45, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 1080, - "_originalHeight": 2340, - "_id": "0a5XlUuGZCprz0fwaiG835" - }, { "__type__": "cc.Node", "_name": "New EditBox", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -1162,7 +1165,7 @@ "_name": "logo", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [], "_active": true, @@ -1254,7 +1257,7 @@ "_name": "Top", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -1271,15 +1274,12 @@ }, { "__id__": 61 - }, - { - "__id__": 65 } ], "_active": true, "_components": [ { - "__id__": 224 + "__id__": 65 } ], "_prefab": null, @@ -3210,22 +3210,145 @@ "handler": "openPause", "customEventData": "" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 26 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 9, + "_left": 540, + "_right": 0, + "_top": 230, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "545kbNtbdB9bmBxlLNbS+4" + }, + { + "__type__": "cc.Node", + "_name": "day", + "_objFlags": 0, + "_parent": { + "__id__": 11 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 67 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 216 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 400, + 493.843, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "7cAlzNSsNKRLF8A0ta1LDJ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 66 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "2352075f-3a7d-4cc5-96b7-c51dd7951e83" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "98eb2872-691f-4fc7-b827-c7f6dd98d242" + }, + "_id": "62ivWLPPhLAaStQtW3HKKn" + }, { "__type__": "cc.Node", "_name": "rank", "_objFlags": 0, "_parent": { - "__id__": 26 + "__id__": 11 }, "_children": [ { - "__id__": 66 + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 226 } ], "_prefab": null, @@ -3252,7 +3375,7 @@ "ctor": "Float64Array", "array": [ 400, - -259.412, + 470.588, 0, 0, 0, @@ -3281,13 +3404,13 @@ "_name": "btn_rank", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 70 } ], "_prefab": null, @@ -3343,7 +3466,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 69 }, "_enabled": true, "_normalMaterial": null, @@ -3352,7 +3475,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 68 + "__id__": 71 } ], "_N$interactable": true, @@ -3420,14 +3543,14 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 65 + "__id__": 68 }, "_id": "deIWnyjYRA1b/sHcjjXj0D" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 69 + "__id__": 72 }, "component": "", "_componentId": "83533ha7L1Hn4Ep+rvR3z5k", @@ -3443,10 +3566,7 @@ }, "_children": [ { - "__id__": 70 - }, - { - "__id__": 75 + "__id__": 73 }, { "__id__": 78 @@ -3458,10 +3578,10 @@ "__id__": 84 }, { - "__id__": 96 + "__id__": 87 }, { - "__id__": 183 + "__id__": 99 }, { "__id__": 186 @@ -3470,29 +3590,32 @@ "__id__": 189 }, { - "__id__": 194 + "__id__": 192 }, { - "__id__": 201 + "__id__": 197 }, { - "__id__": 208 + "__id__": 204 }, { - "__id__": 214 + "__id__": 211 + }, + { + "__id__": 217 } ], "_active": false, "_components": [ { - "__id__": 220 + "__id__": 223 }, { - "__id__": 221 + "__id__": 224 } ], "_prefab": { - "__id__": 222 + "__id__": 225 }, "_opacity": 255, "_color": { @@ -3546,23 +3669,23 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 74 }, { - "__id__": 72 + "__id__": 75 }, { - "__id__": 73 + "__id__": 76 } ], "_prefab": { - "__id__": 74 + "__id__": 77 }, "_opacity": 150, "_color": { @@ -3616,7 +3739,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 73 }, "_enabled": true, "_materials": [ @@ -3648,7 +3771,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 73 }, "_enabled": true, "alignMode": 1, @@ -3675,7 +3798,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 73 }, "_enabled": true, "_id": "7fMlG3McNKXbaEA+pGgESJ" @@ -3683,7 +3806,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -3696,17 +3819,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 76 + "__id__": 79 } ], "_prefab": { - "__id__": 77 + "__id__": 80 }, "_opacity": 255, "_color": { @@ -3760,7 +3883,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 78 }, "_enabled": true, "_materials": [ @@ -3790,7 +3913,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -3803,17 +3926,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 82 } ], "_prefab": { - "__id__": 80 + "__id__": 83 }, "_opacity": 255, "_color": { @@ -3867,7 +3990,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 78 + "__id__": 81 }, "_enabled": true, "_materials": [ @@ -3897,7 +4020,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -3910,17 +4033,17 @@ "_name": "tanchaungrank2", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 85 } ], "_prefab": { - "__id__": 83 + "__id__": 86 }, "_opacity": 255, "_color": { @@ -3974,7 +4097,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 81 + "__id__": 84 }, "_enabled": true, "_materials": [ @@ -4004,7 +4127,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4017,24 +4140,24 @@ "_name": "rank", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 85 + "__id__": 88 }, { - "__id__": 88 + "__id__": 91 } ], "_active": false, "_components": [ { - "__id__": 94 + "__id__": 97 } ], "_prefab": { - "__id__": 95 + "__id__": 98 }, "_opacity": 255, "_color": { @@ -4088,17 +4211,17 @@ "_name": "SubContextView", "_objFlags": 0, "_parent": { - "__id__": 84 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 89 } ], "_prefab": { - "__id__": 87 + "__id__": 90 }, "_opacity": 255, "_color": { @@ -4152,7 +4275,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 85 + "__id__": 88 }, "_enabled": true, "_firstlyEnabled": true, @@ -4162,7 +4285,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4175,21 +4298,21 @@ "_name": "btnsq", "_objFlags": 0, "_parent": { - "__id__": 84 + "__id__": 87 }, "_children": [ { - "__id__": 89 + "__id__": 92 } ], "_active": false, "_components": [ { - "__id__": 91 + "__id__": 94 } ], "_prefab": { - "__id__": 93 + "__id__": 96 }, "_opacity": 255, "_color": { @@ -4243,13 +4366,13 @@ "_name": "sq", "_objFlags": 0, "_parent": { - "__id__": 88 + "__id__": 91 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 90 + "__id__": 93 }, "_opacity": 255, "_color": { @@ -4301,7 +4424,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4314,7 +4437,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 88 + "__id__": 91 }, "_enabled": true, "_normalMaterial": null, @@ -4323,7 +4446,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 92 + "__id__": 95 } ], "_N$interactable": true, @@ -4384,7 +4507,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 69 + "__id__": 72 }, "component": "", "_componentId": "83533ha7L1Hn4Ep+rvR3z5k", @@ -4394,7 +4517,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4407,7 +4530,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 87 }, "_enabled": true, "alignMode": 1, @@ -4432,7 +4555,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4445,30 +4568,30 @@ "_name": "word_rank", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 97 + "__id__": 100 }, { - "__id__": 101 + "__id__": 104 }, { - "__id__": 148 + "__id__": 151 } ], "_active": true, "_components": [ { - "__id__": 180 + "__id__": 183 }, { - "__id__": 181 + "__id__": 184 } ], "_prefab": { - "__id__": 182 + "__id__": 185 }, "_opacity": 255, "_color": { @@ -4522,20 +4645,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 96 + "__id__": 99 }, "_children": [], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 101 }, { - "__id__": 99 + "__id__": 102 } ], "_prefab": { - "__id__": 100 + "__id__": 103 }, "_opacity": 255, "_color": { @@ -4589,7 +4712,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 97 + "__id__": 100 }, "_enabled": true, "_id": "cd3DFXBHpGJobXun6zf91F" @@ -4599,7 +4722,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 97 + "__id__": 100 }, "_enabled": true, "alignMode": 1, @@ -4624,7 +4747,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -4637,27 +4760,27 @@ "_name": "ScrollView", "_objFlags": 0, "_parent": { - "__id__": 96 + "__id__": 99 }, "_children": [ { - "__id__": 102 + "__id__": 105 }, { - "__id__": 109 + "__id__": 112 } ], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 110 }, { - "__id__": 146 + "__id__": 149 } ], "_prefab": { - "__id__": 147 + "__id__": 150 }, "_opacity": 255, "_color": { @@ -4711,27 +4834,27 @@ "_name": "scrollBar", "_objFlags": 0, "_parent": { - "__id__": 101 + "__id__": 104 }, "_children": [ { - "__id__": 103 + "__id__": 106 } ], "_active": false, "_components": [ { - "__id__": 106 + "__id__": 109 }, { - "__id__": 143 + "__id__": 146 }, { - "__id__": 144 + "__id__": 147 } ], "_prefab": { - "__id__": 145 + "__id__": 148 }, "_opacity": 255, "_color": { @@ -4785,17 +4908,17 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 102 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 107 } ], "_prefab": { - "__id__": 105 + "__id__": 108 }, "_opacity": 255, "_color": { @@ -4849,7 +4972,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 103 + "__id__": 106 }, "_enabled": true, "_materials": [ @@ -4879,7 +5002,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 101 + "__id__": 104 }, "asset": { "__uuid__": "a6f24311-4ed3-40fb-a959-eab2047ab70d" @@ -4892,18 +5015,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "_scrollView": { - "__id__": 107 + "__id__": 110 }, "_touching": false, "_opacity": 255, "enableAutoHide": true, "autoHideTime": 1, "_N$handle": { - "__id__": 104 + "__id__": 107 }, "_N$direction": 1, "_id": "b3IBYZnN9MNJcjYCfCXCjZ" @@ -4913,7 +5036,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 101 + "__id__": 104 }, "_enabled": true, "horizontal": false, @@ -4925,14 +5048,14 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 108 + "__id__": 111 }, "content": { - "__id__": 108 + "__id__": 111 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": { - "__id__": 106 + "__id__": 109 }, "_id": "2a8hyyK7lCELB7KL3Sr3ZQ" }, @@ -4941,17 +5064,17 @@ "_name": "content", "_objFlags": 0, "_parent": { - "__id__": 109 + "__id__": 112 }, "_children": [ { - "__id__": 112 + "__id__": 115 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 142 + "__id__": 145 }, "_opacity": 255, "_color": { @@ -5005,21 +5128,21 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 101 + "__id__": 104 }, "_children": [ { - "__id__": 108 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 113 } ], "_prefab": { - "__id__": 111 + "__id__": 114 }, "_opacity": 255, "_color": { @@ -5073,7 +5196,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 109 + "__id__": 112 }, "_enabled": true, "_materials": [ @@ -5091,7 +5214,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 101 + "__id__": 104 }, "asset": { "__uuid__": "a6f24311-4ed3-40fb-a959-eab2047ab70d" @@ -5104,12 +5227,9 @@ "_name": "RankListItem", "_objFlags": 0, "_parent": { - "__id__": 108 + "__id__": 111 }, "_children": [ - { - "__id__": 113 - }, { "__id__": 116 }, @@ -5120,23 +5240,26 @@ "__id__": 122 }, { - "__id__": 124 + "__id__": 125 }, { - "__id__": 135 + "__id__": 127 }, { - "__id__": 137 + "__id__": 138 + }, + { + "__id__": 140 } ], "_active": true, "_components": [ { - "__id__": 140 + "__id__": 143 } ], "_prefab": { - "__id__": 141 + "__id__": 144 }, "_opacity": 255, "_color": { @@ -5190,17 +5313,17 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 114 + "__id__": 117 } ], "_prefab": { - "__id__": 115 + "__id__": 118 }, "_opacity": 255, "_color": { @@ -5254,7 +5377,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 116 }, "_enabled": true, "_materials": [ @@ -5286,7 +5409,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5299,17 +5422,17 @@ "_name": "pic", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 117 + "__id__": 120 } ], "_prefab": { - "__id__": 118 + "__id__": 121 }, "_opacity": 255, "_color": { @@ -5363,7 +5486,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 119 }, "_enabled": true, "_materials": [ @@ -5391,7 +5514,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5404,17 +5527,17 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 123 } ], "_prefab": { - "__id__": 121 + "__id__": 124 }, "_opacity": 255, "_color": { @@ -5468,7 +5591,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 119 + "__id__": 122 }, "_enabled": true, "_materials": [ @@ -5500,7 +5623,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5513,13 +5636,13 @@ "_name": "rankLab", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 123 + "__id__": 126 }, "_opacity": 255, "_color": { @@ -5571,7 +5694,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5584,23 +5707,23 @@ "_name": "rank", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [ - { - "__id__": 125 - }, { "__id__": 128 }, { "__id__": 131 + }, + { + "__id__": 134 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 134 + "__id__": 137 }, "_opacity": 255, "_color": { @@ -5654,17 +5777,17 @@ "_name": "one", "_objFlags": 0, "_parent": { - "__id__": 124 + "__id__": 127 }, "_children": [], "_active": false, "_components": [ { - "__id__": 126 + "__id__": 129 } ], "_prefab": { - "__id__": 127 + "__id__": 130 }, "_opacity": 255, "_color": { @@ -5718,7 +5841,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 128 }, "_enabled": true, "_materials": [ @@ -5750,7 +5873,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5763,17 +5886,17 @@ "_name": "two", "_objFlags": 0, "_parent": { - "__id__": 124 + "__id__": 127 }, "_children": [], "_active": false, "_components": [ { - "__id__": 129 + "__id__": 132 } ], "_prefab": { - "__id__": 130 + "__id__": 133 }, "_opacity": 255, "_color": { @@ -5827,7 +5950,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 128 + "__id__": 131 }, "_enabled": true, "_materials": [ @@ -5859,7 +5982,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5872,17 +5995,17 @@ "_name": "three", "_objFlags": 0, "_parent": { - "__id__": 124 + "__id__": 127 }, "_children": [], "_active": false, "_components": [ { - "__id__": 132 + "__id__": 135 } ], "_prefab": { - "__id__": 133 + "__id__": 136 }, "_opacity": 255, "_color": { @@ -5936,7 +6059,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 131 + "__id__": 134 }, "_enabled": true, "_materials": [ @@ -5968,7 +6091,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5979,7 +6102,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -5992,13 +6115,13 @@ "_name": "totalLab", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 136 + "__id__": 139 }, "_opacity": 255, "_color": { @@ -6050,7 +6173,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -6063,17 +6186,17 @@ "_name": "nameLab", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 115 }, "_children": [], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 141 } ], "_prefab": { - "__id__": 139 + "__id__": 142 }, "_opacity": 255, "_color": { @@ -6127,7 +6250,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 137 + "__id__": 140 }, "_enabled": true, "_materials": [ @@ -6158,7 +6281,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -6171,7 +6294,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 112 + "__id__": 115 }, "_enabled": true, "defaultsprite": { @@ -6185,7 +6308,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 112 + "__id__": 115 }, "asset": { "__uuid__": "fced03b8-5472-40ad-be0f-810011a3d0ac" @@ -6196,7 +6319,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 101 + "__id__": 104 }, "asset": { "__uuid__": "a6f24311-4ed3-40fb-a959-eab2047ab70d" @@ -6209,7 +6332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "alignMode": 0, @@ -6236,7 +6359,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "_materials": [ @@ -6266,7 +6389,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 101 + "__id__": 104 }, "asset": { "__uuid__": "a6f24311-4ed3-40fb-a959-eab2047ab70d" @@ -6279,11 +6402,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 101 + "__id__": 104 }, "_enabled": true, "itemRender": { - "__id__": 112 + "__id__": 115 }, "type": 2, "startAxis": 2, @@ -6299,7 +6422,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 101 + "__id__": 104 }, "asset": { "__uuid__": "a6f24311-4ed3-40fb-a959-eab2047ab70d" @@ -6312,12 +6435,9 @@ "_name": "selfNode", "_objFlags": 0, "_parent": { - "__id__": 96 + "__id__": 99 }, "_children": [ - { - "__id__": 149 - }, { "__id__": 152 }, @@ -6328,22 +6448,25 @@ "__id__": 158 }, { - "__id__": 160 + "__id__": 161 }, { - "__id__": 171 + "__id__": 163 }, { - "__id__": 173 + "__id__": 174 }, { "__id__": 176 + }, + { + "__id__": 179 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 179 + "__id__": 182 }, "_opacity": 0, "_color": { @@ -6397,17 +6520,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 153 } ], "_prefab": { - "__id__": 151 + "__id__": 154 }, "_opacity": 255, "_color": { @@ -6461,7 +6584,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 149 + "__id__": 152 }, "_enabled": true, "_materials": [ @@ -6493,7 +6616,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -6506,17 +6629,17 @@ "_name": "pic", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 156 } ], "_prefab": { - "__id__": 154 + "__id__": 157 }, "_opacity": 255, "_color": { @@ -6570,7 +6693,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 152 + "__id__": 155 }, "_enabled": true, "_materials": [ @@ -6598,7 +6721,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -6611,17 +6734,17 @@ "_name": "icon", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 156 + "__id__": 159 } ], "_prefab": { - "__id__": 157 + "__id__": 160 }, "_opacity": 255, "_color": { @@ -6675,7 +6798,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 158 }, "_enabled": true, "_materials": [ @@ -6707,7 +6830,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -6720,13 +6843,13 @@ "_name": "rankLab", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 159 + "__id__": 162 }, "_opacity": 255, "_color": { @@ -6778,7 +6901,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -6791,23 +6914,23 @@ "_name": "rank", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [ - { - "__id__": 161 - }, { "__id__": 164 }, { "__id__": 167 + }, + { + "__id__": 170 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 170 + "__id__": 173 }, "_opacity": 255, "_color": { @@ -6861,17 +6984,17 @@ "_name": "one", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 163 }, "_children": [], "_active": false, "_components": [ { - "__id__": 162 + "__id__": 165 } ], "_prefab": { - "__id__": 163 + "__id__": 166 }, "_opacity": 255, "_color": { @@ -6925,7 +7048,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 161 + "__id__": 164 }, "_enabled": true, "_materials": [ @@ -6957,7 +7080,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -6970,17 +7093,17 @@ "_name": "two", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 163 }, "_children": [], "_active": false, "_components": [ { - "__id__": 165 + "__id__": 168 } ], "_prefab": { - "__id__": 166 + "__id__": 169 }, "_opacity": 255, "_color": { @@ -7034,7 +7157,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 164 + "__id__": 167 }, "_enabled": true, "_materials": [ @@ -7066,7 +7189,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7079,17 +7202,17 @@ "_name": "three", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 163 }, "_children": [], "_active": false, "_components": [ { - "__id__": 168 + "__id__": 171 } ], "_prefab": { - "__id__": 169 + "__id__": 172 }, "_opacity": 255, "_color": { @@ -7143,7 +7266,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 170 }, "_enabled": true, "_materials": [ @@ -7175,7 +7298,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7186,7 +7309,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7199,13 +7322,13 @@ "_name": "totalLab", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 172 + "__id__": 175 }, "_opacity": 255, "_color": { @@ -7257,7 +7380,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7270,17 +7393,17 @@ "_name": "nameLab", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 174 + "__id__": 177 } ], "_prefab": { - "__id__": 175 + "__id__": 178 }, "_opacity": 255, "_color": { @@ -7334,7 +7457,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 173 + "__id__": 176 }, "_enabled": true, "_materials": [ @@ -7365,7 +7488,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7378,17 +7501,17 @@ "_name": "add", "_objFlags": 0, "_parent": { - "__id__": 148 + "__id__": 151 }, "_children": [], "_active": false, "_components": [ { - "__id__": 177 + "__id__": 180 } ], "_prefab": { - "__id__": 178 + "__id__": 181 }, "_opacity": 255, "_color": { @@ -7442,7 +7565,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 176 + "__id__": 179 }, "_enabled": true, "_materials": [ @@ -7474,7 +7597,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7485,7 +7608,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7498,7 +7621,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 99 }, "_enabled": true, "alignMode": 1, @@ -7525,18 +7648,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 99 }, "_enabled": true, "phone": { - "__id__": 153 + "__id__": 156 }, "_id": "21VTm4fhBMDaLhexTG6OPa" }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7549,17 +7672,17 @@ "_name": "title", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 184 + "__id__": 187 } ], "_prefab": { - "__id__": 185 + "__id__": 188 }, "_opacity": 255, "_color": { @@ -7613,7 +7736,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 183 + "__id__": 186 }, "_enabled": true, "_materials": [ @@ -7643,7 +7766,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7656,17 +7779,17 @@ "_name": "bg", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 190 } ], "_prefab": { - "__id__": 188 + "__id__": 191 }, "_opacity": 255, "_color": { @@ -7720,7 +7843,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 189 }, "_enabled": true, "_materials": [ @@ -7750,7 +7873,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7763,20 +7886,20 @@ "_name": "closet", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 193 }, { - "__id__": 191 + "__id__": 194 } ], "_prefab": { - "__id__": 193 + "__id__": 196 }, "_opacity": 255, "_color": { @@ -7830,7 +7953,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 189 + "__id__": 192 }, "_enabled": true, "_materials": [ @@ -7864,7 +7987,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 189 + "__id__": 192 }, "_enabled": true, "_normalMaterial": null, @@ -7873,7 +7996,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 192 + "__id__": 195 } ], "_N$interactable": true, @@ -7929,14 +8052,14 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 189 + "__id__": 192 }, "_id": "21GiWEPJpHd42ZOQWtcUfn" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 69 + "__id__": 72 }, "component": "", "_componentId": "83533ha7L1Hn4Ep+rvR3z5k", @@ -7946,7 +8069,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -7959,21 +8082,21 @@ "_name": "friend_close", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 195 + "__id__": 198 } ], "_active": true, "_components": [ { - "__id__": 199 + "__id__": 202 } ], "_prefab": { - "__id__": 200 + "__id__": 203 }, "_opacity": 255, "_color": { @@ -8027,17 +8150,17 @@ "_name": "New Button", "_objFlags": 0, "_parent": { - "__id__": 194 + "__id__": 197 }, "_children": [], "_active": true, "_components": [ { - "__id__": 196 + "__id__": 199 } ], "_prefab": { - "__id__": 198 + "__id__": 201 }, "_opacity": 255, "_color": { @@ -8091,7 +8214,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 195 + "__id__": 198 }, "_enabled": true, "_normalMaterial": null, @@ -8100,7 +8223,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 197 + "__id__": 200 } ], "_N$interactable": true, @@ -8168,14 +8291,14 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 195 + "__id__": 198 }, "_id": "24SbsEZ/JL+bsKZyvFpnrJ" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 69 + "__id__": 72 }, "component": "", "_componentId": "83533ha7L1Hn4Ep+rvR3z5k", @@ -8185,7 +8308,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8198,7 +8321,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 194 + "__id__": 197 }, "_enabled": true, "_materials": [ @@ -8228,7 +8351,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8241,21 +8364,21 @@ "_name": "player_close", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 202 + "__id__": 205 } ], "_active": true, "_components": [ { - "__id__": 206 + "__id__": 209 } ], "_prefab": { - "__id__": 207 + "__id__": 210 }, "_opacity": 255, "_color": { @@ -8309,17 +8432,17 @@ "_name": "New Button", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 204 }, "_children": [], "_active": true, "_components": [ { - "__id__": 203 + "__id__": 206 } ], "_prefab": { - "__id__": 205 + "__id__": 208 }, "_opacity": 255, "_color": { @@ -8373,7 +8496,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 205 }, "_enabled": true, "_normalMaterial": null, @@ -8382,7 +8505,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 204 + "__id__": 207 } ], "_N$interactable": true, @@ -8450,14 +8573,14 @@ "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" }, "_N$target": { - "__id__": 202 + "__id__": 205 }, "_id": "07+klLm2RB1Ymuv75IZWg6" }, { "__type__": "cc.ClickEvent", "target": { - "__id__": 69 + "__id__": 72 }, "component": "", "_componentId": "83533ha7L1Hn4Ep+rvR3z5k", @@ -8467,7 +8590,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8480,7 +8603,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 201 + "__id__": 204 }, "_enabled": true, "_materials": [ @@ -8510,7 +8633,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8523,21 +8646,21 @@ "_name": "word", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 209 + "__id__": 212 } ], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 215 } ], "_prefab": { - "__id__": 213 + "__id__": 216 }, "_opacity": 255, "_color": { @@ -8591,17 +8714,17 @@ "_name": "player_open", "_objFlags": 0, "_parent": { - "__id__": 208 + "__id__": 211 }, "_children": [], "_active": true, "_components": [ { - "__id__": 210 + "__id__": 213 } ], "_prefab": { - "__id__": 211 + "__id__": 214 }, "_opacity": 255, "_color": { @@ -8655,7 +8778,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 209 + "__id__": 212 }, "_enabled": true, "_materials": [ @@ -8685,7 +8808,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8698,7 +8821,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 208 + "__id__": 211 }, "_enabled": true, "_materials": [ @@ -8728,7 +8851,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8741,21 +8864,21 @@ "_name": "friend", "_objFlags": 0, "_parent": { - "__id__": 69 + "__id__": 72 }, "_children": [ { - "__id__": 215 + "__id__": 218 } ], "_active": false, "_components": [ { - "__id__": 218 + "__id__": 221 } ], "_prefab": { - "__id__": 219 + "__id__": 222 }, "_opacity": 255, "_color": { @@ -8809,17 +8932,17 @@ "_name": "friend_open", "_objFlags": 0, "_parent": { - "__id__": 214 + "__id__": 217 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 219 } ], "_prefab": { - "__id__": 217 + "__id__": 220 }, "_opacity": 255, "_color": { @@ -8873,7 +8996,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 215 + "__id__": 218 }, "_enabled": true, "_materials": [ @@ -8903,7 +9026,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8916,7 +9039,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 214 + "__id__": 217 }, "_enabled": true, "_materials": [ @@ -8946,7 +9069,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -8959,7 +9082,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 72 }, "_enabled": true, "alignMode": 1, @@ -8986,23 +9109,23 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 72 }, "_enabled": true, "ui": { "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" }, "subContextView": { - "__id__": 85 + "__id__": 88 }, "closeButton": { - "__id__": 69 + "__id__": 72 }, "btnRanks": { - "__id__": 69 + "__id__": 72 }, "selfNode": { - "__id__": 148 + "__id__": 151 }, "defaultsprite": { "__uuid__": "46896dd3-d3de-4947-b2dd-eb2b1b69bef1" @@ -9012,7 +9135,7 @@ { "__type__": "cc.PrefabInfo", "root": { - "__id__": 69 + "__id__": 72 }, "asset": { "__uuid__": "87c131ed-1e2f-4cf8-9fe0-0d7d49f73c5b" @@ -9025,7 +9148,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 68 }, "_enabled": true, "_materials": [ @@ -9054,135 +9177,12 @@ }, "_id": "69/XINrB1MYIBw3SSAW6HT" }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 26 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 1, - "_left": 0, - "_right": 0, - "_top": 230, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "545kbNtbdB9bmBxlLNbS+4" - }, - { - "__type__": "cc.Node", - "_name": "day", - "_objFlags": 0, - "_parent": { - "__id__": 8 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 226 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 216 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 400, - 493.843, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "7cAlzNSsNKRLF8A0ta1LDJ" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 225 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "2352075f-3a7d-4cc5-96b7-c51dd7951e83" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "98eb2872-691f-4fc7-b827-c7f6dd98d242" - }, - "_id": "62ivWLPPhLAaStQtW3HKKn" - }, { "__type__": "cc.Node", "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -9439,7 +9439,7 @@ "_name": "startBtn", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -9485,7 +9485,7 @@ "ctor": "Float64Array", "array": [ 0, - -684.946, + -684, 0, 0, 0, @@ -9896,7 +9896,7 @@ "_name": "tiaodik", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -11837,7 +11837,7 @@ "_name": "shezhiBtn", "_objFlags": 0, "_parent": { - "__id__": 8 + "__id__": 11 }, "_children": [ { @@ -12144,7 +12144,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 8 + "__id__": 11 }, "_enabled": true, "alignMode": 1, diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index fb0231a..16c2d88 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -352,6 +352,67 @@ export default class JiaZai extends cc.Component { console.log("HomeScene广告预加载初始化失败"); } }); + + this.setAdaptation(); + } + + setAdaptation() { + const hmScale = cc.fx.GameTool.adaptation() + + if (hmScale == 1) return; + console.log("HomeSceneScale", this.node.scale, hmScale); + const loadNode = this.node.getChildByName("Load"); + if (loadNode) { + // 获取屏幕设计分辨率 + const designSize = cc.view.getDesignResolutionSize(); + // 获取实际屏幕尺寸 + const frameSize = cc.view.getFrameSize(); + // 计算缩放因子 + const scaleX = frameSize.width / designSize.width; + const scaleY = frameSize.height / designSize.height; + // 取最小缩放因子保持比例 + const scale = Math.min(scaleX, scaleY); + + // 计算黑边宽度 (如果有的话) + let barWidth = 0; + if (scaleX > scaleY) { + // 左右有黑边 + barWidth = (frameSize.width - designSize.width * scale) / 2; + } + + loadNode.scale = hmScale; + + // 适配右边的元素,保持与右边框距离不变 + const rightElements = [ + "tiaodik", + "shezhiBtn", + "rank", + "Pause", + "topRank" + ]; + + rightElements.forEach(elementName => { + let element; + if (elementName === "rank" || elementName === "Pause") { + element = this.node.getChildByName(elementName); + } else if (elementName === "topRank") { + element = loadNode.getChildByName("rank"); + } else { + element = loadNode.getChildByName(elementName); + } + + if (element) { + // 保存原始x位置作为距离右边的距离参考 + if (!element.originalRightOffset) { + element.originalRightOffset = designSize.width / 2 - element.x; + } + + // 根据屏幕适配调整位置,保持与右边框距离一致 + element.x = designSize.width / 2 - element.originalRightOffset + barWidth / scale; + element.scale = hmScale; + } + }); + } } checkDailyQuests() { @@ -438,9 +499,10 @@ export default class JiaZai extends cc.Component { let pauseNode = health.getChildByName("heath"); cc.fx.AudioManager._instance.playEffect("tanchuang", null); pauseNode.scale = 0.3; + const hmScale = cc.fx.GameTool.adaptation() cc.tween(pauseNode) - .to(0.2, { scale: 1.05 }, { easing: 'backOut' }) - .to(0.15, { scale: 1.0 }, { easing: 'sineOut' }) + .to(0.2, { scale: 1.05 * hmScale }, { easing: 'backOut' }) + .to(0.15, { scale: 1.0 * hmScale }, { easing: 'sineOut' }) .start(); // 启动弹窗自己的倒计时 if (cc.fx.GameConfig.GM_INFO.hp < cc.fx.GameConfig.GM_INFO.hp_Max) { diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index 2f2d5f8..98d0bd6 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -540,9 +540,9 @@ export default class MapConroler extends cc.Component { } // 开始游戏时 清空道具 如果是第 8 11 16 默认给一个道具 - cc.fx.GameConfig.GM_INFO.hammerAmount = 5; - cc.fx.GameConfig.GM_INFO.freezeAmount = 5; - cc.fx.GameConfig.GM_INFO.magicAmount = 5; + cc.fx.GameConfig.GM_INFO.hammerAmount = 0; + cc.fx.GameConfig.GM_INFO.freezeAmount = 0; + cc.fx.GameConfig.GM_INFO.magicAmount = 0; if (cc.fx.GameConfig.GM_INFO.level + 1 == 8) { cc.fx.GameConfig.GM_INFO.hammerAmount = 1; } @@ -2183,7 +2183,7 @@ export default class MapConroler extends cc.Component { console.log("复活回调函数内", data); this.isreview = true; const dataTemp = { - change_reason: "share", + change_reason: "ad", id: "2000", num: 1 } @@ -3523,10 +3523,35 @@ export default class MapConroler extends cc.Component { } // this.node.scale = 1; - cc.fx.GameConfig.GM_INFO.scale = this.node.scale; // this.node.scale = 0.5; // console.log(this.node.scale); // this.node.scale = 1; + + const gmScale = cc.fx.GameTool.adaptation() + this.node.scale = this.node.scale * gmScale; + + const topNode = this.node.parent.getChildByName("Top"); + topNode.scale = gmScale; + if (topNode) { + if (gmScale == 0.7) { + // 修改Widget的top属性 + const widget = topNode.getComponent(cc.Widget); + if (widget) { + widget.top -= 60; // 减去偏移量使节点向上移动 + widget.updateAlignment(); // 强制更新对齐 + } + this.node.y = this.node.y + 40; + } else { + + } + } + this.node.parent.parent.getChildByName("Win").scale = gmScale; + this.node.parent.parent.getChildByName("Lose").scale = gmScale; + this.node.parent.parent.getChildByName("propWindow").scale = gmScale; + this.node.parent.parent.getChildByName("guidet").scale = gmScale; + this.node.parent.parent.parent.getChildByName("Pause").scale = gmScale; + + cc.fx.GameConfig.GM_INFO.scale = this.node.scale; } //创建门的粒子特效 diff --git a/assets/Script/heathnum.ts b/assets/Script/heathnum.ts index 2b1385f..a4b1aac 100644 --- a/assets/Script/heathnum.ts +++ b/assets/Script/heathnum.ts @@ -24,11 +24,6 @@ export default class NewClass extends cc.Component { @property([cc.Node]) switchButtons: cc.Node[] = []; - @property(cc.Sprite) - share_img: cc.Sprite = null; - - @property(cc.Sprite) - ad_img: cc.Sprite = null; //金币花费数 // @property(cc.Node) // coin: cc.Node = null; @@ -37,19 +32,23 @@ export default class NewClass extends cc.Component { onLoad() { this.btn_Touch = true; - if (cc.fx.GameTool.canObtainByShare("health")) { - this.share_img.node.active = true; - - this.ad_img.node.active = false; - } else { - this.share_img.node.active = false; - - this.ad_img.node.active = true; - } } start() { this.btn_Touch = true; this.openPop(); + this.initUI(); + } + + initUI() { + if (this.switchButtons[1] && this.switchButtons[1].childrenCount > 1) { + if (cc.fx.GameTool.canObtainByShare("health")) { + this.switchButtons[1].getChildByName("share_img").active = true; + this.switchButtons[1].getChildByName("ad_img").active = false; + } else { + this.switchButtons[1].getChildByName("share_img").active = false; + this.switchButtons[1].getChildByName("ad_img").active = true; + } + } } //打开商店界面 openPop() { @@ -86,7 +85,7 @@ export default class NewClass extends cc.Component { // if (curCoin >= 1000) { // cc.fx.GameConfig.GM_INFO.hp = 1; // 测试时不通过微信分享使用 - var callback = function (isType) { + var callback = function (isType, shareOrAd) { //// 分享成功后才执行以下代码 if (isType == true) { console.log("分享得体力"); @@ -108,6 +107,15 @@ export default class NewClass extends cc.Component { }) cc.fx.GameTool.addShareCount("health") + + const data = { + change_reason: shareOrAd, // share or ad + id: 1002, + num: 1, + compensate: false + } + cc.fx.GameTool.shushu_Track("resource_get", data); + } } diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index fd89860..7c0eb0f 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -663,7 +663,7 @@ var GameTool = { //@ts-ignore if (typeof wx !== 'undefined' && wx !== null) { - var cb = function (isType) { + var cb = function (isType, shareOrAd) { if (isType) { let num = 1; //3 @@ -696,7 +696,7 @@ var GameTool = { }) const data = { - change_reason: "share", + change_reason: shareOrAd, // share or ad id: propid, num: num, compensate: false @@ -1405,7 +1405,7 @@ var GameTool = { icon: 'success', duration: 2000 }); - callback(true); // 回调表示分享成功 + callback(true, "share"); // 回调表示分享成功 }; // 分享失败的处理函数 @@ -1548,7 +1548,7 @@ var GameTool = { data.is_complete_play = true; MiniGameSdk.API.showToast('用户看完广告,可以奖励'); cc.fx.GameTool.shushu_Track("ad_close", data); - callback(true); + callback(true, "ad"); // 广告观看成功后,立即开始下一次预加载 cc.fx.GameTool.preloadRewardedVideoAd(true); break; @@ -1749,5 +1749,29 @@ var GameTool = { }); }, + // 适配 + adaptation: function () { + // 获取屏幕尺寸 + const screenSize = cc.winSize; + const screenWidth = screenSize.width; + const screenHeight = screenSize.height; + + // 设计分辨率 + const designWidth = 640; + const designHeight = 960; + + // 计算屏幕和设计比例 + const screenRatio = screenWidth / screenHeight; + const designRatio = designWidth / designHeight; + + // console.log("屏幕尺寸:" + screenWidth + "x" + screenHeight + " 比例:" + screenRatio + " 设计比例:" + designRatio); + if (screenRatio > designRatio) { + // 平板设备使用0.7倍缩放 + return 0.7; + } else { + // 其他设备使用正常1倍缩放 + return 1; + } + }, }; export { GameTool }; \ No newline at end of file diff --git a/assets/prefab/prop/floor.prefab b/assets/prefab/prop/floor.prefab index 70da971..acc871d 100644 --- a/assets/prefab/prop/floor.prefab +++ b/assets/prefab/prop/floor.prefab @@ -395,7 +395,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "68f1b13a-0814-4df0-be3b-f21d7e348355" + "__uuid__": "bf466385-9217-4638-9303-06ab8e162fb8" }, "_type": 0, "_sizeMode": 1, @@ -412,7 +412,7 @@ "_id": "" }, { - "__type__": "080952L8J5OuKlcs1LLoVSM", + "__type__": "88e82r7InJI2oeFz0fji7XQ", "_name": "", "_objFlags": 0, "node": {