This commit is contained in:
Vladislav
2022-12-25 21:13:15 +04:00
parent 76c4264838
commit 46efc92253
55 changed files with 11966 additions and 2515 deletions

View File

@@ -27,11 +27,11 @@
"_active": true,
"_components": [],
"_prefab": {
"__id__": 114
"__id__": 117
},
"autoReleaseAssets": false,
"_globals": {
"__id__": 119
"__id__": 122
},
"_id": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f"
},
@@ -246,17 +246,17 @@
],
"_active": true,
"_components": [
{
"__id__": 110
},
{
"__id__": 111
},
{
"__id__": 112
},
{
"__id__": 113
},
{
"__id__": 114
},
{
"__id__": 115
},
{
"__id__": 116
}
],
"_prefab": null,
@@ -1427,9 +1427,6 @@
{
"__id__": 59
},
{
"__id__": 94
},
{
"__id__": 97
},
@@ -1441,12 +1438,15 @@
},
{
"__id__": 106
},
{
"__id__": 109
}
],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 112
}
],
"_prefab": null,
@@ -1490,13 +1490,13 @@
"__id__": 60
},
{
"__id__": 84
"__id__": 87
}
],
"_active": true,
"_components": [
{
"__id__": 93
"__id__": 96
}
],
"_prefab": null,
@@ -1540,26 +1540,26 @@
"__id__": 61
},
{
"__id__": 70
"__id__": 73
},
{
"__id__": 73
"__id__": 76
}
],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 85
},
{
"__id__": 83
"__id__": 86
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": -320,
"y": 479.9999999999999,
"y": 480,
"z": -1000
},
"_lrot": {
@@ -1597,22 +1597,25 @@
},
{
"__id__": 65
},
{
"__id__": 68
}
],
"_active": true,
"_components": [
{
"__id__": 68
"__id__": 71
},
{
"__id__": 69
"__id__": 72
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 320,
"y": -30,
"y": -14,
"z": 0
},
"_lrot": {
@@ -1645,7 +1648,7 @@
"__id__": 61
},
"_children": [],
"_active": true,
"_active": false,
"_components": [
{
"__id__": 63
@@ -1658,7 +1661,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": -300,
"y": 0,
"y": -13.496,
"z": 0
},
"_lrot": {
@@ -1744,7 +1747,7 @@
},
{
"__type__": "cc.Node",
"_name": "MovableBar",
"_name": "Background-001",
"_objFlags": 0,
"_parent": {
"__id__": 61
@@ -1775,8 +1778,113 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"x": 2,
"y": 2,
"z": 1
},
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": "64CaaaemJIVKV0HxoRpHUz"
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 300,
"height": 12
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 1
},
"_id": "e36kPPILxNhrk6FRIW0gdc"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
},
"_enabled": true,
"__prefab": null,
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 207,
"g": 207,
"b": 207,
"a": 255
},
"_spriteFrame": {
"__uuid__": "273f0551-3e8b-4346-b1b9-9a93514ec0c1@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": "edz3gVlFVFwY1B8kGGGPfm"
},
{
"__type__": "cc.Node",
"_name": "MovableBar",
"_objFlags": 0,
"_parent": {
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
},
{
"__id__": 70
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": -296,
"y": -12,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 2,
"y": 2,
"z": 1
},
"_layer": 33554432,
@@ -1793,14 +1901,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 68
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 600,
"height": 16
"width": 296,
"height": 8
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1814,7 +1922,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 65
"__id__": 68
},
"_enabled": true,
"__prefab": null,
@@ -1823,16 +1931,16 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 71,
"g": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__uuid__": "e06153a0-2451-4c64-884a-3e41e1b21bfa@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -1878,10 +1986,10 @@
"_enabled": true,
"__prefab": null,
"_barSprite": {
"__id__": 67
"__id__": 70
},
"_mode": 0,
"_totalLength": 600,
"_totalLength": 284,
"_progress": 1,
"_reverse": false,
"_id": "5a1CWtS5hFdK4pcdIQ6qWC"
@@ -1897,17 +2005,17 @@
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 74
},
{
"__id__": 72
"__id__": 75
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 320,
"y": -80,
"y": -66,
"z": 1000
},
"_lrot": {
@@ -1937,7 +2045,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 73
},
"_enabled": true,
"__prefab": null,
@@ -1958,7 +2066,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 73
},
"_enabled": true,
"__prefab": null,
@@ -2003,32 +2111,32 @@
},
"_children": [
{
"__id__": 74
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 77
},
{
"__id__": 78
},
{
"__id__": 79
},
{
"__id__": 80
},
{
"__id__": 81
},
{
"__id__": 82
},
{
"__id__": 83
},
{
"__id__": 84
}
],
"_prefab": null,
"_lpos": {
"__type__": "cc.Vec3",
"x": 603.924,
"y": -76.711,
"x": 588,
"y": -66,
"z": 0
},
"_lrot": {
@@ -2040,8 +2148,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"x": 2,
"y": 2,
"z": 1
},
"_layer": 33554432,
@@ -2058,16 +2166,16 @@
"_name": "Square",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 78
},
{
"__id__": 76
"__id__": 79
}
],
"_prefab": null,
@@ -2086,7 +2194,7 @@
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"x": 2,
"y": 1,
"z": 1
},
@@ -2104,13 +2212,13 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 77
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 12.86,
"width": 4.5,
"height": 40
},
"_anchorPoint": {
@@ -2125,7 +2233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 77
},
"_enabled": true,
"__prefab": null,
@@ -2134,16 +2242,16 @@
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "||",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 40,
"_fontSize": 40,
"_actualFontSize": 14,
"_fontSize": 14,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
@@ -2166,14 +2274,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"__prefab": null,
"_contentSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
"width": 32,
"height": 24
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -2187,7 +2295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"__prefab": null,
@@ -2202,7 +2310,7 @@
"a": 255
},
"_spriteFrame": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__uuid__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -2225,13 +2333,13 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"__prefab": null,
"clickEvents": [],
"_interactable": true,
"_transition": 2,
"_transition": 3,
"_normalColor": {
"__type__": "cc.Color",
"r": 214,
@@ -2261,7 +2369,7 @@
"a": 255
},
"_normalSprite": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__uuid__": "5a4486c7-4d66-464c-ad81-6627c758eca2@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_hoverSprite": {
@@ -2277,9 +2385,9 @@
"__expectedType__": "cc.SpriteFrame"
},
"_duration": 0.1,
"_zoomScale": 1.2,
"_zoomScale": 0.92,
"_target": {
"__id__": 73
"__id__": 76
},
"_id": "44V8O8mzZKQZv5NNhU9U2X"
},
@@ -2288,7 +2396,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"__prefab": null,
@@ -2299,12 +2407,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"__prefab": null,
"button": {
"__id__": 80
"__id__": 83
},
"_id": "19CfluWQpOB4qddmLDK5n9"
},
@@ -2367,13 +2475,13 @@
},
"_children": [
{
"__id__": 85
"__id__": 88
}
],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 95
}
],
"_prefab": null,
@@ -2410,23 +2518,23 @@
"_name": "VirtualJoystic",
"_objFlags": 0,
"_parent": {
"__id__": 84
"__id__": 87
},
"_children": [
{
"__id__": 86
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 89
"__id__": 92
},
{
"__id__": 90
"__id__": 93
},
{
"__id__": 91
"__id__": 94
}
],
"_prefab": null,
@@ -2463,16 +2571,16 @@
"_name": "Knob",
"_objFlags": 0,
"_parent": {
"__id__": 85
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 90
},
{
"__id__": 88
"__id__": 91
}
],
"_prefab": null,
@@ -2509,7 +2617,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 89
},
"_enabled": true,
"__prefab": null,
@@ -2530,7 +2638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 89
},
"_enabled": true,
"__prefab": null,
@@ -2568,7 +2676,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 88
},
"_enabled": true,
"__prefab": null,
@@ -2589,7 +2697,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 88
},
"_enabled": true,
"__prefab": null,
@@ -2627,13 +2735,13 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 88
},
"_enabled": true,
"__prefab": null,
"maxDistance": 50,
"knob": {
"__id__": 86
"__id__": 89
},
"_id": "50ceZG62tGlYXvZWEvSDKl"
},
@@ -2642,7 +2750,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 87
},
"_enabled": true,
"__prefab": null,
@@ -2668,13 +2776,13 @@
"_enabled": true,
"__prefab": null,
"xpBar": {
"__id__": 69
},
"timeAliveText": {
"__id__": 72
},
"timeAliveText": {
"__id__": 75
},
"pauseBtn": {
"__id__": 80
"__id__": 83
},
"_id": "bau/7eItRFrKKoAZZb/uYL"
},
@@ -2689,10 +2797,10 @@
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 98
},
{
"__id__": 96
"__id__": 99
}
],
"_prefab": null,
@@ -2729,7 +2837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 97
},
"_enabled": true,
"__prefab": null,
@@ -2750,7 +2858,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
"__id__": 97
},
"_enabled": true,
"__prefab": null,
@@ -2781,10 +2889,10 @@
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 101
},
{
"__id__": 99
"__id__": 102
}
],
"_prefab": null,
@@ -2821,7 +2929,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 100
},
"_enabled": true,
"__prefab": null,
@@ -2842,7 +2950,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 100
},
"_enabled": true,
"__prefab": null,
@@ -2886,10 +2994,10 @@
"_active": true,
"_components": [
{
"__id__": 101
"__id__": 104
},
{
"__id__": 102
"__id__": 105
}
],
"_prefab": null,
@@ -2926,7 +3034,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 103
},
"_enabled": true,
"__prefab": null,
@@ -2947,7 +3055,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 100
"__id__": 103
},
"_enabled": true,
"__prefab": null,
@@ -2991,10 +3099,10 @@
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 107
},
{
"__id__": 105
"__id__": 108
}
],
"_prefab": null,
@@ -3031,7 +3139,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 106
},
"_enabled": true,
"__prefab": null,
@@ -3052,7 +3160,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 106
},
"_enabled": true,
"__prefab": null,
@@ -3096,10 +3204,10 @@
"_active": true,
"_components": [
{
"__id__": 107
"__id__": 110
},
{
"__id__": 108
"__id__": 111
}
],
"_prefab": null,
@@ -3136,7 +3244,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 109
},
"_enabled": true,
"__prefab": null,
@@ -3157,7 +3265,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 109
},
"_enabled": true,
"__prefab": null,
@@ -3203,7 +3311,7 @@
"_priority": 1073741824,
"_fov": 45,
"_fovAxis": 0,
"_orthoHeight": 479.99999999999994,
"_orthoHeight": 480,
"_near": 0,
"_far": 2000,
"_color": {
@@ -3264,7 +3372,7 @@
"_enabled": true,
"__prefab": null,
"_cameraComponent": {
"__id__": 109
"__id__": 112
},
"_alignCanvasWithScreen": true,
"_id": "12O/ljcVlEqLmVm3U2gEOQ"
@@ -3308,7 +3416,7 @@
"_enabled": true,
"__prefab": null,
"virtualJoystic": {
"__id__": 91
"__id__": 94
},
"player": null,
"haloProjectileLauncherComponent": {
@@ -3330,16 +3438,16 @@
"__id__": 53
},
"camera": {
"__id__": 109
"__id__": 112
},
"gameUI": {
"__id__": 93
"__id__": 96
},
"background": {
"__id__": 23
},
"modalWindowManager": {
"__id__": 96
"__id__": 99
},
"gameAudioAdapter": null,
"_id": "3a9z1bqlFCGL4/WyDwU4L5"
@@ -3349,10 +3457,10 @@
"fileId": "cffa5b19-2043-4cef-8221-1a10ab7a2c1f",
"targetOverrides": [
{
"__id__": 115
"__id__": 118
},
{
"__id__": 117
"__id__": 120
}
],
"nestedPrefabInstanceRoots": [
@@ -3370,7 +3478,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 113
"__id__": 116
},
"sourceInfo": null,
"propertyPath": [
@@ -3380,7 +3488,7 @@
"__id__": 32
},
"targetInfo": {
"__id__": 116
"__id__": 119
}
},
{
@@ -3392,7 +3500,7 @@
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 113
"__id__": 116
},
"sourceInfo": null,
"propertyPath": [
@@ -3402,7 +3510,7 @@
"__id__": 13
},
"targetInfo": {
"__id__": 118
"__id__": 121
}
},
{
@@ -3414,19 +3522,19 @@
{
"__type__": "cc.SceneGlobals",
"ambient": {
"__id__": 120
},
"shadows": {
"__id__": 121
},
"_skybox": {
"__id__": 122
},
"fog": {
"__id__": 123
},
"octree": {
"shadows": {
"__id__": 124
},
"_skybox": {
"__id__": 125
},
"fog": {
"__id__": 126
},
"octree": {
"__id__": 127
}
},
{

File diff suppressed because it is too large Load Diff