diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index d780e42c..9863ad3f 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -25,35 +25,35 @@ "__id__": 10 }, { - "__id__": 79 + "__id__": 87 }, { - "__id__": 165 + "__id__": 173 }, { - "__id__": 184 + "__id__": 192 }, { - "__id__": 199 + "__id__": 207 }, { - "__id__": 214 + "__id__": 222 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 237 }, { - "__id__": 231 + "__id__": 239 }, { - "__id__": 233 + "__id__": 241 } ], "_prefab": { - "__id__": 235 + "__id__": 243 }, "_lpos": { "__type__": "cc.Vec3", @@ -272,26 +272,29 @@ "__id__": 11 }, { - "__id__": 27 + "__id__": 24 }, { - "__id__": 43 + "__id__": 40 }, { - "__id__": 55 + "__id__": 52 + }, + { + "__id__": 71 } ], "_active": true, "_components": [ { - "__id__": 74 + "__id__": 82 }, { - "__id__": 76 + "__id__": 84 } ], "_prefab": { - "__id__": 78 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -345,8 +348,7 @@ "fileId": "64PJYFWgBDZrEsaiYwZxmh", "instance": { "__id__": 13 - }, - "targetOverrides": null + } }, { "__type__": "cc.PrefabInstance", @@ -355,97 +357,30 @@ "__id__": 1 }, "mountedChildren": [], - "mountedComponents": [ + "mountedComponents": [], + "propertyOverrides": [ { "__id__": 14 - } - ], - "propertyOverrides": [ + }, + { + "__id__": 16 + }, { "__id__": 18 }, { "__id__": 20 }, - { - "__id__": 21 - }, { "__id__": 22 - }, - { - "__id__": 23 - }, - { - "__id__": 25 - }, - { - "__id__": 26 } ], "removedComponents": [] }, - { - "__type__": "cc.MountedComponentsInfo", - "targetInfo": { - "__id__": 15 - }, - "components": [ - { - "__id__": 16 - } - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "64PJYFWgBDZrEsaiYwZxmh" - ] - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": { - "mountedRoot": { - "__id__": 11 - } - }, - "node": { - "__id__": 11 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "_alignFlags": 44, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 720, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c9P/N0EtBKRqjVfxNVfhKv" - }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 15 }, "propertyPath": [ "_name" @@ -461,18 +396,24 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 17 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -360, - "y": 0, + "x": -395.897, + "y": -39.886, "z": 0 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "64PJYFWgBDZrEsaiYwZxmh" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { @@ -489,10 +430,16 @@ "w": 1 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "64PJYFWgBDZrEsaiYwZxmh" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 19 + "__id__": 21 }, "propertyPath": [ "_euler" @@ -504,49 +451,32 @@ "z": 0 } }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 24 - }, - "propertyPath": [ - "_anchorPoint" - ], - "value": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - } - }, { "__type__": "cc.TargetInfo", "localID": [ - "61k/3xmdtHe6Srw0droR6G" + "64PJYFWgBDZrEsaiYwZxmh" ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 24 + "__id__": 23 }, "propertyPath": [ - "_contentSize" + "_lscale" ], "value": { - "__type__": "cc.Size", - "width": 720, - "height": 1280 + "__type__": "cc.Vec3", + "x": 1.1, + "y": 1.1, + "z": 1 } }, { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 19 - }, - "propertyPath": [ - "_active" - ], - "value": true + "__type__": "cc.TargetInfo", + "localID": [ + "64PJYFWgBDZrEsaiYwZxmh" + ] }, { "__type__": "cc.Node", @@ -558,23 +488,23 @@ }, "_children": [ { - "__id__": 28 + "__id__": 25 } ], "_active": true, "_components": [ { - "__id__": 36 + "__id__": 33 }, { - "__id__": 38 + "__id__": 35 }, { - "__id__": 40 + "__id__": 37 } ], "_prefab": { - "__id__": 42 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", @@ -611,23 +541,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 27 + "__id__": 24 }, "_children": [], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 26 }, { - "__id__": 31 + "__id__": 28 }, { - "__id__": 33 + "__id__": 30 } ], "_prefab": { - "__id__": 35 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -664,11 +594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 27 }, "_contentSize": { "__type__": "cc.Size", @@ -692,11 +622,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 29 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -737,11 +667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 25 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 31 }, "_color": { "__type__": "cc.Color", @@ -776,11 +706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 37 + "__id__": 34 }, "_contentSize": { "__type__": "cc.Size", @@ -804,11 +734,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 36 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -849,11 +779,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 27 + "__id__": 24 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 38 }, "_alignFlags": 9, "_target": null, @@ -899,14 +829,14 @@ "__id__": 10 }, "_prefab": { - "__id__": 44 + "__id__": 41 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 43 + "__id__": 40 }, "asset": { "__uuid__": "f9a7b5b8-0c1a-4b0c-a6c7-bbf2e077442a", @@ -914,7 +844,7 @@ }, "fileId": "7ehoARooRAIIfX4ttdeppc", "instance": { - "__id__": 45 + "__id__": 42 }, "targetOverrides": null }, @@ -927,21 +857,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 46 + "__id__": 43 } ], "propertyOverrides": [ + { + "__id__": 47 + }, + { + "__id__": 49 + }, { "__id__": 50 }, { - "__id__": 52 - }, - { - "__id__": 53 - }, - { - "__id__": 54 + "__id__": 51 } ], "removedComponents": [] @@ -949,11 +879,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 47 + "__id__": 44 }, "components": [ { - "__id__": 48 + "__id__": 45 } ] }, @@ -969,15 +899,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 43 + "__id__": 40 } }, "node": { - "__id__": 43 + "__id__": 40 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 46 }, "_alignFlags": 1, "_target": null, @@ -1006,7 +936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 48 }, "propertyPath": [ "_name" @@ -1022,7 +952,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -1037,7 +967,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 48 }, "propertyPath": [ "_lrot" @@ -1053,7 +983,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 51 + "__id__": 48 }, "propertyPath": [ "_euler" @@ -1075,26 +1005,26 @@ }, "_children": [ { - "__id__": 56 + "__id__": 53 } ], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 61 }, { - "__id__": 66 + "__id__": 63 + }, + { + "__id__": 65 }, { "__id__": 68 - }, - { - "__id__": 71 } ], "_prefab": { - "__id__": 73 + "__id__": 70 }, "_lpos": { "__type__": "cc.Vec3", @@ -1131,23 +1061,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 55 + "__id__": 52 }, "_children": [], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 54 }, { - "__id__": 59 + "__id__": 56 }, { - "__id__": 61 + "__id__": 58 } ], "_prefab": { - "__id__": 63 + "__id__": 60 }, "_lpos": { "__type__": "cc.Vec3", @@ -1184,11 +1114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 55 }, "_contentSize": { "__type__": "cc.Size", @@ -1212,11 +1142,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 57 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1257,11 +1187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 56 + "__id__": 53 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 59 }, "_color": { "__type__": "cc.Color", @@ -1296,11 +1226,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 62 }, "_contentSize": { "__type__": "cc.Size", @@ -1324,11 +1254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 64 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1369,15 +1299,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 66 }, "clickEvents": [ { - "__id__": 70 + "__id__": 67 } ], "_interactable": true, @@ -1429,7 +1359,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 55 + "__id__": 52 }, "_id": "" }, @@ -1453,11 +1383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 52 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 69 }, "_alignFlags": 36, "_target": null, @@ -1496,6 +1426,151 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 10 + }, + "_prefab": { + "__id__": 72 + }, + "__editorExtras__": {} + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 71 + }, + "asset": { + "__uuid__": "c9df301b-3532-4bbd-8d7e-d0620db322a0", + "__expectedType__": "cc.Prefab" + }, + "fileId": "9eultbNU5HCLypkPXqoRGA", + "instance": { + "__id__": 73 + }, + "targetOverrides": null + }, + { + "__type__": "cc.PrefabInstance", + "fileId": "3dkkKe/XNNMZ6VmYiDU/Fi", + "prefabRootNode": { + "__id__": 1 + }, + "mountedChildren": [], + "mountedComponents": [], + "propertyOverrides": [ + { + "__id__": 74 + }, + { + "__id__": 76 + }, + { + "__id__": 77 + }, + { + "__id__": 78 + }, + { + "__id__": 79 + } + ], + "removedComponents": [ + { + "__id__": 81 + } + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_name" + ], + "value": "难度" + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "9eultbNU5HCLypkPXqoRGA" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lpos" + ], + "value": { + "__type__": "cc.Vec3", + "x": 14.153, + "y": 419.694, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_lrot" + ], + "value": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 75 + }, + "propertyPath": [ + "_euler" + ], + "value": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + } + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 80 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "5b1ztjg0FI7YvHJaHCU2ms" + ] + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "cbX3HL9pRM17wDGKmTSo94" + ] + }, { "__type__": "cc.UITransform", "_name": "", @@ -1506,7 +1581,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 83 }, "_contentSize": { "__type__": "cc.Size", @@ -1534,7 +1609,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 85 }, "_alignFlags": 45, "_target": null, @@ -1583,29 +1658,29 @@ }, "_children": [ { - "__id__": 80 + "__id__": 88 }, { - "__id__": 104 + "__id__": 112 }, { - "__id__": 118 + "__id__": 126 } ], "_active": true, "_components": [ { - "__id__": 158 + "__id__": 166 }, { - "__id__": 160 + "__id__": 168 }, { - "__id__": 162 + "__id__": 170 } ], "_prefab": { - "__id__": 164 + "__id__": 172 }, "_lpos": { "__type__": "cc.Vec3", @@ -1640,17 +1715,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 79 + "__id__": 87 }, "_prefab": { - "__id__": 81 + "__id__": 89 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 80 + "__id__": 88 }, "asset": { "__uuid__": "a9053170-1055-4272-b3fd-ad6fa75b5f25", @@ -1658,7 +1733,7 @@ }, "fileId": "cfqtEvOKpHO7NzoHh8DAIM", "instance": { - "__id__": 82 + "__id__": 90 }, "targetOverrides": null }, @@ -1672,29 +1747,17 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 83 + "__id__": 91 }, { - "__id__": 85 - }, - { - "__id__": 86 - }, - { - "__id__": 87 - }, - { - "__id__": 88 - }, - { - "__id__": 90 - }, - { - "__id__": 92 + "__id__": 93 }, { "__id__": 94 }, + { + "__id__": 95 + }, { "__id__": 96 }, @@ -1708,7 +1771,19 @@ "__id__": 102 }, { - "__id__": 103 + "__id__": 104 + }, + { + "__id__": 106 + }, + { + "__id__": 108 + }, + { + "__id__": 110 + }, + { + "__id__": 111 } ], "removedComponents": [] @@ -1716,7 +1791,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 92 }, "propertyPath": [ "_name" @@ -1732,7 +1807,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 92 }, "propertyPath": [ "_lpos" @@ -1747,7 +1822,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 92 }, "propertyPath": [ "_lrot" @@ -1763,7 +1838,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 84 + "__id__": 92 }, "propertyPath": [ "_euler" @@ -1778,7 +1853,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 97 }, "propertyPath": [ "_right" @@ -1794,7 +1869,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 91 + "__id__": 99 }, "propertyPath": [ "_contentSize" @@ -1814,7 +1889,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 93 + "__id__": 101 }, "propertyPath": [ "_lpos" @@ -1835,7 +1910,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 95 + "__id__": 103 }, "propertyPath": [ "_contentSize" @@ -1855,7 +1930,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 97 + "__id__": 105 }, "propertyPath": [ "_contentSize" @@ -1875,7 +1950,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 107 }, "propertyPath": [ "_lpos" @@ -1896,7 +1971,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 109 }, "propertyPath": [ "_lpos" @@ -1917,7 +1992,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 97 }, "propertyPath": [ "_alignFlags" @@ -1927,7 +2002,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 89 + "__id__": 97 }, "propertyPath": [ "_top" @@ -1940,24 +2015,24 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 87 }, "_children": [ { - "__id__": 105 + "__id__": 113 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 121 }, { - "__id__": 115 + "__id__": 123 } ], "_prefab": { - "__id__": 117 + "__id__": 125 }, "_lpos": { "__type__": "cc.Vec3", @@ -1992,17 +2067,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 104 + "__id__": 112 }, "_prefab": { - "__id__": 106 + "__id__": 114 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 105 + "__id__": 113 }, "asset": { "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84", @@ -2010,7 +2085,7 @@ }, "fileId": "a8T0NC/KpNY7MMbRkPRuwY", "instance": { - "__id__": 107 + "__id__": 115 }, "targetOverrides": null }, @@ -2024,16 +2099,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 108 + "__id__": 116 }, { - "__id__": 110 + "__id__": 118 }, { - "__id__": 111 + "__id__": 119 }, { - "__id__": 112 + "__id__": 120 } ], "removedComponents": [] @@ -2041,7 +2116,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 109 + "__id__": 117 }, "propertyPath": [ "_name" @@ -2057,7 +2132,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 109 + "__id__": 117 }, "propertyPath": [ "_lpos" @@ -2072,7 +2147,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 109 + "__id__": 117 }, "propertyPath": [ "_lrot" @@ -2088,7 +2163,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 109 + "__id__": 117 }, "propertyPath": [ "_euler" @@ -2106,11 +2181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 122 }, "_contentSize": { "__type__": "cc.Size", @@ -2134,11 +2209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 104 + "__id__": 112 }, "_enabled": false, "__prefab": { - "__id__": 116 + "__id__": 124 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2192,27 +2267,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 79 + "__id__": 87 }, "_children": [ { - "__id__": 119 + "__id__": 127 }, { - "__id__": 136 + "__id__": 144 } ], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 161 }, { - "__id__": 155 + "__id__": 163 } ], "_prefab": { - "__id__": 157 + "__id__": 165 }, "_lpos": { "__type__": "cc.Vec3", @@ -2249,27 +2324,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 126 }, "_children": [ { - "__id__": 120 + "__id__": 128 } ], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 136 }, { - "__id__": 130 + "__id__": 138 }, { - "__id__": 132 + "__id__": 140 } ], "_prefab": { - "__id__": 135 + "__id__": 143 }, "_lpos": { "__type__": "cc.Vec3", @@ -2306,23 +2381,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 119 + "__id__": 127 }, "_children": [], "_active": true, "_components": [ { - "__id__": 121 + "__id__": 129 }, { - "__id__": 123 + "__id__": 131 }, { - "__id__": 125 + "__id__": 133 } ], "_prefab": { - "__id__": 127 + "__id__": 135 }, "_lpos": { "__type__": "cc.Vec3", @@ -2359,11 +2434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 122 + "__id__": 130 }, "_contentSize": { "__type__": "cc.Size", @@ -2387,11 +2462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 124 + "__id__": 132 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2432,11 +2507,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 126 + "__id__": 134 }, "_color": { "__type__": "cc.Color", @@ -2471,11 +2546,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 137 }, "_contentSize": { "__type__": "cc.Size", @@ -2499,11 +2574,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 139 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2544,15 +2619,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 119 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 141 }, "clickEvents": [ { - "__id__": 134 + "__id__": 142 } ], "_interactable": true, @@ -2604,7 +2679,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 119 + "__id__": 127 }, "_id": "" }, @@ -2641,27 +2716,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 118 + "__id__": 126 }, "_children": [ { - "__id__": 137 + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 145 + "__id__": 153 }, { - "__id__": 147 + "__id__": 155 }, { - "__id__": 149 + "__id__": 157 } ], "_prefab": { - "__id__": 152 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -2698,23 +2773,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 136 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ { - "__id__": 138 + "__id__": 146 }, { - "__id__": 140 + "__id__": 148 }, { - "__id__": 142 + "__id__": 150 } ], "_prefab": { - "__id__": 144 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -2751,11 +2826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -2779,11 +2854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 141 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2824,11 +2899,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 137 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 143 + "__id__": 151 }, "_color": { "__type__": "cc.Color", @@ -2863,11 +2938,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 154 }, "_contentSize": { "__type__": "cc.Size", @@ -2891,11 +2966,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2936,15 +3011,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 136 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 150 + "__id__": 158 }, "clickEvents": [ { - "__id__": 151 + "__id__": 159 } ], "_interactable": true, @@ -2996,7 +3071,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 136 + "__id__": 144 }, "_id": "" }, @@ -3033,11 +3108,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 154 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -3061,11 +3136,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 118 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 156 + "__id__": 164 }, "_resizeMode": 1, "_layoutType": 2, @@ -3112,11 +3187,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 159 + "__id__": 167 }, "_contentSize": { "__type__": "cc.Size", @@ -3140,11 +3215,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 161 + "__id__": 169 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3185,11 +3260,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 79 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 163 + "__id__": 171 }, "_alignFlags": 44, "_target": null, @@ -3238,26 +3313,26 @@ }, "_children": [ { - "__id__": 166 + "__id__": 174 } ], "_active": true, "_components": [ { - "__id__": 174 + "__id__": 182 }, { - "__id__": 176 + "__id__": 184 }, { - "__id__": 178 + "__id__": 186 }, { - "__id__": 180 + "__id__": 188 } ], "_prefab": { - "__id__": 183 + "__id__": 191 }, "_lpos": { "__type__": "cc.Vec3", @@ -3294,23 +3369,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 165 + "__id__": 173 }, "_children": [], "_active": true, "_components": [ { - "__id__": 167 + "__id__": 175 }, { - "__id__": 169 + "__id__": 177 }, { - "__id__": 171 + "__id__": 179 } ], "_prefab": { - "__id__": 173 + "__id__": 181 }, "_lpos": { "__type__": "cc.Vec3", @@ -3347,11 +3422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 168 + "__id__": 176 }, "_contentSize": { "__type__": "cc.Size", @@ -3375,11 +3450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 170 + "__id__": 178 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3420,11 +3495,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 166 + "__id__": 174 }, "_enabled": true, "__prefab": { - "__id__": 172 + "__id__": 180 }, "_color": { "__type__": "cc.Color", @@ -3459,11 +3534,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 183 }, "_contentSize": { "__type__": "cc.Size", @@ -3487,11 +3562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 177 + "__id__": 185 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3532,11 +3607,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 179 + "__id__": 187 }, "_alignFlags": 44, "_target": null, @@ -3568,15 +3643,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 165 + "__id__": 173 }, "_enabled": true, "__prefab": { - "__id__": 181 + "__id__": 189 }, "clickEvents": [ { - "__id__": 182 + "__id__": 190 } ], "_interactable": true, @@ -3655,23 +3730,23 @@ }, "_children": [ { - "__id__": 185 + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 191 + "__id__": 199 }, { - "__id__": 193 + "__id__": 201 }, { - "__id__": 195 + "__id__": 203 } ], "_prefab": { - "__id__": 198 + "__id__": 206 }, "_lpos": { "__type__": "cc.Vec3", @@ -3708,20 +3783,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 184 + "__id__": 192 }, "_children": [], "_active": true, "_components": [ { - "__id__": 186 + "__id__": 194 }, { - "__id__": 188 + "__id__": 196 } ], "_prefab": { - "__id__": 190 + "__id__": 198 }, "_lpos": { "__type__": "cc.Vec3", @@ -3758,11 +3833,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 195 }, "_contentSize": { "__type__": "cc.Size", @@ -3786,11 +3861,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 193 }, "_enabled": true, "__prefab": { - "__id__": 189 + "__id__": 197 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3844,11 +3919,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -3872,11 +3947,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 194 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3917,15 +3992,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 184 + "__id__": 192 }, "_enabled": true, "__prefab": { - "__id__": 196 + "__id__": 204 }, "clickEvents": [ { - "__id__": 197 + "__id__": 205 } ], "_interactable": true, @@ -3977,7 +4052,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 184 + "__id__": 192 }, "_id": "" }, @@ -4018,23 +4093,23 @@ }, "_children": [ { - "__id__": 200 + "__id__": 208 } ], "_active": true, "_components": [ { - "__id__": 206 + "__id__": 214 }, { - "__id__": 208 + "__id__": 216 }, { - "__id__": 210 + "__id__": 218 } ], "_prefab": { - "__id__": 213 + "__id__": 221 }, "_lpos": { "__type__": "cc.Vec3", @@ -4071,20 +4146,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 199 + "__id__": 207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 201 + "__id__": 209 }, { - "__id__": 203 + "__id__": 211 } ], "_prefab": { - "__id__": 205 + "__id__": 213 }, "_lpos": { "__type__": "cc.Vec3", @@ -4121,11 +4196,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 210 }, "_contentSize": { "__type__": "cc.Size", @@ -4149,11 +4224,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 200 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 212 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4207,11 +4282,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 215 }, "_contentSize": { "__type__": "cc.Size", @@ -4235,11 +4310,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 217 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4280,15 +4355,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 199 + "__id__": 207 }, "_enabled": true, "__prefab": { - "__id__": 211 + "__id__": 219 }, "clickEvents": [ { - "__id__": 212 + "__id__": 220 } ], "_interactable": true, @@ -4340,7 +4415,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 199 + "__id__": 207 }, "_id": "" }, @@ -4381,23 +4456,23 @@ }, "_children": [ { - "__id__": 215 + "__id__": 223 } ], "_active": true, "_components": [ { - "__id__": 221 + "__id__": 229 }, { - "__id__": 223 + "__id__": 231 }, { - "__id__": 225 + "__id__": 233 } ], "_prefab": { - "__id__": 228 + "__id__": 236 }, "_lpos": { "__type__": "cc.Vec3", @@ -4434,20 +4509,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 214 + "__id__": 222 }, "_children": [], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 224 }, { - "__id__": 218 + "__id__": 226 } ], "_prefab": { - "__id__": 220 + "__id__": 228 }, "_lpos": { "__type__": "cc.Vec3", @@ -4484,11 +4559,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 217 + "__id__": 225 }, "_contentSize": { "__type__": "cc.Size", @@ -4512,11 +4587,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 215 + "__id__": 223 }, "_enabled": true, "__prefab": { - "__id__": 219 + "__id__": 227 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4570,11 +4645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4598,11 +4673,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4643,15 +4718,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 214 + "__id__": 222 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 234 }, "clickEvents": [ { - "__id__": 227 + "__id__": 235 } ], "_interactable": true, @@ -4703,7 +4778,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 214 + "__id__": 222 }, "_id": "" }, @@ -4744,7 +4819,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 230 + "__id__": 238 }, "_contentSize": { "__type__": "cc.Size", @@ -4772,7 +4847,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 232 + "__id__": 240 }, "_alignFlags": 45, "_target": null, @@ -4808,13 +4883,13 @@ }, "_enabled": true, "__prefab": { - "__id__": 234 + "__id__": 242 }, "mask": false, "maskOpcity": 80, "isClickMaskeClose": false, "playerNameLabel": { - "__id__": 31 + "__id__": 28 }, "_id": "" }, @@ -4835,13 +4910,16 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 105 + "__id__": 113 }, { - "__id__": 80 + "__id__": 88 }, { - "__id__": 43 + "__id__": 71 + }, + { + "__id__": 40 }, { "__id__": 11 diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab index c4066cae..ce8de7d2 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/游戏模式渲染.prefab @@ -28,10 +28,13 @@ }, { "__id__": 6 + }, + { + "__id__": 8 } ], "_prefab": { - "__id__": 8 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -157,6 +160,24 @@ "__type__": "cc.CompPrefabInfo", "fileId": "a1GrhIZWJFDo/VFCx6xwRM" }, + { + "__type__": "c18bb2MbONOoYTjK7e9No0x", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 9 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6d5RTIbZNEtbgp8BZSZY+A" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -166,7 +187,6 @@ "__id__": 0 }, "fileId": "64PJYFWgBDZrEsaiYwZxmh", - "instance": null, "targetOverrides": null } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab new file mode 100644 index 00000000..aa33dd65 --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab @@ -0,0 +1,379 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "难度", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "难度", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 14.153, + "y": 479.694, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 17.34765625, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ffX2k0j6JECpkMJpRh7fxb" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 24, + "_fontSize": 24, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2ew9hCIIJGX4QZjD8myKye" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2fpLPtd21E3IK9D8TQ6ax+" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "774a7Ku/VNEKD20hCqNpA/", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 60 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5b1ztjg0FI7YvHJaHCU2ms" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 235, + "g": 235, + "b": 235, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85sGtNcRFEZ6uas0veM0GO" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 130.30599999999998, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "58+NYe5CFKzLz2VGok5XlR" + }, + { + "__type__": "b2374yvVElBk4il/xfjEdKc", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "title": { + "__id__": 5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e7476w/jVEHoS8lf8uIyvT" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9eultbNU5HCLypkPXqoRGA", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab.meta b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab.meta new file mode 100644 index 00000000..edcb4f4a --- /dev/null +++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/游戏/难度.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.49", + "importer": "prefab", + "imported": true, + "uuid": "c9df301b-3532-4bbd-8d7e-d0620db322a0", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "难度" + } +} diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index 810f9272..417ed072 100644 --- a/JisolGameCocos/assets/script/App.ts +++ b/JisolGameCocos/assets/script/App.ts @@ -32,10 +32,10 @@ import { Component } from "cc"; // let WsPath = `ws://localhost:8080/websocket` // let APIPath = `http://192.168.1.23:8080` // let WsPath = `ws://192.168.1.23:8080/websocket` -let APIPath = `http://192.168.0.116:8080` -let WsPath = `ws://192.168.0.116:8080/websocket` -// let APIPath = `https://api.pet.jisol.cn` -// let WsPath = `wss://api.pet.jisol.cn/websocket` +// let APIPath = `http://192.168.0.116:8080` +// let WsPath = `ws://192.168.0.116:8080/websocket` +let APIPath = `https://api.pet.jisol.cn` +let WsPath = `wss://api.pet.jisol.cn/websocket` //重写UI class JNGLayer extends JNLayer{ diff --git a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts index 8c21c746..1af83ad1 100644 --- a/JisolGameCocos/assets/script/battle/GBattleModeManager.ts +++ b/JisolGameCocos/assets/script/battle/GBattleModeManager.ts @@ -10,6 +10,8 @@ import { CCObject } from "cc"; import { Env, EnvCurrent } from "../Env"; import { TB } from "../config/data/schema"; import BattleResource from "../tools/BattleResource"; +import { director } from "cc"; +import { game } from "cc"; export enum BattleMode{ //无尽模式 @@ -127,6 +129,7 @@ export default class GBattleModeManager extends Singleton { //资源加载完成则显示世界 app.sync.onReset(); + game.step(); app.sync.onStart(); } diff --git a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts index d07b20e2..5a70093c 100644 --- a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts +++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts @@ -67,14 +67,15 @@ export default class GAttackParabolicBangRemote implements GAttackBase{ )) }) .onComplete(() => { - + //销毁 + bullet.node.destroy(); + + if(!role.get()) return; //生成爆炸特效 let effect = GEffectUtil.createOne(bang.ske); role.mode.addGNode(effect.node,bullet.node.worldPosition); //获取默认动画 effect.setAnimation(0,"animation",false); - //销毁 - bullet.node.destroy(); GDetection.testAABBCenterRole(rect(effect.node.worldPosition.x,effect.node.worldPosition.y,aw,ah)).forEach(enemy =>{ GRoleAttack.onNormalAttack(role,enemy); //普通攻击 diff --git a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts index 25f31c80..ef2502cc 100644 --- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts @@ -117,7 +117,7 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //调整相机 this.camera.enabled = true; let camreaPos = this.camera.node.worldPosition; - this.camera.node.worldPosition = v3(0,800,camreaPos.z) + this.camera.node.worldPosition = v3(0,750,camreaPos.z) //初始化状态机 this.fsm = new GFSMOnHookMode(this); @@ -354,14 +354,13 @@ export default class GOnHookMode extends GDefaultMode<{},{}>{ //生成敌人 onResetGenerateEnemy(){ this.enemyRoles = []; - //获取敌人 - let creeps = GOnHookManager.getIns().getNextCreeps(); - if(!creeps) return; //没有获取到野怪则返回 - let sign = TD.TbGOnHookMaps.get(GOnHookData.getIns().info.onHookMap).sign; let table:{data:TbGEntity.TOnHookLevel} = TD[sign].get(GOnHookData.getIns().info.levelId); for (let index = 0; index < table.data.petSize; index++) { + //获取敌人 + let creeps = GOnHookManager.getIns().getNextCreeps(); + if(!creeps) return; //没有获取到野怪则返回 this.onGenCreeps(index + 1,creeps); } // this.enemyInfo.roles.forEach((info,index) => this.onGenRole(GOnHookModePlayerEnum.ENEMY,index + 1,info)); diff --git a/JisolGameCocos/assets/script/data/GOnHookData.ts b/JisolGameCocos/assets/script/data/GOnHookData.ts index a755ddaa..08448b8a 100644 --- a/JisolGameCocos/assets/script/data/GOnHookData.ts +++ b/JisolGameCocos/assets/script/data/GOnHookData.ts @@ -10,10 +10,15 @@ export default class GOnHookData extends BaseData{ info:ModeOnHookOV; async onInit() { - this.info = await GAPI.GOnHookInfo(); + await this.onUpdateInfo(); console.log("GOnHookData Info",this.info); } + //刷新数据 + async onUpdateInfo(){ + this.info = await GAPI.GOnHookInfo(); + } + //切换地图 async setMap(mapId:number){ @@ -22,5 +27,11 @@ export default class GOnHookData extends BaseData{ } + //下一关 + async onNextLevel(){ + await GAPI.GOnHookNextLevel(); + await this.onUpdateInfo(); + } + } diff --git a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts index 65ac652f..835de372 100644 --- a/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts +++ b/JisolGameCocos/assets/script/manager/battle/mode/GOnHookManager.ts @@ -53,7 +53,8 @@ export default class GOnHookManager extends Singleton{ //获取下一只野怪 getNextCreeps(){ if(!this.sreeps) return; - let creeps = this.sreeps.get(this.sreeps.keys().next()?.value) + let creeps = this.sreeps.get(this.sreeps.keys().next()?.value); + this.sreeps.delete(creeps.key); return creeps; } @@ -129,18 +130,29 @@ export default class GOnHookManager extends Singleton{ app.event.emit(GOnHookManagerEvent.RESET_DATA); } + //下一关 + async onNextLevel(){ + GOnHookData.getIns().onNextLevel(); + app.layer.Open(GUI.Tips,{text:"下一关"}); + this.onResetMap(); + } + //切换场景 async setMap(mapId:number){ await GOnHookData.getIns().setMap(mapId); + this.onResetMap(); + } + + //重置场景 + onResetMap(){ //通知地图已切换 app.event.emit(GOnHookManagerEvent.UPDATE_MAP); //重置数据 this.onResetData(); //重置场景 GBattleModeManager.getIns().Open(BattleMode.OnHook,true); - } diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts new file mode 100644 index 00000000..b86403b8 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts @@ -0,0 +1,33 @@ +import { _decorator, Component, Node } from 'cc'; +import GOnHookData from '../../../data/GOnHookData'; +import { TD } from '../../../App'; +import { Label } from 'cc'; +import { TbGEntity } from '../../../config/data/schema'; +const { ccclass, property } = _decorator; + +@ccclass('GameDifficultyTitle') +export class GameDifficultyTitle extends Component { + + @property(Label) + title:Label; + + protected update(dt: number): void { + + let info = GOnHookData.getIns().info; + let sign = null; + let levelId = info.levelId; + if(info && levelId){ + sign = TD.TbGOnHookMaps.get(info.onHookMap)?.sign; + if(!sign) return; + }else return; + + let table:{data:TbGEntity.TOnHookLevel} = TD[sign].get(GOnHookData.getIns().info.levelId); + + //显示难度 + this.title.string = `难度 : ${table.data.level}-${table.data.childLevel}`; + + } + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts.meta new file mode 100644 index 00000000..828649ff --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Game/GameDifficultyTitle.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "b2374caf-5449-4193-88a5-ff17e311d29c", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts b/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts new file mode 100644 index 00000000..b64ec2b7 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts @@ -0,0 +1,43 @@ +import { _decorator, Component, Node } from 'cc'; +import { app } from '../../../App'; +import { GModeEvent } from '../../../battle/modes/GMode'; +import { tween } from 'cc'; +import { Vec3 } from 'cc'; +import RandomUtil from '../../../../../extensions/ngame/assets/ngame/util/RandomUtil'; +import { v3 } from 'cc'; +const { ccclass, property } = _decorator; + +//游戏震屏 +@ccclass('ModeShakeScreen') +export class ModeShakeScreen extends Component { + + local:Vec3; + + onLoad(){ + + this.local = this.node.position.clone(); + app.event.on(GModeEvent.HIT,this.onShakeScreen,this); + + } + + protected onDestroy(): void { + + app.event.off(GModeEvent.HIT,this.onShakeScreen,this); + + } + + onShakeScreen(){ + + tween(this.node). + to(0.1, { position: this.local.clone().add(v3(RandomUtil.RandomInt(-5, 5), RandomUtil.RandomInt(-5, 0), 0)) }) + .call(() => { + tween(this.node).to(0.1 / 2, { position: this.local.clone() }).start(); + }) + .start(); + + } + + +} + + diff --git a/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts.meta b/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts.meta new file mode 100644 index 00000000..48308dd9 --- /dev/null +++ b/JisolGameCocos/assets/script/ui/Consts/Game/ModeShakeScreen.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "c18bbd8c-6ce3-4ea1-84e3-2bb7bd368d31", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/ui/Home/MainView.ts b/JisolGameCocos/assets/script/ui/Home/MainView.ts index 4cdd9222..4a312daa 100644 --- a/JisolGameCocos/assets/script/ui/Home/MainView.ts +++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts @@ -7,6 +7,7 @@ import { JNGLayerBase } from '../../components/JNComponent'; import { app } from '../../App'; import { GAction } from '../../consts/GAction'; import { GAPI } from '../../consts/GAPI'; +import GOnHookManager from '../../manager/battle/mode/GOnHookManager'; const { ccclass, property } = _decorator; @ccclass('MainView') @@ -63,8 +64,7 @@ export class MainView extends JNGLayerBase { //点击下一关 async onClickNextLevel(){ - await GAPI.GOnHookNextLevel(); - app.layer.Open(GUI.Tips,{text:"下一关"}); + GOnHookManager.getIns().onNextLevel(); } } diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index 01f3e124..34f12bac 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit 01f3e1248ac4e0d1469e087ab84d8b04315273ff +Subproject commit 34f12bac5650f7782074cd6b369f77fa3e814641 diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java index 01bafe55..0c852e59 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/mode/GOnHookController.java @@ -108,6 +108,8 @@ public class GOnHookController { //保存地图 modeOnHookService.saveOrUpdate(data); + //下一关 清理历史野怪 + CREEPS.put(player.getPlayerId(),new HashMap<>()); return NewsContext.onSuccess("下一关"); } diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 345f2c91..364ad07d 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -4,7 +4,8 @@ spring: datasource: username: pet_jisol_cn password: sThsBwjfDcaw2wJR - url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 +# url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8 driver-class-name: com.mysql.cj.jdbc.Driver jackson: serialization: