Predective algo
This commit is contained in:
parent
cd837472b9
commit
7822aec907
|
|
@ -85,6 +85,6 @@ Material:
|
|||
- _UseUIAlphaClip: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.322218, g: 0.214812, b: 0, a: 1}
|
||||
- _Color: {r: 0.34425, g: 0.214812, b: 0, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -85,6 +85,6 @@ Material:
|
|||
- _UseUIAlphaClip: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 0.227448, g: 0.151632, b: 0, a: 1}
|
||||
- _Color: {r: 0.243, g: 0.151632, b: 0, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -209,12 +209,12 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 231266797}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -20}
|
||||
m_LocalScale: {x: 2, y: 2, z: 2}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_Father: {fileID: 1120561247}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &231266801
|
||||
MonoBehaviour:
|
||||
|
|
@ -290,76 +290,39 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
allHits:
|
||||
- 0
|
||||
- 1.007976
|
||||
- 2.9457881
|
||||
- 3.239634
|
||||
- 3.535689
|
||||
- 3.7529073
|
||||
- 4.945534
|
||||
- 5.2670794
|
||||
- 5.5404615
|
||||
- 5.838297
|
||||
- 8.023146
|
||||
- 9.277683
|
||||
- 9.612368
|
||||
- 9.978131
|
||||
- 11.05203
|
||||
- 11.563883
|
||||
- 11.862214
|
||||
- 12.16262
|
||||
- 13.06958
|
||||
- 13.596535
|
||||
- 13.906741
|
||||
- 16.131954
|
||||
- 17.358862
|
||||
- 17.68974
|
||||
- 17.955818
|
||||
- 18.111351
|
||||
- 18.661879
|
||||
- 19.170216
|
||||
- 19.696922
|
||||
- 20.262955
|
||||
- 20.802982
|
||||
- 21.02081
|
||||
- 21.289953
|
||||
- 21.832458
|
||||
- 22.291527
|
||||
- 23.767723
|
||||
- 24.27649
|
||||
- 25.550953
|
||||
- 25.946125
|
||||
- 26.332308
|
||||
- 26.837963
|
||||
- 27.237825
|
||||
- 27.88322
|
||||
- 28.390924
|
||||
- 29.355066
|
||||
- 29.900814
|
||||
- 30.385643
|
||||
- 32.436077
|
||||
- 33.891426
|
||||
- 34.48847
|
||||
- 34.974228
|
||||
- 35.49399
|
||||
- 36.081886
|
||||
- 36.373074
|
||||
- 36.975796
|
||||
- 37.52076
|
||||
- 37.923553
|
||||
- 38.40126
|
||||
- 39.078022
|
||||
- 39.528507
|
||||
- 40.53657
|
||||
- 41.026608
|
||||
- 41.505398
|
||||
- 42.154396
|
||||
- 42.503956
|
||||
- 1.1148299
|
||||
- 1.3929932
|
||||
- 1.5950565
|
||||
- 1.8338774
|
||||
- 2.933696
|
||||
- 3.111338
|
||||
- 3.414558
|
||||
- 3.6234694
|
||||
- 3.9272337
|
||||
- 4.897483
|
||||
- 5.220816
|
||||
- 5.4118595
|
||||
- 5.721769
|
||||
- 5.999161
|
||||
- 8.041066
|
||||
- 9.313174
|
||||
- 9.509796
|
||||
- 9.844671
|
||||
- 10.0383
|
||||
- 11.124898
|
||||
- 11.640907
|
||||
- 11.824151
|
||||
- 12.123945
|
||||
- 13.151882
|
||||
- 13.705397
|
||||
- 13.959501
|
||||
- 14.183809
|
||||
- 16.226349
|
||||
line: {fileID: 1026138248}
|
||||
offsetMultipliers: {x: 1.05, y: 0.77}
|
||||
objectToMove: {fileID: 1120561245}
|
||||
source: {fileID: 861733210}
|
||||
audioOffset: 0.05
|
||||
audioOffset: -0.05
|
||||
MoveCmd: 0
|
||||
bouncingIntensity: 0.65
|
||||
--- !u!4 &335227241
|
||||
|
|
@ -565,71 +528,34 @@ LineRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_Positions:
|
||||
- {x: 0, y: 0, z: 0}
|
||||
- {x: 1.0583748, y: -0.7761415, z: 0}
|
||||
- {x: 3.0930774, y: 0.71597373, z: 0}
|
||||
- {x: 3.4016156, y: 0.48971242, z: 0}
|
||||
- {x: 3.7124734, y: 0.71767485, z: 0}
|
||||
- {x: 3.9405525, y: 0.5504169, z: 0}
|
||||
- {x: 5.1928105, y: 1.4687396, z: 0}
|
||||
- {x: 5.530433, y: 1.2211499, z: 0}
|
||||
- {x: 5.8174844, y: 1.4316542, z: 0}
|
||||
- {x: 6.1302114, y: 1.202321, z: 0}
|
||||
- {x: 8.424302, y: 2.8846545, z: 0}
|
||||
- {x: 9.741567, y: 1.9186606, z: 0}
|
||||
- {x: 10.092985, y: 2.1763675, z: 0}
|
||||
- {x: 10.477037, y: 1.8947295, z: 0}
|
||||
- {x: 11.60463, y: 2.7216313, z: 0}
|
||||
- {x: 12.1420765, y: 2.3275044, z: 0}
|
||||
- {x: 12.455324, y: 2.5572195, z: 0}
|
||||
- {x: 12.77075, y: 2.3259072, z: 0}
|
||||
- {x: 13.723059, y: 3.0242667, z: 0}
|
||||
- {x: 14.2763605, y: 2.6185117, z: 0}
|
||||
- {x: 14.6020775, y: 2.8573706, z: 0}
|
||||
- {x: 16.93855, y: 1.1439567, z: 0}
|
||||
- {x: 18.226805, y: 2.0886755, z: 0}
|
||||
- {x: 18.574224, y: 1.8339, z: 0}
|
||||
- {x: 18.85361, y: 2.0387807, z: 0}
|
||||
- {x: 19.016918, y: 1.9190204, z: 0}
|
||||
- {x: 19.59497, y: 2.3429267, z: 0}
|
||||
- {x: 20.128725, y: 1.9515072, z: 0}
|
||||
- {x: 20.681768, y: 2.3570714, z: 0}
|
||||
- {x: 21.276102, y: 1.9212265, z: 0}
|
||||
- {x: 21.84313, y: 2.3370478, z: 0}
|
||||
- {x: 22.071848, y: 2.169321, z: 0}
|
||||
- {x: 22.35445, y: 2.3765619, z: 0}
|
||||
- {x: 22.92408, y: 1.9588329, z: 0}
|
||||
- {x: 23.406101, y: 2.3123155, z: 0}
|
||||
- {x: 24.956108, y: 1.1756444, z: 0}
|
||||
- {x: 25.490313, y: 1.5673944, z: 0}
|
||||
- {x: 26.828499, y: 0.58605736, z: 0}
|
||||
- {x: 27.24343, y: 0.8903399, z: 0}
|
||||
- {x: 27.648922, y: 0.5929792, z: 0}
|
||||
- {x: 28.17986, y: 0.9823338, z: 0}
|
||||
- {x: 28.599716, y: 0.67443985, z: 0}
|
||||
- {x: 29.27738, y: 1.1713942, z: 0}
|
||||
- {x: 29.810469, y: 0.7804623, z: 0}
|
||||
- {x: 30.822819, y: 1.5228516, z: 0}
|
||||
- {x: 31.395853, y: 1.1026258, z: 0}
|
||||
- {x: 31.904924, y: 1.4759442, z: 0}
|
||||
- {x: 34.05788, y: -0.10289007, z: 0}
|
||||
- {x: 35.585995, y: 1.0177286, z: 0}
|
||||
- {x: 36.21289, y: 0.55800617, z: 0}
|
||||
- {x: 36.72294, y: 0.93204117, z: 0}
|
||||
- {x: 37.26869, y: 0.5318229, z: 0}
|
||||
- {x: 37.88598, y: 0.9845016, z: 0}
|
||||
- {x: 38.191727, y: 0.7602874, z: 0}
|
||||
- {x: 38.824585, y: 1.2243835, z: 0}
|
||||
- {x: 39.396797, y: 0.80476135, z: 0}
|
||||
- {x: 39.81973, y: 1.1149126, z: 0}
|
||||
- {x: 40.321323, y: 0.7470783, z: 0}
|
||||
- {x: 41.03192, y: 1.2681848, z: 0}
|
||||
- {x: 41.504932, y: 0.92131114, z: 0}
|
||||
- {x: 42.563396, y: 1.6975206, z: 0}
|
||||
- {x: 43.077934, y: 1.3201929, z: 0}
|
||||
- {x: 43.580666, y: 1.6888615, z: 0}
|
||||
- {x: 44.262115, y: 1.1891328, z: 0}
|
||||
- {x: 44.62915, y: 1.4582938, z: 0}
|
||||
- {x: 1.1705713, y: 0, z: 0}
|
||||
- {x: 1.4626428, y: -0.21418574, z: 0}
|
||||
- {x: 1.6748093, y: -0.05859699, z: 0}
|
||||
- {x: 1.9255712, y: -0.24248908, z: 0}
|
||||
- {x: 3.0803807, y: 0.6043712, z: 0}
|
||||
- {x: 3.2669046, y: 0.46758696, z: 0}
|
||||
- {x: 3.5852857, y: 0.7010664, z: 0}
|
||||
- {x: 3.8046427, y: 0.5402046, z: 0}
|
||||
- {x: 4.123595, y: 0.7741031, z: 0}
|
||||
- {x: 5.142357, y: 0.027011259, z: 0}
|
||||
- {x: 5.481857, y: 0.27597788, z: 0}
|
||||
- {x: 5.682452, y: 0.12887448, z: 0}
|
||||
- {x: 6.007857, y: 0.36750466, z: 0}
|
||||
- {x: 6.2991185, y: 0.15391289, z: 0}
|
||||
- {x: 8.443119, y: 1.72618, z: 0}
|
||||
- {x: 9.778832, y: 0.7466568, z: 0}
|
||||
- {x: 9.985286, y: 0.8980556, z: 0}
|
||||
- {x: 10.336905, y: 0.6402018, z: 0}
|
||||
- {x: 10.540214, y: 0.7892956, z: 0}
|
||||
- {x: 11.681142, y: -0.04738513, z: 0}
|
||||
- {x: 12.222952, y: 0.34994206, z: 0}
|
||||
- {x: 12.415358, y: 0.20884438, z: 0}
|
||||
- {x: 12.730142, y: 0.4396859, z: 0}
|
||||
- {x: 13.809476, y: -0.3518255, z: 0}
|
||||
- {x: 14.390666, y: 0.074380636, z: 0}
|
||||
- {x: 14.657475, y: -0.12127991, z: 0}
|
||||
- {x: 14.892999, y: 0.051437255, z: 0}
|
||||
- {x: 17.037666, y: -1.5213182, z: 0}
|
||||
m_Parameters:
|
||||
serializedVersion: 3
|
||||
widthMultiplier: 0.1
|
||||
|
|
@ -782,17 +708,17 @@ Transform:
|
|||
m_GameObject: {fileID: 1120561245}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 25.9953, y: 1.1970692, z: 0}
|
||||
m_LocalPosition: {x: 6.893472, y: -1.0804393, z: 0}
|
||||
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Children:
|
||||
- {fileID: 231266800}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
m_Roots:
|
||||
- {fileID: 231266800}
|
||||
- {fileID: 1026138249}
|
||||
- {fileID: 335227241}
|
||||
- {fileID: 1120561247}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -333,6 +333,7 @@ RectTransform:
|
|||
- {fileID: 461825204}
|
||||
- {fileID: 2013350273}
|
||||
- {fileID: 1479529849}
|
||||
- {fileID: 847997541}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
|
|
@ -3634,6 +3635,126 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 248112687}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &272312063
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 272312064}
|
||||
- component: {fileID: 272312066}
|
||||
- component: {fileID: 272312065}
|
||||
- component: {fileID: 272312067}
|
||||
m_Layer: 5
|
||||
m_Name: prev
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &272312064
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 272312063}
|
||||
m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2092000620}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -55.8, y: -0.00000095367}
|
||||
m_SizeDelta: {x: 85.2641, y: 93.3943}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &272312065
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 272312063}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &272312066
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 272312063}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &272312067
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 272312063}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 272312065}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &320832607
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3955,7 +4076,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -68.33}
|
||||
m_AnchoredPosition: {x: 99, y: -68.33}
|
||||
m_SizeDelta: {x: 160, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &392222973
|
||||
|
|
@ -4081,6 +4202,7 @@ MonoBehaviour:
|
|||
pinBtn: {fileID: 1807985598}
|
||||
removePinBtn: {fileID: 842425062}
|
||||
followSeekerToggle: {fileID: 392222973}
|
||||
playbackTimeTxt: {fileID: 847997542}
|
||||
--- !u!4 &449693225
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5362,6 +5484,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
cam: {fileID: 2103526748}
|
||||
audioAnalyzer: {fileID: 84336124}
|
||||
controller: {fileID: 449693224}
|
||||
referenceLine: {fileID: 1009150984}
|
||||
startX: 0
|
||||
endX: 0
|
||||
|
|
@ -5644,6 +5767,140 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 842425060}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &847997540
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 847997541}
|
||||
- component: {fileID: 847997543}
|
||||
- component: {fileID: 847997542}
|
||||
m_Layer: 5
|
||||
m_Name: playbackTimeTxt
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &847997541
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847997540}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 48888091}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -292.73}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &847997542
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847997540}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 00:00:00
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &847997543
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 847997540}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &863444959
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -12821,6 +13078,126 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2038303719}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2048154277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2048154278}
|
||||
- component: {fileID: 2048154280}
|
||||
- component: {fileID: 2048154279}
|
||||
- component: {fileID: 2048154281}
|
||||
m_Layer: 5
|
||||
m_Name: nxt
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2048154278
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048154277}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2092000620}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 59.2, y: -0.00000095367}
|
||||
m_SizeDelta: {x: 85.2641, y: 93.3943}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2048154279
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048154277}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!222 &2048154280
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048154277}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2048154281
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2048154277}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_WrapAround: 0
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 2048154279}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &2070006573
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -12886,6 +13263,7 @@ RectTransform:
|
|||
- {fileID: 1807985597}
|
||||
- {fileID: 842425061}
|
||||
- {fileID: 392222972}
|
||||
- {fileID: 2092000620}
|
||||
m_Father: {fileID: 48888091}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.8, y: 0}
|
||||
|
|
@ -12931,6 +13309,158 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2086427311}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2092000619
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2092000620}
|
||||
- component: {fileID: 2092000622}
|
||||
- component: {fileID: 2092000621}
|
||||
- component: {fileID: 2092000623}
|
||||
m_Layer: 5
|
||||
m_Name: speedControoller
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2092000620
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2092000619}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2048154278}
|
||||
- {fileID: 272312064}
|
||||
m_Father: {fileID: 2086427312}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -96.5, y: -68.02902}
|
||||
m_SizeDelta: {x: 92.0932, y: 41.1419}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2092000621
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2092000619}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 0.25x
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_fontColorGradientPreset: {fileID: 0}
|
||||
m_spriteAsset: {fileID: 0}
|
||||
m_tintAllSprites: 0
|
||||
m_StyleSheet: {fileID: 0}
|
||||
m_TextStyleHashCode: -1183493901
|
||||
m_overrideHtmlColors: 0
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24.7
|
||||
m_fontSizeBase: 24.7
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
m_fontSizeMax: 72
|
||||
m_fontStyle: 0
|
||||
m_HorizontalAlignment: 2
|
||||
m_VerticalAlignment: 512
|
||||
m_textAlignment: 65535
|
||||
m_characterSpacing: 0
|
||||
m_wordSpacing: 0
|
||||
m_lineSpacing: 0
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
m_horizontalMapping: 0
|
||||
m_verticalMapping: 0
|
||||
m_uvLineOffset: 0
|
||||
m_geometrySortingOrder: 0
|
||||
m_IsTextObjectScaleStatic: 0
|
||||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
m_baseMaterial: {fileID: 0}
|
||||
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||
--- !u!222 &2092000622
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2092000619}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2092000623
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2092000619}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 78209ab90a9209446921f39c899d1147, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
nextBtn: {fileID: 2048154281}
|
||||
prevBtn: {fileID: 272312067}
|
||||
txt: {fileID: 2092000621}
|
||||
--- !u!1 &2103526745
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -13084,6 +13614,6 @@ SceneRoots:
|
|||
- {fileID: 1028594940}
|
||||
- {fileID: 610517871}
|
||||
- {fileID: 48888091}
|
||||
- {fileID: 47044655}
|
||||
- {fileID: 2103526748}
|
||||
- {fileID: 1900714879}
|
||||
- {fileID: 47044655}
|
||||
|
|
|
|||
|
|
@ -7,8 +7,10 @@ public class CamFollower : MonoBehaviour
|
|||
public Transform target;
|
||||
Vector3 offset;
|
||||
public float speed = 0.1f;
|
||||
public static CamFollower instance;
|
||||
private void Awake()
|
||||
{
|
||||
instance = this;
|
||||
offset = transform.position - target.position;
|
||||
}
|
||||
void Start()
|
||||
|
|
@ -17,8 +19,12 @@ public class CamFollower : MonoBehaviour
|
|||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void FixedUpdate ()
|
||||
public void UpdateFrame ()
|
||||
{
|
||||
}
|
||||
|
||||
void LateUpdate(){
|
||||
transform.position = Vector3.Lerp(transform.position, target.position + offset, speed);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
21
Assets/Scripts/Helpers.cs
Normal file
21
Assets/Scripts/Helpers.cs
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
using System.Collections.Generic;
|
||||
|
||||
public static class Helpers{
|
||||
|
||||
public static List<float> BubbleSort(List<float> array){
|
||||
float temp =0;
|
||||
List<float> output = new List<float>();
|
||||
output.AddRange(array);
|
||||
for(int write=0; write < output.Count; write++){
|
||||
for(int sort=0; sort < output.Count-1; sort++){
|
||||
if(output[sort] > output[sort+1]){
|
||||
temp = output[sort+1];
|
||||
output[sort + 1] = output[sort];
|
||||
output[sort] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Helpers.cs.meta
Normal file
11
Assets/Scripts/Helpers.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7b84cb24ae83a454ca038cc76e0e628c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Scripts/Mover.meta
Normal file
8
Assets/Scripts/Mover.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: dacfc47cc20142148bb412040dd4c124
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
44
Assets/Scripts/Mover/MoverSettingsManager.cs
Normal file
44
Assets/Scripts/Mover/MoverSettingsManager.cs
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class MoverSettingsManager : MonoBehaviour
|
||||
{
|
||||
public Slider xSlider,ySlider;
|
||||
public Button btnClose,btnSave,btnRestart;
|
||||
public PredictiveMover mover;
|
||||
|
||||
public GameObject panel;
|
||||
public GameObject activator;
|
||||
|
||||
void Start()
|
||||
{
|
||||
xSlider.onValueChanged.AddListener(OnSettingsChanged);
|
||||
ySlider.onValueChanged.AddListener(OnSettingsChanged);
|
||||
|
||||
btnClose.onClick.AddListener(HideSettings);
|
||||
btnRestart.onClick.AddListener(Restart);
|
||||
m_onSettingsChanged();
|
||||
}
|
||||
|
||||
void HideSettings(){
|
||||
activator.SetActive(true);
|
||||
panel.SetActive(false);
|
||||
}
|
||||
|
||||
void OnSettingsChanged(float useless){
|
||||
m_onSettingsChanged();
|
||||
}
|
||||
|
||||
void m_onSettingsChanged(){
|
||||
mover.multipliers.x = xSlider.value;
|
||||
mover.multipliers.y = ySlider.value;
|
||||
|
||||
mover.RegenerateLines();
|
||||
}
|
||||
|
||||
void Restart(){
|
||||
mover.Restart();
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Mover/MoverSettingsManager.cs.meta
Normal file
11
Assets/Scripts/Mover/MoverSettingsManager.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 00de3ca2780fc9d4383d675e3bb35bf7
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
30
Assets/Scripts/Mover/MoverSettingsPanel.cs
Normal file
30
Assets/Scripts/Mover/MoverSettingsPanel.cs
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
|
||||
public class MoverSettingsPanel : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
|
||||
{
|
||||
|
||||
float touchdownTimer =0f;
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
{
|
||||
touchdownTimer =0f;
|
||||
}
|
||||
|
||||
public void OnPointerUp(PointerEventData eventData)
|
||||
{
|
||||
if(touchdownTimer > 4){
|
||||
settingsPanel.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
public GameObject settingsPanel;
|
||||
|
||||
void Update()
|
||||
{
|
||||
if(touchdownTimer < 5f){
|
||||
touchdownTimer +=Time.deltaTime;
|
||||
}
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Mover/MoverSettingsPanel.cs.meta
Normal file
11
Assets/Scripts/Mover/MoverSettingsPanel.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 17228f1c211f8ed4db8114fd85f6b2d8
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
123
Assets/Scripts/Mover/PredictiveMover.cs
Normal file
123
Assets/Scripts/Mover/PredictiveMover.cs
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class PredictiveMover : MonoBehaviour
|
||||
{
|
||||
|
||||
private Vector3[] points;
|
||||
public List<float> allHits = new List<float>();
|
||||
public LineRenderer line;
|
||||
public GameObject objectToMove;
|
||||
public AudioSource source;
|
||||
public float audioOffset = -0.05f;
|
||||
public Vector2 multipliers;
|
||||
public AnimationCurve lerpCurve;
|
||||
|
||||
public DrawShape botShape, topShape;
|
||||
|
||||
void OnDrawGizmos()
|
||||
{
|
||||
RegenerateLines();
|
||||
}
|
||||
|
||||
public void RegenerateLines()
|
||||
{
|
||||
points = new Vector3[allHits.Count];
|
||||
|
||||
for (int i = 0; i < points.Length; i++)
|
||||
{
|
||||
points[i] = GetPosition(i);
|
||||
}
|
||||
|
||||
line.positionCount = points.Length;
|
||||
line.SetPositions(points);
|
||||
}
|
||||
|
||||
void Start(){
|
||||
Restart();
|
||||
}
|
||||
|
||||
|
||||
void FixedUpdate(){
|
||||
// RegenerateLines();
|
||||
objectToMove.transform.position = Vector3.Lerp(objectToMove.transform.position,GetPositionAtTime(source.time + audioOffset),0.5f);
|
||||
CamFollower.instance.UpdateFrame();
|
||||
}
|
||||
|
||||
public void Restart(){
|
||||
source.time =0;
|
||||
source.Play();
|
||||
|
||||
RegenerateLines();
|
||||
List<Vector3> botPoints = new List<Vector3>();
|
||||
List<Vector3> topPoints = new List<Vector3>();
|
||||
for(int i=0; i < points.Length; i++){
|
||||
if(i%2 == 0){
|
||||
botPoints.Add(points[i]);
|
||||
}else{
|
||||
topPoints.Add(points[i]);
|
||||
}
|
||||
}
|
||||
botShape.Draw(botPoints, new Vector3(0, 30));
|
||||
topShape.Draw(topPoints, new Vector3(0, -30));
|
||||
}
|
||||
|
||||
Vector3 GetPosition(int index)
|
||||
{
|
||||
float hitX = allHits[index];
|
||||
|
||||
float diff = 0;
|
||||
float prevY = 0;
|
||||
|
||||
// Calculate diff and prevY if the index is greater than 0
|
||||
if (index > 0)
|
||||
{
|
||||
diff = allHits[index] - allHits[index - 1];
|
||||
prevY = points[index - 1].y; // Use the already calculated point to avoid recursion
|
||||
}
|
||||
|
||||
float flipSide = index % 2 == 0 ? 1 : -1;
|
||||
float y = prevY + (flipSide * diff * multipliers.y);
|
||||
|
||||
return new Vector3(hitX * multipliers.x, y, 0);
|
||||
}
|
||||
|
||||
public float bouncingIntensity = 0.5f;
|
||||
public Vector3 GetPositionAtTime(float time)
|
||||
{
|
||||
if (points == null || points.Length < 2)
|
||||
{
|
||||
return Vector3.zero; // Return zero if points are not set up
|
||||
}
|
||||
|
||||
// If the time is before the first hit, return the first position
|
||||
if (time <= allHits[0])
|
||||
{
|
||||
return points[0];
|
||||
}
|
||||
|
||||
// If the time is after the last hit, return the last position
|
||||
if (time >= allHits[allHits.Count - 1])
|
||||
{
|
||||
return points[points.Length - 1];
|
||||
}
|
||||
|
||||
// Find the current segment based on the given time
|
||||
for (int i = 0; i < allHits.Count - 1; i++)
|
||||
{
|
||||
if (time >= allHits[i] && time < allHits[i + 1])
|
||||
{
|
||||
Vector3 startPoint = points[i];
|
||||
Vector3 endPoint = points[i + 1];
|
||||
float segmentDuration = allHits[i + 1] - allHits[i];
|
||||
float t = (time - allHits[i]) / segmentDuration;
|
||||
|
||||
float curvedVal = lerpCurve.Evaluate(t);
|
||||
return Vector3.Lerp(startPoint, endPoint,curvedVal);
|
||||
}
|
||||
}
|
||||
|
||||
return Vector3.zero; // Return zero if no valid segment is found (should not happen)
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Mover/PredictiveMover.cs.meta
Normal file
11
Assets/Scripts/Mover/PredictiveMover.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a0f01b5b35bc4d46bbe9ec3a2c09a68
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -7,6 +7,7 @@ using UnityEngine.Networking;
|
|||
public class LoadFromPrep : MonoBehaviour
|
||||
{
|
||||
public AudioSource source;
|
||||
public PredictiveMover mover;
|
||||
|
||||
void Awake(){
|
||||
if(PrepConnector.saveLoadData == null){
|
||||
|
|
@ -18,6 +19,7 @@ public class LoadFromPrep : MonoBehaviour
|
|||
void Start(){
|
||||
if(PrepConnector.saveLoadData != null){
|
||||
StartCoroutine(LoadAudioCoroutine(PrepConnector.saveLoadData.musicFile));
|
||||
mover.allHits = PrepConnector.saveLoadData.hits;
|
||||
PlayerPrefs.SetString("saveData", JsonUtility.ToJson(PrepConnector.saveLoadData));
|
||||
PlayerPrefs.Save();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
|
|
@ -15,7 +16,7 @@ public class PrepController : MonoBehaviour
|
|||
public Button pinBtn;
|
||||
public Button removePinBtn;
|
||||
public Toggle followSeekerToggle;
|
||||
|
||||
public TMP_Text playbackTimeTxt;
|
||||
public static List<GameObject> markers = new List<GameObject>();
|
||||
|
||||
public static void Reset(){
|
||||
|
|
@ -28,12 +29,20 @@ public class PrepController : MonoBehaviour
|
|||
pinBtn.onClick.AddListener(AddMarker);
|
||||
removePinBtn.onClick.AddListener(RemoveMarker);
|
||||
instance = this;
|
||||
|
||||
|
||||
}
|
||||
void Update()
|
||||
{
|
||||
if(followSeekerToggle.isOn && source.isPlaying){
|
||||
cam.position = new Vector3(source.time * AudioAnalyzer.instance.zoomingYMult, cam.position.y, cam.position.z);
|
||||
source.time = startOffset + (Time.time - startTime);
|
||||
playbackTimeTxt.text = source.time.ToString("n3");
|
||||
|
||||
if(followSeekerToggle.isOn){
|
||||
if(source.isPlaying){
|
||||
cam.position = new Vector3(source.time * AudioAnalyzer.instance.zoomingYMult, cam.position.y, cam.position.z);
|
||||
source.time = startOffset + (Time.time - startTime);
|
||||
}else{
|
||||
source.time = cam.position.x / AudioAnalyzer.instance.zoomingYMult;
|
||||
}
|
||||
}
|
||||
bool anythingInProximity = false;
|
||||
for(int i=0; i < transform.childCount; i++){
|
||||
|
|
@ -80,6 +89,7 @@ public class PrepController : MonoBehaviour
|
|||
// go.transform.position = new Vector3(cam.position.x, 0);
|
||||
go.GetComponent<Marker>().myTime = cam.position.x / AudioAnalyzer.instance.zoomingYMult;
|
||||
|
||||
|
||||
markers.Add(go);
|
||||
}
|
||||
|
||||
|
|
@ -111,5 +121,23 @@ public class PrepController : MonoBehaviour
|
|||
markers.RemoveAt(indexToRemove);
|
||||
Destroy(closestOne);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void OnSeekerDragged(Vector3 newCamPos){
|
||||
if(source.isPlaying){
|
||||
TogglePlay();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool playAfterDragEnd = false;
|
||||
public void OnSeekerDown(){
|
||||
playAfterDragEnd=source.isPlaying;
|
||||
}
|
||||
|
||||
public void OnSeekerUp(){
|
||||
if(playAfterDragEnd){
|
||||
TogglePlay();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,10 +50,13 @@ public class SaveLoadPrep : MonoBehaviour
|
|||
|
||||
public void Save(){
|
||||
saveLoadData = new SaveLoadData(txtPath.text);
|
||||
List<float> unsortedHits = new List<float>();
|
||||
foreach(GameObject marker in PrepController.markers){
|
||||
saveLoadData.hits.Add(marker.transform.position.x / AudioAnalyzer.instance.zoomingYMult);
|
||||
unsortedHits.Add(marker.transform.position.x / AudioAnalyzer.instance.zoomingYMult);
|
||||
}
|
||||
|
||||
saveLoadData.hits = Helpers.BubbleSort(unsortedHits);
|
||||
|
||||
saveContentPanel.SetActive(true);
|
||||
string fileName = txtPath.text;
|
||||
if(fileName.Contains("/")){
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ public class SeekController : MonoBehaviour, IPointerDownHandler, IPointerUpHand
|
|||
{
|
||||
public Transform cam;
|
||||
public AudioAnalyzer audioAnalyzer;
|
||||
public PrepController controller;
|
||||
public LineRenderer referenceLine;
|
||||
public float startX, endX;
|
||||
public float zoomingSpeed =0.001f;
|
||||
|
|
@ -20,16 +21,18 @@ public class SeekController : MonoBehaviour, IPointerDownHandler, IPointerUpHand
|
|||
public void OnDrag(PointerEventData eventData)
|
||||
{
|
||||
Vector3 pointerDelta = eventData.position - pointerDownPos;
|
||||
cam.position = pointerDownCamPos + (new Vector3(pointerDelta.x,0) * 0.035f);
|
||||
if(cam.position.x < startX){
|
||||
cam.position = new Vector3(startX, cam.position.y,-10);
|
||||
Vector3 newCamPos = pointerDownCamPos + (new Vector3(pointerDelta.x,0) * 0.035f);
|
||||
if(newCamPos.x < startX){
|
||||
newCamPos = new Vector3(startX, newCamPos.y,-10);
|
||||
}
|
||||
if(cam.position.x > endX){
|
||||
cam.position = new Vector3(endX, cam.position.y,-10);
|
||||
if(newCamPos.x > endX){
|
||||
newCamPos = new Vector3(endX, newCamPos.y,-10);
|
||||
}
|
||||
if(eventData.position.x > Screen.width / 2f){
|
||||
audioAnalyzer.SetZoomingYMult(pointerDownZoomingYMult + (pointerDelta.y * zoomingSpeed));
|
||||
audioAnalyzer.SetZoomingYMult(pointerDownZoomingYMult + (pointerDelta.y * zoomingSpeed));
|
||||
}
|
||||
controller.OnSeekerDragged(newCamPos);
|
||||
cam.position = newCamPos;
|
||||
}
|
||||
|
||||
public void OnPointerDown(PointerEventData eventData)
|
||||
|
|
@ -37,11 +40,14 @@ public class SeekController : MonoBehaviour, IPointerDownHandler, IPointerUpHand
|
|||
pointerDownPos = eventData.position;
|
||||
pointerDownCamPos = cam.position;
|
||||
pointerDownZoomingYMult = audioAnalyzer.zoomingYMult;
|
||||
|
||||
controller.OnSeekerDown();
|
||||
}
|
||||
|
||||
public void OnPointerUp(PointerEventData eventData)
|
||||
{
|
||||
pointerDownPos = Vector3.zero;
|
||||
controller.OnSeekerUp();
|
||||
}
|
||||
|
||||
void Awake(){
|
||||
|
|
|
|||
43
Assets/Scripts/Prep/TimescaleAdjuster.cs
Normal file
43
Assets/Scripts/Prep/TimescaleAdjuster.cs
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class TimescaleAdjuster : MonoBehaviour
|
||||
{
|
||||
public Button nextBtn;
|
||||
public Button prevBtn;
|
||||
public TMP_Text txt;
|
||||
|
||||
void Start()
|
||||
{
|
||||
nextBtn.onClick.AddListener(IncrementTime);
|
||||
prevBtn.onClick.AddListener(DecrementTime);
|
||||
UpdateText();
|
||||
}
|
||||
|
||||
void IncrementTime(){
|
||||
if(Time.timeScale < 0.25f){
|
||||
Time.timeScale = 0.25f;
|
||||
}else{
|
||||
Time.timeScale += 0.25f;
|
||||
}
|
||||
|
||||
UpdateText();
|
||||
}
|
||||
|
||||
void DecrementTime(){
|
||||
if(Time.timeScale > 0.25f){
|
||||
Time.timeScale -= 0.25f;
|
||||
}else{
|
||||
Time.timeScale = 0.1f;
|
||||
}
|
||||
UpdateText();
|
||||
|
||||
}
|
||||
|
||||
void UpdateText(){
|
||||
txt.text = Time.timeScale.ToString("n2");
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Prep/TimescaleAdjuster.cs.meta
Normal file
11
Assets/Scripts/Prep/TimescaleAdjuster.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 78209ab90a9209446921f39c899d1147
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
8
Assets/Scripts/Utils.meta
Normal file
8
Assets/Scripts/Utils.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6352c794c162583488dc298e2618c079
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
30
Assets/Scripts/Utils/SliderValueText.cs
Normal file
30
Assets/Scripts/Utils/SliderValueText.cs
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
[RequireComponent(typeof(TMP_Text))]
|
||||
public class SliderValueText : MonoBehaviour
|
||||
{
|
||||
public Slider slider;
|
||||
|
||||
|
||||
void OnValidate(){
|
||||
if(slider==null){
|
||||
slider = GetComponentInParent<Slider>();
|
||||
}
|
||||
}
|
||||
void Start()
|
||||
{
|
||||
slider.onValueChanged.AddListener(RefreshText);
|
||||
txt= GetComponent<TMP_Text>();
|
||||
RefreshText(slider.value);
|
||||
|
||||
}
|
||||
TMP_Text txt;
|
||||
|
||||
void RefreshText(float value){
|
||||
txt.text = slider.value.ToString("n3");
|
||||
}
|
||||
}
|
||||
11
Assets/Scripts/Utils/SliderValueText.cs.meta
Normal file
11
Assets/Scripts/Utils/SliderValueText.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ffd6249c0d241384ab3caa05bc93e9cf
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -59,5 +59,5 @@ Material:
|
|||
- _WaveDistanceFromCenter: 1
|
||||
- _XSizeRatio: 1.777
|
||||
m_Colors:
|
||||
- _RingSpawnPosition: {r: 0.33110148, g: 0.47566372, b: 0, a: 0}
|
||||
- _RingSpawnPosition: {r: -5.8725924, g: 0.45248157, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -9,11 +9,12 @@ AudioManager:
|
|||
Doppler Factor: 1
|
||||
Default Speaker Mode: 2
|
||||
m_SampleRate: 0
|
||||
m_DSPBufferSize: 1024
|
||||
m_DSPBufferSize: 256
|
||||
m_VirtualVoiceCount: 512
|
||||
m_RealVoiceCount: 32
|
||||
m_EnableOutputSuspension: 1
|
||||
m_SpatializerPlugin:
|
||||
m_AmbisonicDecoderPlugin:
|
||||
m_DisableAudio: 0
|
||||
m_VirtualizeEffects: 1
|
||||
m_RequestedDSPBufferSize: 0
|
||||
m_RequestedDSPBufferSize: 256
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user