diff --git a/assets/prefabs/PageHome.prefab b/assets/prefabs/PageHome.prefab index f2fe7fa..d06d051 100644 --- a/assets/prefabs/PageHome.prefab +++ b/assets/prefabs/PageHome.prefab @@ -615,9 +615,9 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_string": "好友挑战", @@ -730,7 +730,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -796,7 +796,7 @@ "a": 255 }, "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "e1267c1b-ceb0-4483-b36d-bc9cb4d2fd26@f9941", "__expectedType__": "cc.SpriteFrame" }, "_hoverSprite": { diff --git a/assets/prefabs/PageLevel.prefab b/assets/prefabs/PageLevel.prefab index e009871..5a30d13 100644 --- a/assets/prefabs/PageLevel.prefab +++ b/assets/prefabs/PageLevel.prefab @@ -25,44 +25,44 @@ "__id__": 10 }, { - "__id__": 56 + "__id__": 50 }, { - "__id__": 66 + "__id__": 60 }, { - "__id__": 84 + "__id__": 78 }, { - "__id__": 102 + "__id__": 96 }, { - "__id__": 200 + "__id__": 194 }, { - "__id__": 226 + "__id__": 220 }, { - "__id__": 242 + "__id__": 236 } ], "_active": true, "_components": [ + { + "__id__": 252 + }, + { + "__id__": 254 + }, + { + "__id__": 256 + }, { "__id__": 258 - }, - { - "__id__": 260 - }, - { - "__id__": 262 - }, - { - "__id__": 264 } ], "_prefab": { - "__id__": 266 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -269,17 +269,17 @@ "_active": true, "_components": [ { - "__id__": 49 + "__id__": 43 }, { - "__id__": 51 + "__id__": 45 }, { - "__id__": 53 + "__id__": 47 } ], "_prefab": { - "__id__": 55 + "__id__": 49 }, "_lpos": { "__type__": "cc.Vec3", @@ -465,14 +465,14 @@ "_active": true, "_components": [ { - "__id__": 44 + "__id__": 38 }, { - "__id__": 46 + "__id__": 40 } ], "_prefab": { - "__id__": 48 + "__id__": 42 }, "_lpos": { "__type__": "cc.Vec3", @@ -799,29 +799,25 @@ "_parent": { "__id__": 17 }, - "_children": [ - { - "__id__": 31 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 31 }, { - "__id__": 39 + "__id__": 33 }, { - "__id__": 41 + "__id__": 35 } ], "_prefab": { - "__id__": 43 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", - "x": 20, + "x": -40, "y": -0.82, "z": 0 }, @@ -848,180 +844,21 @@ }, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 30 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 32 - }, - { - "__id__": 34 - } - ], - "_prefab": { - "__id__": 36 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 30 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 32 }, "_contentSize": { "__type__": "cc.Size", "width": 80, - "height": 50.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "beSIENsV9Hv7F1To7lGgtW" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 31 - }, - "_enabled": true, - "__prefab": { - "__id__": 35 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "确认", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": false, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "62pZl7xGZO/pzOJVlIcuzO" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "a91nWCyfxNwY18KADht9KN", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 30 - }, - "_enabled": true, - "__prefab": { - "__id__": 38 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, "height": 80 }, "_anchorPoint": { @@ -1045,7 +882,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 34 }, "clickEvents": [], "_interactable": true, @@ -1101,7 +938,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1114,7 +951,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__uuid__": "643e0054-884b-41cd-a3e1-7e638e0cb7be@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1159,7 +996,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 39 }, "_contentSize": { "__type__": "cc.Size", @@ -1187,7 +1024,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 41 }, "_resizeMode": 0, "_layoutType": 1, @@ -1238,7 +1075,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -1266,7 +1103,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 46 }, "_alignFlags": 1, "_target": null, @@ -1302,7 +1139,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 48 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1361,21 +1198,21 @@ "_children": [], "_active": true, "_components": [ + { + "__id__": 51 + }, + { + "__id__": 53 + }, + { + "__id__": 55 + }, { "__id__": 57 - }, - { - "__id__": 59 - }, - { - "__id__": 61 - }, - { - "__id__": 63 } ], "_prefab": { - "__id__": 65 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1412,16 +1249,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 52 }, "_contentSize": { "__type__": "cc.Size", - "width": 108, - "height": 108 + "width": 126, + "height": 77 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1440,11 +1277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 54 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1457,7 +1294,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "9c27734d-854f-476b-961d-d1b92c75f8c0@f9941", + "__uuid__": "91a0341c-75c1-4481-b294-09bd429ac2e2@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1485,17 +1322,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 56 }, "_alignFlags": 9, "_target": null, - "_left": 65.54899999999998, + "_left": 56.54899999999998, "_right": 0, - "_top": 70.69100000000003, + "_top": 86.19100000000003, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -1521,11 +1358,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 50 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 58 }, "clickEvents": [], "_interactable": true, @@ -1594,23 +1431,23 @@ }, "_children": [ { - "__id__": 67 + "__id__": 61 }, { - "__id__": 73 + "__id__": 67 } ], "_active": true, "_components": [ { - "__id__": 79 + "__id__": 73 }, { - "__id__": 81 + "__id__": 75 } ], "_prefab": { - "__id__": 83 + "__id__": 77 }, "_lpos": { "__type__": "cc.Vec3", @@ -1647,20 +1484,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 60 }, "_children": [], "_active": true, "_components": [ { - "__id__": 68 + "__id__": 62 }, { - "__id__": 70 + "__id__": 64 } ], "_prefab": { - "__id__": 72 + "__id__": 66 }, "_lpos": { "__type__": "cc.Vec3", @@ -1697,16 +1534,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 63 }, "_contentSize": { "__type__": "cc.Size", - "width": 169, - "height": 155 + "width": 183, + "height": 183 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1725,11 +1562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 61 }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 65 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1742,7 +1579,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@f9941", + "__uuid__": "1007bacb-29be-45cf-8dca-916a1fe37ed0@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -1783,20 +1620,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 60 }, "_children": [], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 68 }, { - "__id__": 76 + "__id__": 70 } ], "_prefab": { - "__id__": 78 + "__id__": 72 }, "_lpos": { "__type__": "cc.Vec3", @@ -1833,11 +1670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 69 }, "_contentSize": { "__type__": "cc.Size", @@ -1861,11 +1698,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 73 + "__id__": 67 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 71 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1942,11 +1779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 74 }, "_contentSize": { "__type__": "cc.Size", @@ -1970,11 +1807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 60 }, "_enabled": true, "__prefab": { - "__id__": 82 + "__id__": 76 }, "_alignFlags": 9, "_target": null, @@ -2023,23 +1860,23 @@ }, "_children": [ { - "__id__": 85 + "__id__": 79 }, { - "__id__": 91 + "__id__": 85 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 91 }, { - "__id__": 99 + "__id__": 93 } ], "_prefab": { - "__id__": 101 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -2076,20 +1913,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 78 }, "_children": [], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 80 }, { - "__id__": 88 + "__id__": 82 } ], "_prefab": { - "__id__": 90 + "__id__": 84 }, "_lpos": { "__type__": "cc.Vec3", @@ -2106,9 +1943,9 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 0.328, - "y": 0.328, - "z": 0.328 + "x": 0.421, + "y": 0.421, + "z": 0.421 }, "_mobility": 0, "_layer": 1073741824, @@ -2126,20 +1963,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 200 + "width": 126.83999633789062, + "height": 112.45999908447266 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0.5202617452619438, "y": 0.5 }, "_id": "" @@ -2149,16 +1986,16 @@ "fileId": "85hkUmSTJJZ5lfYsfOMdUg" }, { - "__type__": "cc.Sprite", + "__type__": "sp.Skeleton", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 83 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2170,28 +2007,28 @@ "b": 255, "a": 255 }, - "_spriteFrame": { - "__uuid__": "4c8c7576-d69c-4524-8add-07ad36a958c6@f9941", - "__expectedType__": "cc.SpriteFrame" + "_skeletonData": { + "__uuid__": "7ac2ecce-920d-4642-8388-2fb52bdaae74", + "__expectedType__": "sp.SkeletonData" }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, + "defaultSkin": "default", + "defaultAnimation": "animation", + "_premultipliedAlpha": true, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, "_id": "" }, { "__type__": "cc.CompPrefabInfo", - "fileId": "cebiiCd4RKsZqvagehuHQ4" + "fileId": "ea2zlnGolNr7RdaZiYbVXz" }, { "__type__": "cc.PrefabInfo", @@ -2212,20 +2049,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 78 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 86 }, { - "__id__": 94 + "__id__": 88 } ], "_prefab": { - "__id__": 96 + "__id__": 90 }, "_lpos": { "__type__": "cc.Vec3", @@ -2262,11 +2099,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 87 }, "_contentSize": { "__type__": "cc.Size", @@ -2290,20 +2127,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 85 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 89 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, + "r": 197, + "g": 89, + "b": 68, "a": 255 }, "_string": "60s", @@ -2361,8 +2198,6 @@ "__id__": 0 }, "fileId": "bc8pnnht9O/4APAtgMaCW3", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2371,11 +2206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 92 }, "_contentSize": { "__type__": "cc.Size", @@ -2399,11 +2234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 94 }, "_alignFlags": 33, "_target": null, @@ -2452,29 +2287,29 @@ }, "_children": [ { - "__id__": 103 + "__id__": 97 }, { - "__id__": 133 + "__id__": 127 }, { - "__id__": 163 + "__id__": 157 } ], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 187 }, { - "__id__": 195 + "__id__": 189 }, { - "__id__": 197 + "__id__": 191 } ], "_prefab": { - "__id__": 199 + "__id__": 193 }, "_lpos": { "__type__": "cc.Vec3", @@ -2511,27 +2346,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 96 }, "_children": [ { - "__id__": 104 + "__id__": 98 }, { - "__id__": 110 + "__id__": 104 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 122 }, { - "__id__": 130 + "__id__": 124 } ], "_prefab": { - "__id__": 132 + "__id__": 126 }, "_lpos": { "__type__": "cc.Vec3", @@ -2568,20 +2403,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 97 }, "_children": [], "_active": true, "_components": [ { - "__id__": 105 + "__id__": 99 }, { - "__id__": 107 + "__id__": 101 } ], "_prefab": { - "__id__": 109 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -2618,11 +2453,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 98 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 100 }, "_contentSize": { "__type__": "cc.Size", @@ -2646,11 +2481,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 98 }, "_enabled": false, "__prefab": { - "__id__": 108 + "__id__": 102 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2704,27 +2539,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 103 + "__id__": 97 }, "_children": [ { - "__id__": 111 + "__id__": 105 }, { - "__id__": 117 + "__id__": 111 } ], "_active": true, "_components": [ { - "__id__": 123 + "__id__": 117 }, { - "__id__": 125 + "__id__": 119 } ], "_prefab": { - "__id__": 127 + "__id__": 121 }, "_lpos": { "__type__": "cc.Vec3", @@ -2761,24 +2596,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 110 + "__id__": 104 }, "_children": [], "_active": true, "_components": [ { - "__id__": 112 + "__id__": 106 }, { - "__id__": 114 + "__id__": 108 } ], "_prefab": { - "__id__": 116 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", - "x": -300.5, + "x": -293.5, "y": 0, "z": 0 }, @@ -2811,15 +2646,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", - "width": 139, + "width": 153, "height": 176 }, "_anchorPoint": { @@ -2839,11 +2674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 111 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 109 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2897,24 +2732,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 110 + "__id__": 104 }, "_children": [], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 112 }, { - "__id__": 120 + "__id__": 114 } ], "_prefab": { - "__id__": 122 + "__id__": 116 }, "_lpos": { "__type__": "cc.Vec3", - "x": -144.3203125, + "x": -130.3203125, "y": 0, "z": 0 }, @@ -2947,11 +2782,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2975,11 +2810,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 117 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 115 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3056,11 +2891,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 118 }, "_contentSize": { "__type__": "cc.Size", @@ -3084,11 +2919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 104 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 120 }, "_resizeMode": 0, "_layoutType": 1, @@ -3135,11 +2970,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 123 }, "_contentSize": { "__type__": "cc.Size", @@ -3163,11 +2998,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 97 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 125 }, "clickEvents": [], "_interactable": true, @@ -3207,7 +3042,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 103 + "__id__": 97 }, "_id": "" }, @@ -3234,27 +3069,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 96 }, "_children": [ { - "__id__": 134 + "__id__": 128 }, { - "__id__": 140 + "__id__": 134 } ], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 152 }, { - "__id__": 160 + "__id__": 154 } ], "_prefab": { - "__id__": 162 + "__id__": 156 }, "_lpos": { "__type__": "cc.Vec3", @@ -3291,20 +3126,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 133 + "__id__": 127 }, "_children": [], "_active": false, "_components": [ { - "__id__": 135 + "__id__": 129 }, { - "__id__": 137 + "__id__": 131 } ], "_prefab": { - "__id__": 139 + "__id__": 133 }, "_lpos": { "__type__": "cc.Vec3", @@ -3341,11 +3176,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -3369,11 +3204,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 134 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 132 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3427,27 +3262,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 133 + "__id__": 127 }, "_children": [ { - "__id__": 141 + "__id__": 135 }, { - "__id__": 147 + "__id__": 141 } ], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 147 }, { - "__id__": 155 + "__id__": 149 } ], "_prefab": { - "__id__": 157 + "__id__": 151 }, "_lpos": { "__type__": "cc.Vec3", @@ -3484,24 +3319,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 140 + "__id__": 134 }, "_children": [], "_active": true, "_components": [ { - "__id__": 142 + "__id__": 136 }, { - "__id__": 144 + "__id__": 138 } ], "_prefab": { - "__id__": 146 + "__id__": 140 }, "_lpos": { "__type__": "cc.Vec3", - "x": -300.5, + "x": -293.5, "y": 0, "z": 0 }, @@ -3534,15 +3369,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", - "width": 139, + "width": 153, "height": 176 }, "_anchorPoint": { @@ -3562,11 +3397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 141 + "__id__": 135 }, "_enabled": true, "__prefab": { - "__id__": 145 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3620,24 +3455,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 140 + "__id__": 134 }, "_children": [], "_active": true, "_components": [ { - "__id__": 148 + "__id__": 142 }, { - "__id__": 150 + "__id__": 144 } ], "_prefab": { - "__id__": 152 + "__id__": 146 }, "_lpos": { "__type__": "cc.Vec3", - "x": -84.3203125, + "x": -70.3203125, "y": 0, "z": 0 }, @@ -3670,11 +3505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 149 + "__id__": 143 }, "_contentSize": { "__type__": "cc.Size", @@ -3698,11 +3533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 147 + "__id__": 141 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 145 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3779,11 +3614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 148 }, "_contentSize": { "__type__": "cc.Size", @@ -3807,11 +3642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 140 + "__id__": 134 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 150 }, "_resizeMode": 0, "_layoutType": 1, @@ -3858,11 +3693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 153 }, "_contentSize": { "__type__": "cc.Size", @@ -3886,11 +3721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 133 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 155 }, "clickEvents": [], "_interactable": true, @@ -3930,7 +3765,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 133 + "__id__": 127 }, "_id": "" }, @@ -3957,27 +3792,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 96 }, "_children": [ { - "__id__": 164 + "__id__": 158 }, { - "__id__": 170 + "__id__": 164 } ], "_active": true, "_components": [ { - "__id__": 188 + "__id__": 182 }, { - "__id__": 190 + "__id__": 184 } ], "_prefab": { - "__id__": 192 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -4014,20 +3849,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 163 + "__id__": 157 }, "_children": [], "_active": false, "_components": [ { - "__id__": 165 + "__id__": 159 }, { - "__id__": 167 + "__id__": 161 } ], "_prefab": { - "__id__": 169 + "__id__": 163 }, "_lpos": { "__type__": "cc.Vec3", @@ -4064,11 +3899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 166 + "__id__": 160 }, "_contentSize": { "__type__": "cc.Size", @@ -4092,11 +3927,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 164 + "__id__": 158 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 162 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4150,27 +3985,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 163 + "__id__": 157 }, "_children": [ { - "__id__": 171 + "__id__": 165 }, { - "__id__": 177 + "__id__": 171 } ], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 177 }, { - "__id__": 185 + "__id__": 179 } ], "_prefab": { - "__id__": 187 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -4207,24 +4042,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 170 + "__id__": 164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 172 + "__id__": 166 }, { - "__id__": 174 + "__id__": 168 } ], "_prefab": { - "__id__": 176 + "__id__": 170 }, "_lpos": { "__type__": "cc.Vec3", - "x": -300.5, + "x": -293.5, "y": 0, "z": 0 }, @@ -4257,15 +4092,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", - "width": 139, + "width": 153, "height": 176 }, "_anchorPoint": { @@ -4285,11 +4120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 171 + "__id__": 165 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4343,24 +4178,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 170 + "__id__": 164 }, "_children": [], "_active": true, "_components": [ { - "__id__": 178 + "__id__": 172 }, { - "__id__": 180 + "__id__": 174 } ], "_prefab": { - "__id__": 182 + "__id__": 176 }, "_lpos": { "__type__": "cc.Vec3", - "x": -84.3203125, + "x": -70.3203125, "y": 0, "z": 0 }, @@ -4393,11 +4228,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 173 }, "_contentSize": { "__type__": "cc.Size", @@ -4421,11 +4256,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 177 + "__id__": 171 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 175 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4502,11 +4337,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 184 + "__id__": 178 }, "_contentSize": { "__type__": "cc.Size", @@ -4530,11 +4365,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 170 + "__id__": 164 }, "_enabled": true, "__prefab": { - "__id__": 186 + "__id__": 180 }, "_resizeMode": 0, "_layoutType": 1, @@ -4581,11 +4416,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -4609,11 +4444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 163 + "__id__": 157 }, "_enabled": true, "__prefab": { - "__id__": 191 + "__id__": 185 }, "clickEvents": [], "_interactable": true, @@ -4653,7 +4488,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 163 + "__id__": 157 }, "_id": "" }, @@ -4680,11 +4515,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", @@ -4708,11 +4543,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 190 }, "_resizeMode": 1, "_layoutType": 2, @@ -4746,11 +4581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 198 + "__id__": 192 }, "_alignFlags": 4, "_target": null, @@ -4798,30 +4633,30 @@ "__id__": 1 }, "_children": [ + { + "__id__": 195 + }, { "__id__": 201 }, { "__id__": 207 - }, - { - "__id__": 213 } ], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 213 }, { - "__id__": 221 + "__id__": 215 }, { - "__id__": 223 + "__id__": 217 } ], "_prefab": { - "__id__": 225 + "__id__": 219 }, "_lpos": { "__type__": "cc.Vec3", @@ -4858,20 +4693,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 202 + "__id__": 196 }, { - "__id__": 204 + "__id__": 198 } ], "_prefab": { - "__id__": 206 + "__id__": 200 }, "_lpos": { "__type__": "cc.Vec3", @@ -4908,11 +4743,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 197 }, "_contentSize": { "__type__": "cc.Size", @@ -4936,11 +4771,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 201 + "__id__": 195 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 199 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5017,20 +4852,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 202 }, { - "__id__": 210 + "__id__": 204 } ], "_prefab": { - "__id__": 212 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -5067,11 +4902,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 203 }, "_contentSize": { "__type__": "cc.Size", @@ -5095,11 +4930,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 207 + "__id__": 201 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 205 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5176,20 +5011,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 200 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 214 + "__id__": 208 }, { - "__id__": 216 + "__id__": 210 } ], "_prefab": { - "__id__": 218 + "__id__": 212 }, "_lpos": { "__type__": "cc.Vec3", @@ -5226,11 +5061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 215 + "__id__": 209 }, "_contentSize": { "__type__": "cc.Size", @@ -5254,11 +5089,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 213 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 211 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5312,11 +5147,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 220 + "__id__": 214 }, "_contentSize": { "__type__": "cc.Size", @@ -5340,11 +5175,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 216 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5382,21 +5217,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 194 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 218 }, "editingDidBegan": [], "textChanged": [], "editingDidEnded": [], "editingReturn": [], "_textLabel": { - "__id__": 204 + "__id__": 198 }, "_placeholderLabel": { - "__id__": 210 + "__id__": 204 }, "_returnType": 0, "_string": "", @@ -5434,26 +5269,26 @@ }, "_children": [ { - "__id__": 227 + "__id__": 221 } ], "_active": true, "_components": [ + { + "__id__": 227 + }, + { + "__id__": 229 + }, + { + "__id__": 231 + }, { "__id__": 233 - }, - { - "__id__": 235 - }, - { - "__id__": 237 - }, - { - "__id__": 239 } ], "_prefab": { - "__id__": 241 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -5490,20 +5325,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 226 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 228 + "__id__": 222 }, { - "__id__": 230 + "__id__": 224 } ], "_prefab": { - "__id__": 232 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -5540,11 +5375,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 223 }, "_contentSize": { "__type__": "cc.Size", @@ -5568,11 +5403,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 227 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 225 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5649,11 +5484,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 228 }, "_contentSize": { "__type__": "cc.Size", @@ -5677,11 +5512,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 236 + "__id__": 230 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5722,11 +5557,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 238 + "__id__": 232 }, "_alignFlags": 12, "_target": null, @@ -5758,11 +5593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 226 + "__id__": 220 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 234 }, "clickEvents": [], "_interactable": true, @@ -5831,26 +5666,26 @@ }, "_children": [ { - "__id__": 243 + "__id__": 237 } ], "_active": true, "_components": [ + { + "__id__": 243 + }, + { + "__id__": 245 + }, + { + "__id__": 247 + }, { "__id__": 249 - }, - { - "__id__": 251 - }, - { - "__id__": 253 - }, - { - "__id__": 255 } ], "_prefab": { - "__id__": 257 + "__id__": 251 }, "_lpos": { "__type__": "cc.Vec3", @@ -5887,20 +5722,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 242 + "__id__": 236 }, "_children": [], "_active": true, "_components": [ { - "__id__": 244 + "__id__": 238 }, { - "__id__": 246 + "__id__": 240 } ], "_prefab": { - "__id__": 248 + "__id__": 242 }, "_lpos": { "__type__": "cc.Vec3", @@ -5937,11 +5772,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 239 }, "_contentSize": { "__type__": "cc.Size", @@ -5965,11 +5800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 243 + "__id__": 237 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 241 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6046,11 +5881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 250 + "__id__": 244 }, "_contentSize": { "__type__": "cc.Size", @@ -6074,11 +5909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 246 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6119,11 +5954,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 248 }, "_alignFlags": 36, "_target": null, @@ -6155,11 +5990,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 242 + "__id__": 236 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 250 }, "clickEvents": [], "_interactable": true, @@ -6228,7 +6063,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 253 }, "_contentSize": { "__type__": "cc.Size", @@ -6256,7 +6091,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 255 }, "_alignFlags": 0, "_target": null, @@ -6292,7 +6127,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 257 }, "inputLayout": { "__id__": 24 @@ -6301,40 +6136,40 @@ "__id__": 30 }, "inputTemplate": { - "__id__": 200 + "__id__": 194 }, "actionNode": { "__id__": 17 }, "iconSetting": { - "__id__": 56 + "__id__": 50 }, "tipsLayout": { - "__id__": 102 + "__id__": 96 }, "mainImage": { "__id__": 11 }, "tipsItem1": { - "__id__": 103 + "__id__": 97 }, "tipsItem2": { - "__id__": 133 + "__id__": 127 }, "tipsItem3": { - "__id__": 163 + "__id__": 157 }, "unLockTipsBtn": { - "__id__": 226 + "__id__": 220 }, "addTimeBtn": { - "__id__": 242 + "__id__": 236 }, "clockLabel": { - "__id__": 94 + "__id__": 88 }, "liveLabel": { - "__id__": 76 + "__id__": 70 }, "currentLevelIndex": 0, "clickAudio": { @@ -6369,7 +6204,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 265 + "__id__": 259 }, "_clip": null, "_loop": false, diff --git a/assets/prefabs/PassModal.prefab b/assets/prefabs/PassModal.prefab index 42f7ba1..5ccaa22 100644 --- a/assets/prefabs/PassModal.prefab +++ b/assets/prefabs/PassModal.prefab @@ -524,8 +524,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 169, - "height": 155 + "width": 183, + "height": 183 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -561,7 +561,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@f9941", + "__uuid__": "1007bacb-29be-45cf-8dca-916a1fe37ed0@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, diff --git a/assets/resources/anims.meta b/assets/resources/anims.meta new file mode 100644 index 0000000..3ba2902 --- /dev/null +++ b/assets/resources/anims.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "09b6d346-4801-4fc1-98b2-263d09391750", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/anims/pagelevel.meta b/assets/resources/anims/pagelevel.meta new file mode 100644 index 0000000..82e676a --- /dev/null +++ b/assets/resources/anims/pagelevel.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "3eb4650d-3194-4beb-87e4-2556f561cf1d", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/anims/pagelevel/skeleton.atlas b/assets/resources/anims/pagelevel/skeleton.atlas new file mode 100644 index 0000000..01a873c --- /dev/null +++ b/assets/resources/anims/pagelevel/skeleton.atlas @@ -0,0 +1,34 @@ + +skeleton.png +size: 242,137 +format: RGBA8888 +filter: Linear,Linear +repeat: none +分针 + rotate: false + xy: 151, 14 + size: 37, 30 + orig: 37, 34 + offset: 0, 1 + index: -1 +时针 + rotate: true + xy: 190, 29 + size: 15, 35 + orig: 16, 35 + offset: 0, 0 + index: -1 +表盘 + rotate: false + xy: 151, 46 + size: 89, 89 + orig: 89, 89 + offset: 0, 0 + index: -1 +钟1 + rotate: false + xy: 2, 2 + size: 147, 133 + orig: 150, 133 + offset: 0, 0 + index: -1 diff --git a/assets/resources/anims/pagelevel/skeleton.atlas.meta b/assets/resources/anims/pagelevel/skeleton.atlas.meta new file mode 100644 index 0000000..17bdaf2 --- /dev/null +++ b/assets/resources/anims/pagelevel/skeleton.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.0", + "importer": "*", + "imported": true, + "uuid": "c769260a-0357-4bdb-b9ca-d5b4ef7662bd", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/anims/pagelevel/skeleton.json b/assets/resources/anims/pagelevel/skeleton.json new file mode 100644 index 0000000..6a4a8a1 --- /dev/null +++ b/assets/resources/anims/pagelevel/skeleton.json @@ -0,0 +1,78 @@ +{ +"skeleton": { + "hash": "neT0krrJvEJNvDau6sqQ0GLqqto=", + "spine": "3.8.75", + "x": -65.99, + "y": -56.23, + "width": 126.84, + "height": 112.46, + "images": "", + "audio": "" +}, +"bones": [ + { "name": "root" }, + { "name": "bone3", "parent": "root" }, + { "name": "bone", "parent": "bone3", "x": 1.64 }, + { "name": "bone2", "parent": "bone3", "x": 1.4 }, + { "name": "bone4", "parent": "bone3" }, + { "name": "bone5", "parent": "bone3" } +], +"slots": [ + { "name": "表盘", "bone": "bone4", "attachment": "表盘" }, + { "name": "时针", "bone": "bone", "attachment": "时针" }, + { "name": "分针", "bone": "bone2", "attachment": "分针" }, + { "name": "钟1", "bone": "bone5", "attachment": "钟1" } +], +"skins": [ + { + "name": "default", + "attachments": { + "分针": { + "分针": { "x": 10.48, "y": -7.18, "width": 37, "height": 34 } + }, + "时针": { + "时针": { "x": 0.53, "y": 10.75, "width": 16, "height": 35 } + }, + "表盘": { + "表盘": { "width": 89, "height": 89 } + }, + "钟1": { + "钟1": { "x": -2.58, "scaleX": 0.8456, "scaleY": 0.8456, "width": 150, "height": 133 } + } + } + } +], +"animations": { + "animation": { + "bones": { + "bone2": { + "rotate": [ + {}, + { "time": 0.3333, "angle": 179 }, + { "time": 0.5, "angle": -90 }, + { "time": 0.6667 }, + { "time": 1, "angle": 179 }, + { "time": 1.2, "angle": -90 }, + { "time": 1.3333 } + ] + }, + "bone": { + "rotate": [ + {}, + { "time": 0.6667, "angle": 179 }, + { "time": 1, "angle": -90 }, + { "time": 1.3333 } + ] + }, + "bone5": { + "rotate": [ + {}, + { "time": 0.2667, "angle": 179 }, + { "time": 0.5333, "angle": -90 }, + { "time": 1 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/anims/pagelevel/skeleton.json.meta b/assets/resources/anims/pagelevel/skeleton.json.meta new file mode 100644 index 0000000..656d53e --- /dev/null +++ b/assets/resources/anims/pagelevel/skeleton.json.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.2.7", + "importer": "spine-data", + "imported": true, + "uuid": "7ac2ecce-920d-4642-8388-2fb52bdaae74", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "atlasUuid": "c769260a-0357-4bdb-b9ca-d5b4ef7662bd" + } +} diff --git a/assets/resources/anims/pagelevel/skeleton.png b/assets/resources/anims/pagelevel/skeleton.png new file mode 100644 index 0000000..d59b85c Binary files /dev/null and b/assets/resources/anims/pagelevel/skeleton.png differ diff --git a/assets/resources/anims/pagelevel/skeleton.png.meta b/assets/resources/anims/pagelevel/skeleton.png.meta new file mode 100644 index 0000000..64c4646 --- /dev/null +++ b/assets/resources/anims/pagelevel/skeleton.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "933bb319-f065-47d9-93c4-e22ad7179ebb", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a", + "displayName": "skeleton", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "933bb319-f065-47d9-93c4-e22ad7179ebb", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "933bb319-f065-47d9-93c4-e22ad7179ebb@f9941", + "displayName": "skeleton", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 2, + "width": 238, + "height": 133, + "rawWidth": 242, + "rawHeight": 137, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -119, + -66.5, + 0, + 119, + -66.5, + 0, + -119, + 66.5, + 0, + 119, + 66.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 2, + 135, + 240, + 135, + 2, + 2, + 240, + 2 + ], + "nuv": [ + 0.008264462809917356, + 0.014598540145985401, + 0.9917355371900827, + 0.014598540145985401, + 0.008264462809917356, + 0.9854014598540146, + 0.9917355371900827, + 0.9854014598540146 + ], + "minPos": [ + -119, + -66.5, + 0 + ], + "maxPos": [ + 119, + 66.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "933bb319-f065-47d9-93c4-e22ad7179ebb@6c48a" + } +} diff --git a/assets/resources/images/IconBack.png b/assets/resources/images/IconBack.png new file mode 100644 index 0000000..954d172 Binary files /dev/null and b/assets/resources/images/IconBack.png differ diff --git a/assets/resources/images/IconBack.png.meta b/assets/resources/images/IconBack.png.meta new file mode 100644 index 0000000..ad9c243 --- /dev/null +++ b/assets/resources/images/IconBack.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.27", + "importer": "image", + "imported": true, + "uuid": "91a0341c-75c1-4481-b294-09bd429ac2e2", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a", + "displayName": "IconBack", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "imageUuidOrDatabaseUri": "91a0341c-75c1-4481-b294-09bd429ac2e2", + "isUuid": true, + "visible": false, + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0 + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "91a0341c-75c1-4481-b294-09bd429ac2e2@f9941", + "displayName": "IconBack", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 126, + "height": 77, + "rawWidth": 126, + "rawHeight": 77, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -63, + -38.5, + 0, + 63, + -38.5, + 0, + -63, + 38.5, + 0, + 63, + 38.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 77, + 126, + 77, + 0, + 0, + 126, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -63, + -38.5, + 0 + ], + "maxPos": [ + 63, + 38.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a", + "atlasUuid": "", + "trimType": "auto" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "redirect": "91a0341c-75c1-4481-b294-09bd429ac2e2@6c48a" + } +} diff --git a/assets/resources/images/pageLevel/IconClock.png b/assets/resources/images/pageLevel/IconClock.png deleted file mode 100644 index d2d5f4f..0000000 Binary files a/assets/resources/images/pageLevel/IconClock.png and /dev/null differ diff --git a/assets/resources/images/pageLevel/IconLive.png b/assets/resources/images/pageLevel/IconLive.png deleted file mode 100644 index 714dfc2..0000000 Binary files a/assets/resources/images/pageLevel/IconLive.png and /dev/null differ diff --git a/assets/resources/images/pageLevel/IconTips.png b/assets/resources/images/pageLevel/IconTips.png index 7c1f504..dc0a815 100644 Binary files a/assets/resources/images/pageLevel/IconTips.png and b/assets/resources/images/pageLevel/IconTips.png differ diff --git a/assets/resources/images/pageLevel/IconTips.png.meta b/assets/resources/images/pageLevel/IconTips.png.meta index f3be95e..536f74f 100644 --- a/assets/resources/images/pageLevel/IconTips.png.meta +++ b/assets/resources/images/pageLevel/IconTips.png.meta @@ -42,10 +42,10 @@ "trimThreshold": 1, "rotated": false, "offsetX": 0.5, - "offsetY": 0, - "trimX": 31, - "trimY": 12, - "width": 139, + "offsetY": -1, + "trimX": 24, + "trimY": 13, + "width": 153, "height": 176, "rawWidth": 200, "rawHeight": 200, @@ -60,16 +60,16 @@ "meshType": 0, "vertices": { "rawPosition": [ - -69.5, + -76.5, -88, 0, - 69.5, + 76.5, -88, 0, - -69.5, + -76.5, 88, 0, - 69.5, + 76.5, 88, 0 ], @@ -82,32 +82,32 @@ 3 ], "uv": [ - 31, - 188, - 170, - 188, - 31, - 12, - 170, - 12 + 24, + 187, + 177, + 187, + 24, + 11, + 177, + 11 ], "nuv": [ - 0.155, - 0.06, - 0.85, - 0.06, - 0.155, - 0.94, - 0.85, - 0.94 + 0.12, + 0.055, + 0.885, + 0.055, + 0.12, + 0.935, + 0.885, + 0.935 ], "minPos": [ - -69.5, + -76.5, -88, 0 ], "maxPos": [ - 69.5, + 76.5, 88, 0 ] diff --git a/assets/resources/images/pageLevel/确认 (1).png b/assets/resources/images/pageLevel/确认 (1).png new file mode 100644 index 0000000..bcb21c5 Binary files /dev/null and b/assets/resources/images/pageLevel/确认 (1).png differ diff --git a/assets/resources/images/pageLevel/IconClock.png.meta b/assets/resources/images/pageLevel/确认 (1).png.meta similarity index 83% rename from assets/resources/images/pageLevel/IconClock.png.meta rename to assets/resources/images/pageLevel/确认 (1).png.meta index 3ad78ef..736ab14 100644 --- a/assets/resources/images/pageLevel/IconClock.png.meta +++ b/assets/resources/images/pageLevel/确认 (1).png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6", + "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a", - "displayName": "IconClock", + "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a", + "displayName": "确认 (1)", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "4c8c7576-d69c-4524-8add-07ad36a958c6", + "imageUuidOrDatabaseUri": "643e0054-884b-41cd-a3e1-7e638e0cb7be", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,8 +34,8 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "4c8c7576-d69c-4524-8add-07ad36a958c6@f9941", - "displayName": "IconClock", + "uuid": "643e0054-884b-41cd-a3e1-7e638e0cb7be@f9941", + "displayName": "确认 (1)", "id": "f9941", "name": "spriteFrame", "userData": { @@ -113,7 +113,7 @@ ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a", + "imageUuidOrDatabaseUri": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "4c8c7576-d69c-4524-8add-07ad36a958c6@6c48a" + "redirect": "643e0054-884b-41cd-a3e1-7e638e0cb7be@6c48a" } } diff --git a/assets/resources/images/pageLevel/积分 (1).png b/assets/resources/images/pageLevel/积分 (1).png new file mode 100644 index 0000000..12b69af Binary files /dev/null and b/assets/resources/images/pageLevel/积分 (1).png differ diff --git a/assets/resources/images/pageLevel/IconLive.png.meta b/assets/resources/images/pageLevel/积分 (1).png.meta similarity index 62% rename from assets/resources/images/pageLevel/IconLive.png.meta rename to assets/resources/images/pageLevel/积分 (1).png.meta index b31b310..0689b48 100644 --- a/assets/resources/images/pageLevel/IconLive.png.meta +++ b/assets/resources/images/pageLevel/积分 (1).png.meta @@ -2,7 +2,7 @@ "ver": "1.0.27", "importer": "image", "imported": true, - "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff", + "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0", "files": [ ".json", ".png" @@ -10,14 +10,14 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a", - "displayName": "IconLive", + "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a", + "displayName": "积分 (1)", "id": "6c48a", "name": "texture", "userData": { "wrapModeS": "clamp-to-edge", "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff", + "imageUuidOrDatabaseUri": "1007bacb-29be-45cf-8dca-916a1fe37ed0", "isUuid": true, "visible": false, "minfilter": "linear", @@ -34,19 +34,19 @@ }, "f9941": { "importer": "sprite-frame", - "uuid": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@f9941", - "displayName": "IconLive", + "uuid": "1007bacb-29be-45cf-8dca-916a1fe37ed0@f9941", + "displayName": "积分 (1)", "id": "f9941", "name": "spriteFrame", "userData": { "trimThreshold": 1, "rotated": false, - "offsetX": 0.5, - "offsetY": -2.5, - "trimX": 16, - "trimY": 25, - "width": 169, - "height": 155, + "offsetX": -0.5, + "offsetY": -0.5, + "trimX": 8, + "trimY": 9, + "width": 183, + "height": 183, "rawWidth": 200, "rawHeight": 200, "borderTop": 0, @@ -60,17 +60,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -84.5, - -77.5, + -91.5, + -91.5, 0, - 84.5, - -77.5, + 91.5, + -91.5, 0, - -84.5, - 77.5, + -91.5, + 91.5, 0, - 84.5, - 77.5, + 91.5, + 91.5, 0 ], "indexes": [ @@ -82,38 +82,38 @@ 3 ], "uv": [ - 16, - 175, - 185, - 175, - 16, - 20, - 185, - 20 + 8, + 191, + 191, + 191, + 8, + 8, + 191, + 8 ], "nuv": [ - 0.08, - 0.1, - 0.925, - 0.1, - 0.08, - 0.875, - 0.925, - 0.875 + 0.04, + 0.04, + 0.955, + 0.04, + 0.04, + 0.955, + 0.955, + 0.955 ], "minPos": [ - -84.5, - -77.5, + -91.5, + -91.5, 0 ], "maxPos": [ - 84.5, - 77.5, + 91.5, + 91.5, 0 ] }, "isUuid": true, - "imageUuidOrDatabaseUri": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a", + "imageUuidOrDatabaseUri": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a", "atlasUuid": "", "trimType": "auto" }, @@ -129,6 +129,6 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": false, "hasAlpha": true, - "redirect": "5ab5c212-a4cc-4c9b-a372-0cd2f30f4aff@6c48a" + "redirect": "1007bacb-29be-45cf-8dca-916a1fe37ed0@6c48a" } }