diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab
index c44f84b00..d31794044 100644
--- a/Assets/Resources/Games/airboarder.prefab
+++ b/Assets/Resources/Games/airboarder.prefab
@@ -58,15 +58,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1215422233952891257}
- m_LocalRotation: {x: -0, y: -0.96596766, z: -0, w: 0.25866297}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 199.99998, y: 200, z: 199.99998}
+ m_LocalRotation: {x: -0, y: -0.9919021, z: -0, w: 0.12700473}
+ m_LocalPosition: {x: -0.0003001, y: 0.000028829, z: 1.9989}
+ m_LocalScale: {x: 215.03308, y: 215.03308, z: 215.03308}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5254664032251897646}
m_Father: {fileID: 8154153378120042038}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: -150.018, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: -165.407, z: 0}
--- !u!33 &723254299125788594
MeshFilter:
m_ObjectHideFlags: 0
@@ -196,13 +196,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2882644589364985837}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 1.67, y: -2.8, z: 13.56}
+ m_LocalPosition: {x: 3.93, y: -2.8, z: 8.54}
m_LocalScale: {x: 2.0592587, y: 2.0592587, z: 2.0592587}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4247666789870766831}
- {fileID: 9145231469005479427}
- {fileID: 8154153378120042038}
+ - {fileID: 196530934078900318}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -220,7 +221,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
SoundSequences: []
scheduledInputs: []
- archBasic: {fileID: 5901691213547651111}
+ wantsCrouch: 0
+ archBasic: {fileID: 6590728124445756167}
+ wallBasic: {fileID: 4600485667161481742}
CPU1: {fileID: 1975474441940497211}
CPU2: {fileID: 1643307588540728724}
Player: {fileID: 4556547465341807253}
@@ -233,6 +236,90 @@ MonoBehaviour:
startBeat: 0
switchBeat: 0
startFloor: 1
+--- !u!1 &4293746314319839782
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 196530934078900318}
+ - component: {fileID: 7612312345343074015}
+ - component: {fileID: 6640861564819505995}
+ m_Layer: 0
+ m_Name: Camera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &196530934078900318
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4293746314319839782}
+ 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: 4475688631540571435}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &7612312345343074015
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4293746314319839782}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 1
+ m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_FocalLength: 50
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 26.991467
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!81 &6640861564819505995
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4293746314319839782}
+ m_Enabled: 1
--- !u!1 &4957977851139062575
GameObject:
m_ObjectHideFlags: 0
@@ -327,38 +414,6 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
---- !u!1 &5314259985800928693
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6143425544244964617}
- m_Layer: 0
- m_Name: arch
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6143425544244964617
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5314259985800928693}
- 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: 1
- m_Children:
- - {fileID: 5288779798997404969}
- m_Father: {fileID: 9145231469005479427}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6174176853209375996
GameObject:
m_ObjectHideFlags: 0
@@ -450,7 +505,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6707612264994879636}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0.78}
+ m_LocalPosition: {x: -1, y: 0, z: 0.78}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -521,8 +576,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6843636135936194274}
- - {fileID: 6143425544244964617}
- {fileID: 8644837133873799696}
+ - {fileID: 7560210517393434621}
m_Father: {fileID: 4475688631540571435}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -535,15 +590,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 62.887634
+ value: 66.672516
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -154.23956
+ value: -150.52283
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -152.48134
+ value: -149.3114
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_RootOrder
@@ -563,7 +618,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalPosition.x
- value: 0.97
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalPosition.y
@@ -607,43 +662,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.1916779
+ value: 0.54002964
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 169.4631
+ value: 115.89477
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 176.40952
+ value: -179.99998
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 1.934356
+ value: -7.1477666
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -35.183746
+ value: -33.710033
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 76.174774
+ value: 90.40969
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 8.368007
+ value: 8.955317
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 22.416866
+ value: 29.612137
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -5.6959724
+ value: -4.475179
objectReference: {fileID: 0}
- target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -9.984813
+ value: -11.073004
objectReference: {fileID: 0}
- target: {fileID: -5315867602706669865, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -653,17 +708,33 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_Materials.Array.size
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_Materials.Array.data[3]
+ value:
+ objectReference: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2}
+ - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_Materials.Array.data[4]
+ value:
+ objectReference: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2}
+ - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_Materials.Array.data[5]
+ value:
+ objectReference: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -35.414177
+ value: -38.84192
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -8.411899
+ value: -34.971306
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 86.28262
+ value: 89.53529
objectReference: {fileID: 0}
- target: {fileID: -3673476394703291053, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -671,27 +742,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -24.074417
+ value: -19.274843
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 31.998497
+ value: 23.224047
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 121.823685
+ value: 105.21432
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -63.31872
+ value: -66.326294
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -43.478874
+ value: -35.588802
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 34.93693
+ value: 14.341854
objectReference: {fileID: 0}
- target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -699,51 +770,51 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 25.314592
+ value: 22.057493
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -26.29283
+ value: -22.857958
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 133.79837
+ value: 116.23264
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -16.628103
+ value: -11.516011
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 7.7844076
+ value: 13.3694
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 20.209328
+ value: -4.843707
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 17.70104
+ value: 20.372444
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 26.238857
+ value: 33.706028
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -12.863223
+ value: -8.007005
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -52.77235
+ value: -31.277384
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -83.560104
+ value: -87.6108
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 69.19902
+ value: 79.079315
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_Name
@@ -751,27 +822,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.89047486
+ value: -0.5475609
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 42.408817
+ value: 32.652317
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.9733541
+ value: 0.8544039
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.48006725
+ value: -0.20865627
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0.45692325
+ value: -0.29319865
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -16.817646
+ value: 8.877307
objectReference: {fileID: 0}
- target: {fileID: 7096549898355155914, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -779,27 +850,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -33.7487
+ value: -10.603406
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 118.87342
+ value: 136.53708
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -47.607845
+ value: -49.813263
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.00000037543953
+ value: -0.0000011487457
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -43.996014
+ value: -41.725185
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.0000008662437
+ value: -0.0000010899818
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
@@ -916,31 +987,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.x
- value: 1.0109377
+ value: 0.89052725
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.y
- value: 1.0109378
+ value: 0.89052737
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.z
- value: 1.0109377
+ value: 0.89052725
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.x
- value: 3
+ value: -41.8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.y
- value: -10
+ value: -11.699999
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.z
- value: -14.9
+ value: -7.8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.7188349
+ value: 0.6454213
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.x
@@ -948,7 +1019,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.y
- value: 0.6951809
+ value: 0.7638267
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.z
@@ -960,7 +1031,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 88.083
+ value: 99.605
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1010,7 +1081,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalPosition.x
- value: -0.97
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalPosition.y
@@ -1089,263 +1160,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
m_PrefabInstance: {fileID: 4463438238432265654}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &5687831141847788226
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 6143425544244964617}
- m_Modifications:
- - target: {fileID: -8766383658213384184, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -37.06499
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.8
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalPosition.x
- value: -140
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalRotation.w
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0.7071068
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0.7071068
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 90
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 180
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_ConstrainProportionsScale
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0.000019719326
- objectReference: {fileID: 0}
- - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 108.56061
- objectReference: {fileID: 0}
- - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0.0000039188253
- objectReference: {fileID: 0}
- - target: {fileID: -5147326476637436832, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 38.98263
- objectReference: {fileID: 0}
- - target: {fileID: -159968170859025008, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -159968170859025008, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -159968170859025008, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_Name
- value: Arch
- objectReference: {fileID: 0}
- - target: {fileID: 919132149155446097, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 4.942557e-19
- objectReference: {fileID: 0}
- - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -89.54185
- objectReference: {fileID: 0}
- - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 6.4470497e-17
- objectReference: {fileID: 0}
- - target: {fileID: 2978568521074353718, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2978568521074353718, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 2978568521074353718, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 61.645573
- objectReference: {fileID: 0}
- - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -149.63603
- objectReference: {fileID: 0}
- - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -173.87607
- objectReference: {fileID: 0}
- - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 16.019001
- objectReference: {fileID: 0}
- - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -52.4238
- objectReference: {fileID: 0}
- - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 133.77698
- objectReference: {fileID: 0}
- - target: {fileID: 7505648016901801114, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: -89.98021
- objectReference: {fileID: 0}
- - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: -2.194736
- objectReference: {fileID: 0}
- - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -87.9102
- objectReference: {fileID: 0}
- - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -157.34372
- objectReference: {fileID: 0}
- - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: -86.767265
- objectReference: {fileID: 0}
- - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -35.31678
- objectReference: {fileID: 0}
- - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0.11429839
- objectReference: {fileID: 0}
- - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 25.823307
- objectReference: {fileID: 0}
- - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: -72.77457
- objectReference: {fileID: 0}
- - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -102.184746
- objectReference: {fileID: 0}
- - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: -0.82829905
- objectReference: {fileID: 0}
- - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 125.46006
- objectReference: {fileID: 0}
- - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: -4.3181586
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
---- !u!1 &4768843167362504595 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- m_PrefabInstance: {fileID: 5687831141847788226}
- m_PrefabAsset: {fileID: 0}
---- !u!95 &3295261602338430640
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4768843167362504595}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: 4464fa6dd045f9345bcdb7f9d2d7d8f3, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
---- !u!114 &5901691213547651111
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4768843167362504595}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- game: {fileID: 9105702199878946262}
- targetBeat: 0
- appearBeat: 0
- normalizedStart: 0
- anim: {fileID: 3295261602338430640}
---- !u!4 &5288779798997404969 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
- m_PrefabInstance: {fileID: 5687831141847788226}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &6345709014570522915
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1793,15 +1607,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.x
- value: 3.308497
+ value: 3.4368887
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.y
- value: 3.308497
+ value: 3.4368887
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.z
- value: 3.308497
+ value: 3.4368887
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.x
@@ -1809,11 +1623,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.y
- value: 51.1
+ value: 51.154
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.z
- value: -87.2
+ value: -37.6
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalRotation.w
@@ -1884,6 +1698,140 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
m_PrefabInstance: {fileID: 6777388439690958800}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8025970981515624470
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 9145231469005479427}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.79999995
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.8
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -139.99998
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.7999998
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 180
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_Name
+ value: Wall
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4452395710510657974, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
+ - target: {fileID: 4452395710510657974, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 2100000, guid: a8381275f858de342b6da7d85f663236, type: 2}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+--- !u!1 &7178900278045326663 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ m_PrefabInstance: {fileID: 8025970981515624470}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &1170907712128525147
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7178900278045326663}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: d3a3f979e17936b46ad2433e0e386026, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &4600485667161481742
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7178900278045326663}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 880c2da5c9a9de040b78025a28c90867, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ game: {fileID: 9105702199878946262}
+ targetBeat: 0
+ appearBeat: 0
+ normalizedWall: 0
+ cueStart: 0
+ wallAnim: {fileID: 1170907712128525147}
+--- !u!4 &7560210517393434621 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3}
+ m_PrefabInstance: {fileID: 8025970981515624470}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &8102566095830517243
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1897,7 +1845,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3}
propertyPath: m_LocalScale.x
@@ -2140,6 +2088,7 @@ MonoBehaviour:
targetBeat: 0
appearBeat: 0
normalizedStart: 0
+ cueStart: 0
anim: {fileID: 8289865541076859572}
--- !u!1001 &8408692734140302873
PrefabInstance:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
index 84a8fe5c9..1d478ac35 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
@@ -1,5 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7314615554189911365
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: break
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 097e4120edbde8a49af1ee5d43c739a6, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1107 &-5823513995563224045
AnimatorStateMachine:
serializedVersion: 6
@@ -15,12 +41,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2970421746828851933}
m_Position: {x: 360, y: 90, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -1989161731700842372}
- m_Position: {x: 290.0759, y: 164.80554, z: 0}
- - serializedVersion: 1
- m_State: {fileID: 3817404011424802009}
- m_Position: {x: 241.83603, y: 250.32175, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -57,32 +77,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1102 &-1989161731700842372
-AnimatorState:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: shake
- m_Speed: 1
- m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
- m_Position: {x: 50, y: 50, z: 0}
- m_IKOnFeet: 0
- m_WriteDefaultValues: 1
- m_Mirror: 0
- m_SpeedParameterActive: 0
- m_MirrorParameterActive: 0
- m_CycleOffsetParameterActive: 0
- m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 1102bcbac87470b48b0615389d924561, type: 2}
- m_Tag:
- m_SpeedParameter:
- m_MirrorParameter:
- m_CycleOffsetParameter:
- m_TimeParameter:
--- !u!1102 &-846839717617555184
AnimatorState:
serializedVersion: 6
@@ -131,14 +125,54 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1102 &3817404011424802009
+ - serializedVersion: 5
+ m_Name: miss fx
+ m_StateMachine: {fileID: 2782592689605945269}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 1
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1107 &2782592689605945269
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: miss fx
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -7314615554189911365}
+ m_Position: {x: 270, y: 110, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 4955128078807161858}
+ m_Position: {x: 269.2, y: 166, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 7913739592733679780}
+ m_Position: {x: 270, y: 220, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 4955128078807161858}
+--- !u!1102 &4955128078807161858
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: break
+ m_Name: idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -151,7 +185,33 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 097e4120edbde8a49af1ee5d43c739a6, type: 2}
+ m_Motion: {fileID: 7400000, guid: a934fd8b9c8c22e4fad742014afbbb4f, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &7913739592733679780
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: shake
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 1102bcbac87470b48b0615389d924561, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim b/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim
new file mode 100644
index 000000000..9d400bca6
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim
@@ -0,0 +1,205 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: hover
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: 0, y: -0.55, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.5
+ value: {x: 0, y: -0.4, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 1
+ value: {x: 0, y: -0.55, z: 0}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.55
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: -0.4
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: -0.55
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.5
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim.meta b/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim.meta
new file mode 100644
index 000000000..d3d424268
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/hover.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5ac047d6d29b065478606ced9573944e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall.meta b/Assets/Resources/Models/Games/Airboarder/Animations/wall.meta
new file mode 100644
index 000000000..012770ca2
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ada393b44571154fb21d29e9e0fa5a5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller
new file mode 100644
index 000000000..2f8ceee81
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller
@@ -0,0 +1,101 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-4540338289636398905
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 5573168244071546499}
+ m_Position: {x: 250, y: -10, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 6061325381742713957}
+ m_Position: {x: 235, y: 65, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 6061325381742713957}
+--- !u!91 &9100000
+AnimatorController:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Wall
+ serializedVersion: 5
+ m_AnimatorParameters: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -4540338289636398905}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1102 &5573168244071546499
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: move
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: e3baee1c4d6194147b96c4789934f9de, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &6061325381742713957
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: idle
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 1446ea699ca64ee4eb030a3ee17686b4, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller.meta b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller.meta
new file mode 100644
index 000000000..70ce457eb
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d3a3f979e17936b46ad2433e0e386026
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 9100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim
new file mode 100644
index 000000000..c713dbb0d
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim
@@ -0,0 +1,133 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: idle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -140, y: -1, z: 0.8}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 300, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -140
+ inSlope: 0
+ outSlope: 300
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.8
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim.meta b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim.meta
new file mode 100644
index 000000000..9da86aeff
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1446ea699ca64ee4eb030a3ee17686b4
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
new file mode 100644
index 000000000..f93fa599f
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
@@ -0,0 +1,169 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: move
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -140, y: -1, z: 0.8}
+ inSlope: {x: 0, y: 0, z: 0}
+ outSlope: {x: 300, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.6666667
+ value: {x: 60, y: -1, z: 0.8}
+ inSlope: {x: 300, y: -0, z: -0}
+ outSlope: {x: 0, y: 0, z: 0}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ path:
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves: []
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping: []
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.6666667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 1
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -140
+ inSlope: 0
+ outSlope: 300
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.6666667
+ value: 60
+ inSlope: 300
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.x
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.6666667
+ value: -1
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.y
+ path:
+ classID: 4
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.8
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.6666667
+ value: 0.8
+ inSlope: -0
+ outSlope: 0
+ tangentMode: 69
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_LocalPosition.z
+ path:
+ classID: 4
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 1
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim.meta b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim.meta
new file mode 100644
index 000000000..be9cda698
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3baee1c4d6194147b96c4789934f9de
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 7400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat
index 3c117ba82..b9b944fb7 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.mat
@@ -11,8 +11,9 @@ Material:
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords:
+ - _EMISSION
- _METALLICGLOSSMAP
- m_LightmapFlags: 4
+ m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@@ -81,6 +82,6 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat
new file mode 100644
index 000000000..e25b5e2de
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: airboy_board_emm
+ m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords: []
+ m_InvalidKeywords:
+ - _METALLICGLOSSMAP
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: b31d40c42dac95945bce1f9f0061a249, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 2800000, guid: 9468b42a211b93845a16db88d3f8d471, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat.meta
new file mode 100644
index 000000000..20c65f772
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board_emm.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 18236ab917d571548b689dbcdf081b2e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat
index 648d70fca..ab6549926 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.mat
@@ -10,8 +10,9 @@ Material:
m_Name: airboy_body
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
+ m_InvalidKeywords:
+ - _EMISSION
+ m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@@ -95,7 +96,7 @@ Material:
- _CautionColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _CriticalColor: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0.039546248, g: 0.039546248, b: 0.039546248, a: 1}
- _GoodColor: {r: 1, g: 1, b: 1, a: 1}
- _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _ReflectColor: {r: 1, g: 1, b: 1, a: 0.5}
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat
index be9e41abf..fcdf4ae6e 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_smile.mat
@@ -10,8 +10,9 @@ Material:
m_Name: airboy_smile
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
+ m_InvalidKeywords:
+ - _EMISSION
+ m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@@ -80,6 +81,6 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColor: {r: 0.0754717, g: 0.0754717, b: 0.0754717, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat b/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat
index 7a15da783..b8dd96157 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat
@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dog_shadow
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
@@ -56,6 +56,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
@@ -77,4 +81,5 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/airboy.controller b/Assets/Resources/Models/Games/Airboarder/airboy.controller
index 208c67901..8bb601de6 100644
--- a/Assets/Resources/Models/Games/Airboarder/airboy.controller
+++ b/Assets/Resources/Models/Games/Airboarder/airboy.controller
@@ -104,6 +104,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &-1798779648231258738
+AnimatorState:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: hover
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 5ac047d6d29b065478606ced9573944e, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &-89424942073692808
AnimatorState:
serializedVersion: 6
@@ -140,6 +166,18 @@ AnimatorController:
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Hovering
+ m_StateMachine: {fileID: 7764868861449969032}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4518392715466498807}
@@ -148,7 +186,7 @@ AnimatorController:
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
- m_DefaultWeight: 0
+ m_DefaultWeight: 1
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
@@ -247,6 +285,28 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8375474103083543902}
+--- !u!1107 &7764868861449969032
+AnimatorStateMachine:
+ serializedVersion: 6
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Hovering
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -1798779648231258738}
+ m_Position: {x: 253.819, y: 76.98872, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -1798779648231258738}
--- !u!1102 &8375474103083543902
AnimatorState:
serializedVersion: 6
diff --git a/Assets/Resources/Models/Games/Airboarder/wall_high.fbx.meta b/Assets/Resources/Models/Games/Airboarder/wall_high.fbx.meta
index 3064e4d36..e6e63c0a6 100644
--- a/Assets/Resources/Models/Games/Airboarder/wall_high.fbx.meta
+++ b/Assets/Resources/Models/Games/Airboarder/wall_high.fbx.meta
@@ -13,7 +13,7 @@ ModelImporter:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: wall_body
- second: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2}
+ second: {fileID: 4308077249516054671, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
materials:
materialImportMode: 2
materialName: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/wall_low.fbx.meta b/Assets/Resources/Models/Games/Airboarder/wall_low.fbx.meta
index d34dcdc79..ff22a80e5 100644
--- a/Assets/Resources/Models/Games/Airboarder/wall_low.fbx.meta
+++ b/Assets/Resources/Models/Games/Airboarder/wall_low.fbx.meta
@@ -3,7 +3,17 @@ guid: cdd45697068de0942941fd70c7b8b9a2
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
- externalObjects: {}
+ externalObjects:
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: block_shadow
+ second: {fileID: 2100000, guid: a8381275f858de342b6da7d85f663236, type: 2}
+ - first:
+ type: UnityEngine:Material
+ assembly: UnityEngine.CoreModule
+ name: wall_body
+ second: {fileID: 4308077249516054671, guid: f6ee36b31b2f3e849b5b8dc69738ced0, type: 3}
materials:
materialImportMode: 2
materialName: 0
diff --git a/Assets/Resources/Sfx/games/airboarder/crouch.ogg b/Assets/Resources/Sfx/games/airboarder/crouch.ogg
deleted file mode 100644
index d0561ec5d..000000000
Binary files a/Assets/Resources/Sfx/games/airboarder/crouch.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/airboarder/crouch.wav b/Assets/Resources/Sfx/games/airboarder/crouch.wav
new file mode 100644
index 000000000..67962bbdf
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/crouch.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/crouch.ogg.meta b/Assets/Resources/Sfx/games/airboarder/crouch.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/airboarder/crouch.ogg.meta
rename to Assets/Resources/Sfx/games/airboarder/crouch.wav.meta
index d6ae9eb3b..6c734baeb 100644
--- a/Assets/Resources/Sfx/games/airboarder/crouch.ogg.meta
+++ b/Assets/Resources/Sfx/games/airboarder/crouch.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9431e7de0170ea445bf205abc0793abc
+guid: c47d8cac04ba7bf47be3b1aa58c63c96
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/airboarder/crouchvox.wav b/Assets/Resources/Sfx/games/airboarder/crouchvox.wav
new file mode 100644
index 000000000..150cdaf51
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/crouchvox.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/ready.ogg.meta b/Assets/Resources/Sfx/games/airboarder/crouchvox.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/airboarder/ready.ogg.meta
rename to Assets/Resources/Sfx/games/airboarder/crouchvox.wav.meta
index 2c5751f50..874e48ae5 100644
--- a/Assets/Resources/Sfx/games/airboarder/ready.ogg.meta
+++ b/Assets/Resources/Sfx/games/airboarder/crouchvox.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 85e24d92658b68d44b23aa9c47161c4f
+guid: 5ad0738fac4249a4b9f562cc262f5c60
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/airboarder/jump.wav b/Assets/Resources/Sfx/games/airboarder/jump.wav
new file mode 100644
index 000000000..b748b8a84
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/jump.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/jump.wav.meta b/Assets/Resources/Sfx/games/airboarder/jump.wav.meta
new file mode 100644
index 000000000..e09d0d02b
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/jump.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c9c3c43cbc4904645a3b2fb82b4cc1b5
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/jumpvox.wav b/Assets/Resources/Sfx/games/airboarder/jumpvox.wav
new file mode 100644
index 000000000..c29149295
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/jumpvox.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/jumpvox.wav.meta b/Assets/Resources/Sfx/games/airboarder/jumpvox.wav.meta
new file mode 100644
index 000000000..0f2b8f1b2
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/jumpvox.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 53e0e326c8fd9c8469dbccdcd9a3b750
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss1.wav b/Assets/Resources/Sfx/games/airboarder/miss1.wav
new file mode 100644
index 000000000..595cc3e16
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss1.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss1.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss1.wav.meta
new file mode 100644
index 000000000..e0c8da1c2
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f5cd0f17555c05e468f3d48b199ad927
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss10.wav b/Assets/Resources/Sfx/games/airboarder/miss10.wav
new file mode 100644
index 000000000..d49146fd5
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss10.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss10.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss10.wav.meta
new file mode 100644
index 000000000..78f4fbca1
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss10.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 6de9a6fa18e22ea4497766560b7d77e3
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss11.wav b/Assets/Resources/Sfx/games/airboarder/miss11.wav
new file mode 100644
index 000000000..11ca604a6
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss11.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss11.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss11.wav.meta
new file mode 100644
index 000000000..5d8700ceb
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss11.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b9d4bd0fb59df2345a274c3c5be8317a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss12.wav b/Assets/Resources/Sfx/games/airboarder/miss12.wav
new file mode 100644
index 000000000..838ff698b
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss12.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss12.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss12.wav.meta
new file mode 100644
index 000000000..148da0da3
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss12.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e55eb6ca88be20943acbfa6260506b5d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss13.wav b/Assets/Resources/Sfx/games/airboarder/miss13.wav
new file mode 100644
index 000000000..2afe1bcfc
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss13.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss13.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss13.wav.meta
new file mode 100644
index 000000000..6c92e85b0
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss13.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e2d5b157696fe554d8bcb08dcf9bf974
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss14.wav b/Assets/Resources/Sfx/games/airboarder/miss14.wav
new file mode 100644
index 000000000..ab5ccd175
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss14.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss14.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss14.wav.meta
new file mode 100644
index 000000000..cfa41efb3
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss14.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 412aef536aacbcf43927a9dce5b3241d
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss15.wav b/Assets/Resources/Sfx/games/airboarder/miss15.wav
new file mode 100644
index 000000000..c3a142ca0
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss15.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss15.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss15.wav.meta
new file mode 100644
index 000000000..1f511597d
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss15.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1c71351f2cea2934dba30eef51e1921a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss2.wav b/Assets/Resources/Sfx/games/airboarder/miss2.wav
new file mode 100644
index 000000000..a3b1ce2f1
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss2.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss2.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss2.wav.meta
new file mode 100644
index 000000000..c9bb32c72
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 84f5299623800b64c87a8291c89c8f6f
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss3.wav b/Assets/Resources/Sfx/games/airboarder/miss3.wav
new file mode 100644
index 000000000..883fd2307
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss3.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss3.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss3.wav.meta
new file mode 100644
index 000000000..9df9763fd
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss3.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e3a0e3ed7c4f1604798e74e3f0ac746b
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss4.wav b/Assets/Resources/Sfx/games/airboarder/miss4.wav
new file mode 100644
index 000000000..9c2cb124b
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss4.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss4.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss4.wav.meta
new file mode 100644
index 000000000..20fb0867b
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss4.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: cf4f00cde71beaf4e9cda355ee15104e
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss5.wav b/Assets/Resources/Sfx/games/airboarder/miss5.wav
new file mode 100644
index 000000000..b411c2347
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss5.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss5.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss5.wav.meta
new file mode 100644
index 000000000..b53d8573a
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss5.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 92e1fc814b5c5f94ea1619981ec846da
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss6.wav b/Assets/Resources/Sfx/games/airboarder/miss6.wav
new file mode 100644
index 000000000..4642952a6
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss6.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss6.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss6.wav.meta
new file mode 100644
index 000000000..147288d41
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss6.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3ba9c993515f56046a3a8b4672a1b41a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss7.wav b/Assets/Resources/Sfx/games/airboarder/miss7.wav
new file mode 100644
index 000000000..05ae80be4
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss7.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss7.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss7.wav.meta
new file mode 100644
index 000000000..2f5ea2e42
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss7.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: cf79bf389ac344546a5f942c8557f7de
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss8.wav b/Assets/Resources/Sfx/games/airboarder/miss8.wav
new file mode 100644
index 000000000..2357d6d9d
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss8.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss8.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss8.wav.meta
new file mode 100644
index 000000000..cf2bb09f9
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss8.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b8965ef21a6ff4e46b18c2db173ee298
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/miss9.wav b/Assets/Resources/Sfx/games/airboarder/miss9.wav
new file mode 100644
index 000000000..4daf7d381
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/miss9.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/miss9.wav.meta b/Assets/Resources/Sfx/games/airboarder/miss9.wav.meta
new file mode 100644
index 000000000..1ba8d08da
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/miss9.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 71c49923cc9c92f44b7e8df8596a9064
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Sfx/games/airboarder/ready.ogg b/Assets/Resources/Sfx/games/airboarder/ready.ogg
deleted file mode 100644
index 4967e940d..000000000
Binary files a/Assets/Resources/Sfx/games/airboarder/ready.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/airboarder/ready.wav b/Assets/Resources/Sfx/games/airboarder/ready.wav
new file mode 100644
index 000000000..90ea36f1f
Binary files /dev/null and b/Assets/Resources/Sfx/games/airboarder/ready.wav differ
diff --git a/Assets/Resources/Sfx/games/airboarder/ready.wav.meta b/Assets/Resources/Sfx/games/airboarder/ready.wav.meta
new file mode 100644
index 000000000..7ab56e0d8
--- /dev/null
+++ b/Assets/Resources/Sfx/games/airboarder/ready.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c6f7a516fd4367e419d9492c6b218c8a
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ preloadAudioData: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 4511fb19c..88d0e5d73 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -7543,9 +7543,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 7.799999, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &270008766
@@ -8091,9 +8091,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 198.2, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &285739500
@@ -8906,7 +8906,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 0
+ m_fontSize: 14
m_fontSizeBase: 14.3
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -12392,9 +12392,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 55.399998, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &456434811
@@ -20413,9 +20413,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 103, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &689781278
@@ -26850,8 +26850,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
- m_Value: 1
- m_Size: 0.9909736
+ m_Value: 0
+ m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -32707,7 +32707,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 97.10142}
+ m_AnchoredPosition: {x: 0, y: 119.63262}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@@ -43455,8 +43455,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
- m_Value: 1.0000002
- m_Size: 0.40627402
+ m_Value: 1.0000005
+ m_Size: 0.5929562
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -55106,9 +55106,9 @@ RectTransform:
m_Father: {fileID: 156962254}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 150.59999, y: -21}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &2125404437
diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs
index c3d0a8f84..a6550d9bf 100644
--- a/Assets/Scripts/Games/Airboarder/Airboarder.cs
+++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs
@@ -58,14 +58,14 @@ namespace HeavenStudio.Games.Loaders
new GameAction("crouch", "Charged Duck")
{
- function = delegate {Airboarder.instance.CueCrouch(eventCaller.currentEntity.beat);},
defaultLength = 4f,
- resizable = false
+ resizable = false,
+ priority = 1
},
new GameAction("jump", "Jump")
{
- function = delegate {Airboarder.instance.CueJump(eventCaller.currentEntity.beat, eventCaller.currentEntity["ready"]);},
+ function = delegate {Airboarder.instance.PrepareJump(eventCaller.currentEntity.beat, eventCaller.currentEntity["ready"]);},
defaultLength = 4f,
resizable = false,
parameters = new List()
@@ -112,15 +112,11 @@ namespace HeavenStudio.Games
public static Airboarder instance;
- public struct Requesters
- {
- public bool wantsArch;
- public bool wantsArchCrouch;
- public bool wantsWall;
- }
+ public bool wantsCrouch;
[Header("Objects")]
[SerializeField] Arch archBasic;
+ [SerializeField] Wall wallBasic;
[Header("Animators")]
[SerializeField] public Animator CPU1;
@@ -161,21 +157,55 @@ namespace HeavenStudio.Games
var nextGameSwitches = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame" }).FindAll(x => x.beat > beat && x.datamodel != "gameManager/switchGame/airboarder");
double nextGameSwitchBeat = double.MaxValue;
- List relevantArches = GetAllArches(beat, nextGameSwitchBeat);
-
-
-
- //spawns an arch for each arch event
+ List relevantArches = GetAllArches(beat, nextGameSwitchBeat);
+
foreach (var archReg in relevantArches)
{
RequestArch(archReg.beat-25);
archBasic.CueDuck(archReg.beat);
}
+ SetupCrouches(beat, nextGameSwitchBeat);
+ SetupWalls(beat, nextGameSwitchBeat);
+
}
+
+ public void SetupArches (double beat, double nextSwitch)
+ {
+ List relevantArches = GetAllArches(beat, nextSwitch);
+
+ foreach (var archReg in relevantArches)
+ {
+ RequestArch(archReg.beat-25);
+ archBasic.CueDuck(archReg.beat);
+
+ }
+ }
+
+ public void SetupCrouches (double beat, double nextSwitch)
+ {
+ List relevantCrouches = GetAllCrouches(beat, nextSwitch);
+ foreach (var archCro in relevantCrouches)
+ {
+ RequestArch(archCro.beat-25);
+ archBasic.CueCrouch(archCro.beat);
+
+ }
+ }
+
+ public void SetupWalls (double beat, double nextSwitch)
+ {
+ List relevantWalls = GeteAllWalls(beat, nextSwitch);
+ foreach (var wallReg in relevantWalls)
+ {
+ RequestWall(wallReg.beat-25);
+ wallBasic.CueJump(wallReg.beat);
+
+ }
+ }
public override void OnPlay(double beat)
@@ -189,29 +219,51 @@ namespace HeavenStudio.Games
return EventCaller.GetAllInGameManagerList("airboarder", new string[] { "duck"}).FindAll(x => x.beat >= beat && x.beat < endBeat);
}
+ private List GetAllCrouches(double beat, double endBeat)
+ {
+ //lists arch and wall events
+ return EventCaller.GetAllInGameManagerList("airboarder", new string[] { "crouch"}).FindAll(x => x.beat >= beat && x.beat < endBeat);
+ }
+
+ private List GeteAllWalls(double beat, double endBeat)
+ {
+ //lists arch and wall events
+ return EventCaller.GetAllInGameManagerList("airboarder", new string[] { "jump"}).FindAll(y => y.beat >= beat && y.beat < endBeat);
+ }
+
public void Update()
{
var cond = Conductor.instance;
var currentBeat = cond.songPositionInBeatsAsDouble;
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 5f);
-
+
Floor.Play("moving", 0, normalizedBeat);
Floor.speed = 0;
Dog.Play("run", 0, normalizedBeat*5);
- Dog.speed = 0;
Tail.Play("wag",0,normalizedBeat*5);
- Tail.speed = 0;
-
+ CPU1.Play("hover",0,normalizedBeat);
+ CPU2.Play("hover",0,normalizedBeat);
+ Player.Play("hover",0,normalizedBeat);
+
if (cond.isPlaying && !cond.isPaused){
if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)){
- Player.GetComponent().DoScaledAnimationAsync("duck",1f);}
+ if (wantsCrouch)
+ {
+ Player.GetComponent().DoScaledAnimationAsync("charge",1f, 0, 1);
+ playerCantBop = true;
+ }
+ else
+ {
+ Player.GetComponent().DoScaledAnimationAsync("duck",1f, 0, 1);
+ }
+ }
if (PlayerInput.GetIsAction(InputAction_BasicRelease) && !IsExpectingInputNow(InputAction_BasicRelease)){
- Player.GetComponent().DoScaledAnimationAsync("hold",1f);
+ Player.GetComponent().DoScaledAnimationAsync("hold",1f, 0, 1);
playerCantBop = false;}
if (PlayerInput.GetIsAction(InputAction_FlickRelease) && !IsExpectingInputNow(InputAction_FlickRelease)){
- Player.GetComponent().DoScaledAnimationAsync("hold",1f);
+ Player.GetComponent().DoScaledAnimationAsync("hold",1f, 0, 1);
playerCantBop = false;}
}
@@ -225,6 +277,15 @@ namespace HeavenStudio.Games
}
}
+ public void PrepareJump(double beat, bool readySound)
+ {
+ if (readySound)
+ {
+ SoundByte.PlayOneShotGame("airboarder/ready");
+ }
+
+ }
+
public void BopToggle(double beat, float length, bool shouldBop, bool autoBop)
{
goBop = autoBop;
@@ -246,13 +307,13 @@ namespace HeavenStudio.Games
public void Bop()
{
if (!playerCantBop){
- Player.GetComponent().DoScaledAnimationAsync("bop",0.5f);
+ Player.GetComponent().DoScaledAnimationAsync("bop",0.5f, 0, 1);
}
if (!cpu1CantBop){
- CPU1.GetComponent().DoScaledAnimationAsync("bop",0.5f);
+ CPU1.GetComponent().DoScaledAnimationAsync("bop",0.5f, 0, 1);
}
if (!cpu2CantBop){
- CPU2.GetComponent().DoScaledAnimationAsync("bop",0.5f);
+ CPU2.GetComponent().DoScaledAnimationAsync("bop",0.5f, 0, 1);
}
}
@@ -266,9 +327,9 @@ namespace HeavenStudio.Games
});
}
BeatAction.New(instance, new List(){
- new BeatAction.Action(beat, delegate {CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat, delegate {CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat, delegate {Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f);})
+ new BeatAction.Action(beat, delegate {CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(beat, delegate {CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(beat, delegate {Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);})
}
);
@@ -281,119 +342,19 @@ namespace HeavenStudio.Games
newArch.gameObject.SetActive(true);
}
- public void CueDuck(double beat)
+ public void RequestWall(double beat)
{
- ScheduleInput(beat, 3f, InputAction_BasicPress, archBasic.DuckSuccess, archBasic.DuckMiss, archBasic.DuckEmpty);
- BeatAction.New(instance, new List() {
-
- new BeatAction.Action(beat, delegate {cpu1CantBop = true;} ),
- new BeatAction.Action(beat, delegate {CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
- new BeatAction.Action(beat + 1, delegate {cpu2CantBop = true;} ),
- new BeatAction.Action(beat+1, delegate {CPU1.GetComponent().DoScaledAnimationAsync("duck", 1f);}),
- new BeatAction.Action(beat+1, delegate {CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
- new BeatAction.Action(beat+2, delegate {playerCantBop = true;} ),
- new BeatAction.Action(beat+2, delegate {CPU2.GetComponent().DoScaledAnimationAsync("duck", 1f);}),
- new BeatAction.Action(beat+2, delegate {Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
- new BeatAction.Action(beat+2.5, delegate {cpu1CantBop = false;} ),
- new BeatAction.Action(beat+3.5, delegate {cpu2CantBop = false;} ),
- new BeatAction.Action(beat+4.5, delegate {playerCantBop = false;} ),
- });
-
- }
-
- public void CueCrouch(double beat)
- {
-
- ScheduleInput(beat, 3f, InputAction_BasicPress, CrouchSuccess, CrouchMiss, CrouchEmpty);
-
- BeatAction.New(instance, new List() {
- new BeatAction.Action(beat, delegate {cpu1CantBop = true;}),
- new BeatAction.Action(beat, delegate {CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
-
- new BeatAction.Action(beat+1, delegate {cpu2CantBop = true;} ),
- new BeatAction.Action(beat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
- new BeatAction.Action(beat+1, delegate {CPU1.GetComponent().DoScaledAnimationAsync("charge", 1f);}),
- new BeatAction.Action(beat+1, delegate {CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
-
- new BeatAction.Action(beat+2, delegate {CPU2.GetComponent().DoScaledAnimationAsync("charge", 1f);}),
- new BeatAction.Action(beat+2, delegate {Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(beat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");})
- });
-
- }
-
- public void CueJump(double beat, bool readySound)
- {
- ScheduleInput(beat, 3f, InputAction_FlickRelease, JumpSuccess, JumphMiss, JumpEmpty);
- if (readySound)
- {
- SoundByte.PlayOneShotGame("airboarder/ready");
- }
-
- BeatAction.New(instance, new List() {
-
-
- new BeatAction.Action(beat+1, delegate {CPU1.GetComponent().DoScaledAnimationAsync("jump", 1f);}),
- new BeatAction.Action(beat+1, delegate {cpu1CantBop = false;} ),
- new BeatAction.Action(beat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}),
- new BeatAction.Action(beat+2, delegate {CPU2.GetComponent().DoScaledAnimationAsync("jump", 1f);}),
- new BeatAction.Action(beat+2, delegate {cpu2CantBop = false;} ),
- new BeatAction.Action(beat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}),
- });
-
+ Wall newWall = Instantiate(wallBasic, transform);
+ newWall.appearBeat = beat;
+ newWall.gameObject.SetActive(true);
}
- // public void DuckSuccess(PlayerActionEvent caller, float state)
- // {
- // Player.GetComponent().DoScaledAnimationAsync("duck", 1f);
- // SoundByte.PlayOneShotGame("airboarder/crouch");
- // }
- // public void DuckMiss(PlayerActionEvent caller){
- // Player.GetComponent().DoScaledAnimationAsync("hit1",1f);
- // }
- // public void DuckEmpty(PlayerActionEvent caller){
- // Player.GetComponent().DoScaledAnimationAsync("hit2", 1f);
- // }
+
- public void CrouchSuccess(PlayerActionEvent caller, float state)
- {
- Player.GetComponent().DoScaledAnimationAsync("charge", 1f);
- SoundByte.PlayOneShotGame("airboarder/crouchCharge");
- playerCantBop = true;
- }
-
- public void CrouchMiss(PlayerActionEvent caller){
- Player.GetComponent().DoScaledAnimationAsync("hit1",1f);
- }
-
- public void CrouchEmpty(PlayerActionEvent caller){
- Player.GetComponent().DoScaledAnimationAsync("hit2", 1f);
- }
-
- public void JumpSuccess(PlayerActionEvent caller, float state)
- {
- Player.GetComponent().DoScaledAnimationAsync("jump", 1f);
- SoundByte.PlayOneShotGame("airboarder/jump");
- playerCantBop = false;
- }
-
- public void JumphMiss(PlayerActionEvent caller){
- Player.GetComponent().DoScaledAnimationAsync("hit1",1f);
- playerCantBop = false;
- }
-
- public void JumpEmpty(PlayerActionEvent caller){
- Player.GetComponent().DoScaledAnimationAsync("hit2", 1f);
- playerCantBop = false;
- }
-
+
}
diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs
index 4ed5ef1ea..b056f6818 100644
--- a/Assets/Scripts/Games/Airboarder/Arch.cs
+++ b/Assets/Scripts/Games/Airboarder/Arch.cs
@@ -16,6 +16,8 @@ namespace HeavenStudio.Games.Scripts_Airboarder
public float normalizedStart;
+ public float cueStart;
+
@@ -40,22 +42,48 @@ namespace HeavenStudio.Games.Scripts_Airboarder
BeatAction.New(game, new List() {
new BeatAction.Action(duckBeat, delegate {game.cpu1CantBop = true;} ),
- new BeatAction.Action(duckBeat, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
+ new BeatAction.Action(duckBeat, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
new BeatAction.Action(duckBeat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
new BeatAction.Action(duckBeat+ 1, delegate {game.cpu2CantBop = true;} ),
- new BeatAction.Action(duckBeat+ 1, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("duck", 1f);}),
- new BeatAction.Action(duckBeat+ 1, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(duckBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
+ new BeatAction.Action(duckBeat+ 1, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("duck", 1f, 0, 1);}),
+ new BeatAction.Action(duckBeat+ 1, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(duckBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
+ new BeatAction.Action(duckBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");}),
new BeatAction.Action(duckBeat+ 2, delegate {game.playerCantBop = true;} ),
- new BeatAction.Action(duckBeat+ 2, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("duck", 1f);}),
- new BeatAction.Action(duckBeat+ 2, delegate {game.Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f);}),
- new BeatAction.Action(duckBeat+ 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
+ new BeatAction.Action(duckBeat+ 2, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("duck", 1f, 0, 1);}),
+ new BeatAction.Action(duckBeat+ 2, delegate {game.Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(duckBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouch");}),
+ new BeatAction.Action(duckBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchvox");}),
new BeatAction.Action(duckBeat+ 2.5, delegate {game.cpu1CantBop = false;} ),
new BeatAction.Action(duckBeat+3.5, delegate {game.cpu2CantBop = false;} ),
new BeatAction.Action(duckBeat+4.5, delegate {game.playerCantBop = false;})
});
}
+
+ public void CueCrouch(double crouchBeat)
+ {
+ game.wantsCrouch = true;
+ game.ScheduleInput(crouchBeat, 3f, Airboarder.InputAction_BasicPress, CrouchSuccess, CrouchMiss, CrouchEmpty);
+
+
+ BeatAction.New(game, new List() {
+ new BeatAction.Action(crouchBeat, delegate {game.cpu1CantBop = true;}),
+ new BeatAction.Action(crouchBeat, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(crouchBeat, delegate {SoundByte.PlayOneShotGame("airboarder/ready");}),
+
+ new BeatAction.Action(crouchBeat+1, delegate {game.cpu2CantBop = true;} ),
+ new BeatAction.Action(crouchBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");}),
+ new BeatAction.Action(crouchBeat+1, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
+ new BeatAction.Action(crouchBeat+1, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+
+ new BeatAction.Action(crouchBeat+2, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1);}),
+ new BeatAction.Action(crouchBeat+2, delegate {game.Player.GetComponent().DoScaledAnimationAsync("letsgo", 1f, 0, 1);}),
+ new BeatAction.Action(crouchBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/crouchCharge");})
+ });
+
+ }
+
@@ -67,32 +95,59 @@ namespace HeavenStudio.Games.Scripts_Airboarder
var currentBeat = cond.songPositionInBeatsAsDouble;
float normalizedStart = Conductor.instance.GetPositionFromBeat(appearBeat, 40f);
float horizArch = (5*normalizedStart) - 140;
- anim.Play("move", 0, normalizedStart);
-// gameObject.transform.position = new Vector3(horizArch, -1f, 0.8f);
-
-
+ anim.GetComponent().DoNormalizedAnimation("move", normalizedStart, 0);
+ if (normalizedStart > 1) Destroy(gameObject);
}
public void DuckSuccess(PlayerActionEvent caller, float state)
{
- game.Player.GetComponent().DoScaledAnimationAsync("duck", 1f);
+ game.Player.GetComponent().DoScaledAnimationAsync("duck", 1f, 0, 1);
SoundByte.PlayOneShotGame("airboarder/crouch");
+ SoundByte.PlayOneShotGame("airboarder/crouchvox");
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1.5f, ()=>game.playerCantBop = false)});
}
public void DuckMiss(PlayerActionEvent caller)
{
- game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f);
- anim.DoScaledAnimationAsync("shake", 1f);
+ game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f, 0, 1);
+ anim.DoScaledAnimationAsync("shake", 1f, 0, 1);
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1.5f, ()=>game.playerCantBop = false)});
}
public void DuckEmpty(PlayerActionEvent caller)
{
- game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f);
- anim.DoScaledAnimationAsync("break", 1f);
+ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1);
+ anim.DoScaledAnimationAsync("break", 1f, 0, 1);
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1.5f, ()=>game.playerCantBop = false)});
+
}
+ public void CrouchSuccess(PlayerActionEvent caller, float state)
+ {
+ game.Player.GetComponent().DoScaledAnimationAsync("charge", 1f, 0, 1);
+ SoundByte.PlayOneShotGame("airboarder/crouchCharge");
+ game.playerCantBop = true;
+ }
+
+ public void CrouchMiss(PlayerActionEvent caller){
+ game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f, 0, 1);
+ anim.DoScaledAnimationAsync("shake", 1f, 0, 1);
+ }
+
+ public void CrouchEmpty(PlayerActionEvent caller){
+ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1);
+ anim.DoScaledAnimationAsync("break", 1f, 0, 1);
+ }
+
+
}
}
diff --git a/Assets/Scripts/Games/Airboarder/Wall.cs b/Assets/Scripts/Games/Airboarder/Wall.cs
new file mode 100644
index 000000000..f70f53582
--- /dev/null
+++ b/Assets/Scripts/Games/Airboarder/Wall.cs
@@ -0,0 +1,106 @@
+using System.Collections;
+using System.Collections.Generic;
+using HeavenStudio.Util;
+using HeavenStudio.InputSystem;
+using UnityEngine;
+
+namespace HeavenStudio.Games.Scripts_Airboarder
+{
+
+ public class Wall : MonoBehaviour
+ {
+ public Airboarder game;
+
+ public double targetBeat;
+ public double appearBeat;
+
+ public float normalizedWall;
+
+ public float cueStart;
+
+
+
+
+ [Header("Components")]
+
+ public Animator wallAnim;
+
+
+
+ private bool isCrouch;
+ // Start is called before the first frame update
+ private void Awake()
+ {
+ game = Airboarder.instance;
+
+
+ }
+
+
+
+ public void CueJump(double jumpBeat)
+ {
+ game.ScheduleInput(jumpBeat, 3f, Airboarder.InputAction_FlickRelease, JumpSuccess, JumphMiss, JumpEmpty);
+
+ BeatAction.New(game, new List() {
+
+
+ new BeatAction.Action(jumpBeat+1, delegate {game.CPU1.GetComponent().DoScaledAnimationAsync("jump", 1f, 0, 1);}),
+ new BeatAction.Action(jumpBeat+1, delegate {game.cpu1CantBop = false;} ),
+ new BeatAction.Action(jumpBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}),
+ new BeatAction.Action(jumpBeat + 1, delegate {SoundByte.PlayOneShotGame("airboarder/jumpvox");}),
+ new BeatAction.Action(jumpBeat+2, delegate {game.CPU2.GetComponent().DoScaledAnimationAsync("jump", 1f, 0, 1);}),
+ new BeatAction.Action(jumpBeat+2, delegate {game.cpu2CantBop = false;} ),
+ new BeatAction.Action(jumpBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}),
+ new BeatAction.Action(jumpBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/jumpvox");}),
+ });
+
+ }
+
+
+
+
+
+
+ // Update is called once per frame
+ void Update()
+ {
+ var cond = Conductor.instance;
+ var currentBeat = cond.songPositionInBeatsAsDouble;
+ float normalizedWall = Conductor.instance.GetPositionFromBeat(appearBeat, 40f);
+ wallAnim.GetComponent().DoNormalizedAnimation("move", normalizedWall, 0);
+ if (normalizedWall > 1) Destroy(gameObject);
+ }
+
+ public void JumpSuccess(PlayerActionEvent caller, float state)
+ {
+ game.Player.GetComponent().DoScaledAnimationAsync("jump", 1f, 0, 1);
+ SoundByte.PlayOneShotGame("airboarder/jump");
+ SoundByte.PlayOneShotGame("airboarder/jumpvox");
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1f, ()=>game.playerCantBop = false)});
+ game.wantsCrouch = false;
+ }
+
+ public void JumphMiss(PlayerActionEvent caller){
+ game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f, 0, 1);
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1.5f, ()=>game.playerCantBop = false)});
+ game.wantsCrouch = false;
+ }
+
+ public void JumpEmpty(PlayerActionEvent caller){
+ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1);
+ double beat = caller.startBeat + caller.timer;
+ BeatAction.New(this, new() {
+ new(beat+1.5f, ()=>game.playerCantBop = false)});
+ game.wantsCrouch = false;
+ }
+
+
+
+ }
+}
+
diff --git a/Assets/Scripts/Games/Airboarder/Wall.cs.meta b/Assets/Scripts/Games/Airboarder/Wall.cs.meta
new file mode 100644
index 000000000..6981541e5
--- /dev/null
+++ b/Assets/Scripts/Games/Airboarder/Wall.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 880c2da5c9a9de040b78025a28c90867
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Wall.cs b/Assets/Wall.cs
new file mode 100644
index 000000000..0411ff552
--- /dev/null
+++ b/Assets/Wall.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Wall : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Wall.cs.meta b/Assets/Wall.cs.meta
new file mode 100644
index 000000000..6074f2023
--- /dev/null
+++ b/Assets/Wall.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 14ce7d02c21a31847b1e247a9aa4c13d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index efd92c858..7e249ba0e 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -17,8 +17,8 @@ MonoBehaviour:
DenseViewWidthThreshold: 512
_disableAutoReloadInBackground: 0
ImportedScriptPaths:
- - Assets/Scripts/Games/Airboarder/Arch.cs
+ - Assets/Scripts/Games/Airboarder/Wall.cs
- Assets/Scripts/Games/Airboarder/Airboarder.cs
- - Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs
+ - Assets/Scripts/Games/Airboarder/Arch.cs
PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: []