From 39c38b8aa12be9ce83620edb8204cedd72f445bc Mon Sep 17 00:00:00 2001
From: wookywok <62037083+wookywok@users.noreply.github.com>
Date: Sat, 2 Mar 2024 22:09:30 -0600
Subject: [PATCH] camera stuff!
---
Assets/Resources/Games/airboarder.prefab | 836 +++++++++++++-----
.../Animations/arch/arch.controller | 70 +-
.../Airboarder/Animations/arch/idle.anim | 2 +-
.../Airboarder/Animations/arch/move.anim | 83 +-
.../Animations/wall/Wall.controller | 4 +-
.../Airboarder/Animations/wall/idle.anim | 189 +++-
.../Airboarder/Animations/wall/move.anim | 83 +-
.../Games/Airboarder/neo_airboy.fbx.meta | 158 +++-
Assets/Scenes/Editor.unity | 56 +-
Assets/Scripts/Games/Airboarder/Airboarder.cs | 108 ++-
Assets/Scripts/Games/Airboarder/Arch.cs | 5 +-
11 files changed, 1282 insertions(+), 312 deletions(-)
diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab
index 7757de917..3b32fdc2a 100644
--- a/Assets/Resources/Games/airboarder.prefab
+++ b/Assets/Resources/Games/airboarder.prefab
@@ -33,6 +33,100 @@ Transform:
m_Father: {fileID: 6788947284919293199}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &999186384291081479
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7590887620224905535}
+ - component: {fileID: 7368235579329988962}
+ m_Layer: 0
+ m_Name: Directional Light
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &7590887620224905535
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 999186384291081479}
+ m_LocalRotation: {x: -0.042956725, y: -0.17348297, z: -0.0075744325, w: 0.98387045}
+ m_LocalPosition: {x: 0, y: 5, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2677427256397037315}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: -5, y: -20, z: 0}
+--- !u!108 &7368235579329988962
+Light:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 999186384291081479}
+ m_Enabled: 1
+ serializedVersion: 10
+ m_Type: 1
+ m_Shape: 0
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Intensity: 1
+ m_Range: 10
+ m_SpotAngle: 30
+ m_InnerSpotAngle: 21.80208
+ m_CookieSize: 10
+ m_Shadows:
+ m_Type: 0
+ m_Resolution: -1
+ m_CustomResolution: -1
+ m_Strength: 0.25
+ m_Bias: 0.05
+ m_NormalBias: 0.4
+ m_NearPlane: 0.2
+ m_CullingMatrixOverride:
+ e00: 1
+ e01: 0
+ e02: 0
+ e03: 0
+ e10: 0
+ e11: 1
+ e12: 0
+ e13: 0
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_UseCullingMatrixOverride: 0
+ m_Cookie: {fileID: 0}
+ m_DrawHalo: 0
+ m_Flare: {fileID: 0}
+ m_RenderMode: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_RenderingLayerMask: 1
+ m_Lightmapping: 4
+ m_LightShadowCasterMode: 0
+ m_AreaSize: {x: 1, y: 1}
+ m_BounceIntensity: 2
+ m_ColorTemperature: 6570
+ m_UseColorTemperature: 0
+ m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+ m_UseBoundingSphereOverride: 0
+ m_UseViewFrustumForShadowCasterCull: 1
+ m_ShadowRadius: 0
+ m_ShadowAngle: 0
--- !u!1 &1215422233952891257
GameObject:
m_ObjectHideFlags: 0
@@ -59,8 +153,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1215422233952891257}
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_LocalPosition: {x: -0.00029361, y: 0.000028945, z: 1.999}
+ m_LocalScale: {x: 209.80533, y: 209.80533, z: 209.80533}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5254664032251897646}
@@ -204,7 +298,7 @@ Transform:
- {fileID: 4247666789870766831}
- {fileID: 9145231469005479427}
- {fileID: 8154153378120042038}
- - {fileID: 196530934078900318}
+ - {fileID: 2677427256397037315}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -223,6 +317,9 @@ MonoBehaviour:
SoundSequences: []
scheduledInputs: []
wantsCrouch: 0
+ cameraPivot: {fileID: 2677427256397037315}
+ cameraPos: {fileID: 2677427256397037315}
+ cameraFOV: 25
archBasic: {fileID: 6590728124445756167}
wallBasic: {fileID: 4600485667161481742}
CPU1: {fileID: 1975474441940497211}
@@ -269,90 +366,6 @@ Transform:
m_Father: {fileID: 9145231469005479427}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !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
@@ -447,6 +460,124 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
+--- !u!1 &5263416151098873631
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2677427256397037315}
+ m_Layer: 0
+ m_Name: airCam
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2677427256397037315
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5263416151098873631}
+ m_LocalRotation: {x: 0.058832005, y: -0.53599083, z: 0.037480127, w: 0.841337}
+ m_LocalPosition: {x: 15, y: 4, z: -10}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 3041313458763079256}
+ - {fileID: 3596070473536993749}
+ - {fileID: 7590887620224905535}
+ m_Father: {fileID: 4475688631540571435}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 8, y: -65, z: 0}
+--- !u!1 &5394125054486367733
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3596070473536993749}
+ - component: {fileID: 7998239260032225908}
+ m_Layer: 0
+ m_Name: BackgroundPlane
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &3596070473536993749
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5394125054486367733}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 10}
+ m_LocalScale: {x: 8000, y: 8000, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2677427256397037315}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &7998239260032225908
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5394125054486367733}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: d308d6053cbc091489ae82391d36d476, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1, y: 1}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
--- !u!1 &6174176853209375996
GameObject:
m_ObjectHideFlags: 0
@@ -580,6 +711,81 @@ Transform:
m_Father: {fileID: 4247666789870766831}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7147084581281717594
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3041313458763079256}
+ - component: {fileID: 3989233943624912286}
+ m_Layer: 0
+ m_Name: Camera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &3041313458763079256
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7147084581281717594}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0, y: 0, z: 6.34}
+ m_LocalScale: {x: 1, y: 1, z: 8.956697}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 2677427256397037315}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &3989233943624912286
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7147084581281717594}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 1
+ m_BackGroundColor: {r: 1, g: 1, b: 1, 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: 2000
+ field of view: 30
+ 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: 0
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
--- !u!1 &7292280111615509311
GameObject:
m_ObjectHideFlags: 0
@@ -654,17 +860,41 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 6887818625373377000}
m_Modifications:
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.9999999
+ objectReference: {fileID: 0}
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.000021828784
+ objectReference: {fileID: 0}
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.00299883
+ objectReference: {fileID: 0}
+ - target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.000053091644
+ objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 57.072582
+ value: 9.430364
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -158.26233
+ value: 0.074958555
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -155.70155
+ value: 0.8477552
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_RootOrder
@@ -726,45 +956,117 @@ PrefabInstance:
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.9999999
+ objectReference: {fileID: 0}
+ - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.9999999
+ objectReference: {fileID: 0}
+ - target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.99999994
+ objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.0037544402
+ value: 0.04674983
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -170.83171
+ value: -87.68036
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -179.99998
+ value: -180.00005
+ objectReference: {fileID: 0}
+ - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.0014555797
+ objectReference: {fileID: 0}
+ - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0014553501
+ objectReference: {fileID: 0}
+ - target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00012458238
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 14.99195
+ value: -2.7883897
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -32.04861
+ value: 4.700611
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 81.86888
+ value: 55.369484
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.000011850246
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -1.0635972e-10
+ objectReference: {fileID: 0}
+ - target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00006796107
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -9.494073
+ value: -22.220493
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -2.5476854
+ value: -11.017366
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -5.1301217
+ value: 3.8632288
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.001552491
+ objectReference: {fileID: 0}
+ - target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0
+ value: 0.23917596
objectReference: {fileID: 0}
- target: {fileID: -5315867602706669865, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -812,43 +1114,83 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: f58d76d5af0485d4c9cbdd39dbc2c269, type: 2}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -59.391018
+ value: -59.364254
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 26.714212
+ value: -64.92807
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 84.9995
+ value: -175.62436
objectReference: {fileID: 0}
- target: {fileID: -3673476394703291053, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -0.0000008537735
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.000019310237
+ objectReference: {fileID: 0}
+ - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0025961706
+ objectReference: {fileID: 0}
+ - target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.00038391133
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -61.544746
+ value: -15.039279
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 28.314386
+ value: 6.8003807
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 107.18067
+ value: 103.032974
+ objectReference: {fileID: 0}
+ - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -31.113686
+ value: 24.079586
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -43.500896
+ value: -6.325379
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -6.631444
+ value: 8.152066
+ objectReference: {fileID: 0}
+ - target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.0000143014295
+ objectReference: {fileID: 0}
+ - target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.0017634439
+ objectReference: {fileID: 0}
+ - target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00065276027
objectReference: {fileID: 0}
- target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -856,51 +1198,131 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 50.932003
+ value: -3.9105697
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -60.29547
+ value: 23.379951
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 104.41759
+ value: 156.13875
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.94772017
+ value: 2.563657
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0.21695867
+ value: 18.504347
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 18.565536
+ value: -6.713996
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.99999994
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0.00285833
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 4.6566126e-11
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.00014242729
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.8412099
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.17813602
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.5063012
+ objectReference: {fileID: 0}
+ - target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.06551843
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -13.494701
+ value: 12.141446
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 64.15821
+ value: 6.918951
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -17.389238
+ value: -13.036831
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.00023749859
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.0012651699
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.00024293795
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.78280616
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.41258737
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0.24122374
+ objectReference: {fileID: 0}
+ - target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.39849374
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -26.981293
+ value: 8.439123
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -52.446095
+ value: 4.2026987
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 67.43605
+ value: 69.492035
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_Name
@@ -908,55 +1330,75 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -1.0355204
+ value: -1.0320508
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 46.175224
+ value: 47.240482
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.9937357
+ value: 0.9541969
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.000001067217
+ value: -0.19191778
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0.0000012272997
+ value: -0.15843731
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.0000006403302
+ value: 7.5429993
+ objectReference: {fileID: 0}
+ - target: {fileID: 5307233405938488542, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5307233405938488542, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7096549898355155914, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -0.0000008537735
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -15.630414
+ value: 7.1676645
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 118.819725
+ value: 116.93028
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -44.83902
+ value: -0.7320976
+ objectReference: {fileID: 0}
+ - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.00279524
+ objectReference: {fileID: 0}
+ - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 7.4505804e-11
+ objectReference: {fileID: 0}
+ - target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 7.4505804e-11
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.0000034007962
+ value: -0.0000012262393
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -63.31813
+ value: -106.47599
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.0000002597845
+ value: -0.000000039879858
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
@@ -1004,31 +1446,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.x
- value: 0.89052725
+ value: 0.43400735
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.y
- value: 0.89052737
+ value: 0.4340074
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalScale.z
- value: 0.89052725
+ value: 0.43400735
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.x
- value: -39.525867
+ value: 15.087
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.y
- value: -11.699999
+ value: -3.2226
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalPosition.z
- value: -8.3697815
+ value: -15.707
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.w
- value: 0.6978768
+ value: 0.5984718
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.x
@@ -1036,7 +1478,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.y
- value: 0.7162179
+ value: 0.8011439
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalRotation.z
@@ -1048,7 +1490,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 91.486
+ value: 106.479
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1392,15 +1834,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 20.978533
+ value: 57.381756
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -0.18177979
+ value: -158.12123
objectReference: {fileID: 0}
- target: {fileID: -8964012596248610549, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -0.63425094
+ value: -155.6617
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_RootOrder
@@ -1452,27 +1894,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.8078925
+ value: 0.056753226
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 83.256325
+ value: -167.16196
objectReference: {fileID: 0}
- target: {fileID: -7623216900852632940, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 179.99706
+ value: 180.00005
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -42.618855
+ value: 14.577116
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 16.239912
+ value: -31.999496
objectReference: {fileID: 0}
- target: {fileID: -6777710578386425081, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 45.6652
+ value: 82.04556
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalScale.x
@@ -1488,19 +1930,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 2.5092328
+ value: -9.457023
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0.43523154
+ value: -2.1630514
objectReference: {fileID: 0}
- target: {fileID: -5887593339048327712, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 22.268675
+ value: -5.0018635
objectReference: {fileID: 0}
- target: {fileID: -5546437562569359665, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 32.689
+ value: 0.33671144
objectReference: {fileID: 0}
- target: {fileID: -5315867602706669865, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1532,15 +1974,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -65.93207
+ value: -57.961338
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -102.13508
+ value: 30.606495
objectReference: {fileID: 0}
- target: {fileID: -4327179202414459862, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 158.12456
+ value: 81.31543
objectReference: {fileID: 0}
- target: {fileID: -3673476394703291053, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1560,27 +2002,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 0.8015548
+ value: -61.45762
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 8.560867
+ value: 28.064795
objectReference: {fileID: 0}
- target: {fileID: -2567523845891388357, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 79.472115
+ value: 107.300316
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -49.878593
+ value: -31.128532
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -16.577326
+ value: -44.02721
objectReference: {fileID: 0}
- target: {fileID: -2490844041709736929, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -10.082315
+ value: -6.3419
objectReference: {fileID: 0}
- target: {fileID: -2240725241546395484, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1588,27 +2030,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 18.471048
+ value: 51.2752
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -40.35578
+ value: -60.27567
objectReference: {fileID: 0}
- target: {fileID: -1593081406422785238, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 66.74153
+ value: 104.51579
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.0000012133594
+ value: -0.7646533
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -0.00000062879076
+ value: 0.4124572
objectReference: {fileID: 0}
- target: {fileID: -1326856960798226984, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 17.91856
+ value: 18.184895
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalScale.x
@@ -1624,15 +2066,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 17.231918
+ value: -13.488705
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 51.47937
+ value: 64.16658
objectReference: {fileID: 0}
- target: {fileID: -907434222094754871, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -6.9952335
+ value: -17.684101
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalScale.x
@@ -1648,15 +2090,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 24.031073
+ value: -26.74528
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -40.806442
+ value: -52.560722
objectReference: {fileID: 0}
- target: {fileID: 487041899077519193, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 112.67798
+ value: 67.72485
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_Name
@@ -1664,27 +2106,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.26069844
+ value: -1.0677625
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 22.19989
+ value: 45.990498
objectReference: {fileID: 0}
- target: {fileID: 4108420948615836622, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 0.6387967
+ value: 1.0316931
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.00016632648
+ value: 9.325476
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -0.00022518226
+ value: -9.525562
objectReference: {fileID: 0}
- target: {fileID: 4250918724240952483, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -0.00035762409
+ value: -0.36550474
objectReference: {fileID: 0}
- target: {fileID: 7096549898355155914, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -1692,27 +2134,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: 2.231184
+ value: -17.940163
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 132.37848
+ value: 117.38793
objectReference: {fileID: 0}
- target: {fileID: 8589286667285037113, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -70.36433
+ value: -46.5822
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.0000034150944
+ value: 0.000001520802
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: -0.0000012806604
+ value: -63.68238
objectReference: {fileID: 0}
- target: {fileID: 9149972516257850564, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: 3.8166654e-14
+ value: 0.0000008404543
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 333100bf553a5924d870acafacb4f53a, type: 3}
@@ -2098,27 +2540,27 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.x
- value: 3.4368887
+ value: 1.9483035
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.y
- value: 3.4368887
+ value: 1.9483035
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalScale.z
- value: 3.4368887
+ value: 1.9483035
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.x
- value: -239.8
+ value: -190.8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.y
- value: 47.1
+ value: 15.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalPosition.z
- value: -29.8
+ value: 3.7
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3}
propertyPath: m_LocalRotation.w
@@ -2671,9 +3113,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7418df1ca9a5218468aa02006816659f, type: 3}
m_Name:
m_EditorClassIdentifier:
+ archBasic: {fileID: 0}
anim: {fileID: 8289865541076859572}
game: {fileID: 9105702199878946262}
targetBeat: 0
appearBeat: 0
normalizedStart: 0
- cueStart: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
index 6c850ed64..424a48c82 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller
@@ -14,7 +14,7 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
- m_WriteDefaultValues: 1
+ m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
@@ -26,58 +26,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1102 &-7530952339586054454
-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!1102 &-7228348868439060554
-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 &-1891003415174242613
AnimatorState:
serializedVersion: 6
@@ -92,7 +40,7 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
- m_WriteDefaultValues: 1
+ m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
@@ -119,12 +67,6 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -8672832660157761820}
m_Position: {x: 260, y: 0, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -7530952339586054454}
- m_Position: {x: 260, y: 120, z: 0}
- - serializedVersion: 1
- m_State: {fileID: -7228348868439060554}
- m_Position: {x: 260, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -183,7 +125,7 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
- m_WriteDefaultValues: 1
+ m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
@@ -206,7 +148,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 5773130082680349530}
- m_Position: {x: 282.9432, y: 34.36415, z: 0}
+ m_Position: {x: 280, y: 30, z: 0}
- serializedVersion: 1
m_State: {fileID: 6285518713359575881}
m_Position: {x: 282.93604, y: 215.39151, z: 0}
@@ -237,7 +179,7 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
- m_WriteDefaultValues: 1
+ m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
@@ -263,7 +205,7 @@ AnimatorState:
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
- m_WriteDefaultValues: 1
+ m_WriteDefaultValues: 0
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim b/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim
index 7b5f557c0..c044b95f6 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim
@@ -36,7 +36,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 0
+ m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim
index c0dc4a9c1..a0c3bc5f5 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/move.anim
@@ -41,7 +41,44 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.016666668
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_high_model
+ classID: 1
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -57,6 +94,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3051566205
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -163,6 +207,43 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.016666668
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_high_model
+ classID: 1
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller
index f704a163a..e7504991b 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/Wall.controller
@@ -107,7 +107,7 @@ AnimatorController:
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
- m_DefaultWeight: 1
+ m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
@@ -164,7 +164,7 @@ AnimatorStateMachine:
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: -3339993895938749424}
+ m_DefaultState: {fileID: -7867947768620779705}
--- !u!1102 &5573168244071546499
AnimatorState:
serializedVersion: 6
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim
index 7b5f557c0..6a1bd97bb 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim
@@ -14,9 +14,62 @@ AnimationClip:
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
- m_PositionCurves: []
+ m_PositionCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: {x: -140.99988, y: -1, z: 0.7999998}
+ 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: -140.99988, y: -1, z: 0.7999998}
+ 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_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_low_model
+ classID: 1
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -24,7 +77,21 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 3301542606
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 1
+ script: {fileID: 0}
+ typeID: 4
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -46,8 +113,120 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -140.99988
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: -140.99988
+ 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: -1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: -1
+ 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.7999998
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0.7999998
+ 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}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_low_model
+ classID: 1
+ script: {fileID: 0}
m_EulerEditorCurves: []
- m_HasGenericRootTransform: 0
+ m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
index 8abedb7db..9a0900238 100644
--- a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
+++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim
@@ -41,7 +41,44 @@ AnimationClip:
m_RotationOrder: 4
path:
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.016666668
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.6666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_low_model
+ classID: 1
+ script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
@@ -57,6 +94,13 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 3301542606
+ attribute: 2086281974
+ script: {fileID: 0}
+ typeID: 1
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@@ -163,6 +207,43 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.016666668
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 0.6666667
+ value: 1
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_IsActive
+ path: wall_low_model
+ classID: 1
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
diff --git a/Assets/Resources/Models/Games/Airboarder/neo_airboy.fbx.meta b/Assets/Resources/Models/Games/Airboarder/neo_airboy.fbx.meta
index 379a479fa..40955606e 100644
--- a/Assets/Resources/Models/Games/Airboarder/neo_airboy.fbx.meta
+++ b/Assets/Resources/Models/Games/Airboarder/neo_airboy.fbx.meta
@@ -8,7 +8,7 @@ ModelImporter:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: airboy_board
- second: {fileID: 2100000, guid: 21a244208ca5883499c02785947c32eb, type: 2}
+ second: {fileID: 2100000, guid: 18236ab917d571548b689dbcdf081b2e, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
@@ -39,7 +39,7 @@ ModelImporter:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
- animationCompression: 1
+ animationCompression: 3
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
@@ -95,7 +95,157 @@ ModelImporter:
humanDescription:
serializedVersion: 3
human: []
- skeleton: []
+ skeleton:
+ - name: neo_airboy(Clone)
+ parentName:
+ position: {x: 0, y: 0, z: 0}
+ rotation: {x: 0, y: 0, z: 0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: airboy_model
+ parentName: neo_airboy(Clone)
+ position: {x: -0, y: 0, z: 0}
+ rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
+ scale: {x: 100, y: 100, z: 100}
+ - name: airboy_model_skeleton
+ parentName: neo_airboy(Clone)
+ position: {x: -0, y: 0, z: 0}
+ rotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
+ scale: {x: 100, y: 100, z: 100}
+ - name: airboy
+ parentName: airboy_model_skeleton
+ position: {x: 0, y: -5.9604643e-10, z: 0.0047615133}
+ rotation: {x: 0.6252786, y: -0.18935074, z: -0.056728657, w: 0.7549536}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Skl_Root
+ parentName: airboy
+ position: {x: -0.0000143014295, y: 0.0017634439, z: -0.00065276027}
+ rotation: {x: 0, y: 0, z: -0.7071081, w: 0.7071055}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Leg_1_L
+ parentName: Skl_Root
+ position: {x: 0.00023749859, y: -0.0012651699, z: 0.00024293795}
+ rotation: {x: -0.0701334, y: 0.021923741, z: 0.5820632, w: 0.8098168}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Leg_2_L
+ parentName: Leg_1_L
+ position: {x: 0.000021828784, y: -0.00299883, z: -0.000053091644}
+ rotation: {x: 0.3738204, y: -0.15457922, z: -0.0067697144, w: 0.9145042}
+ scale: {x: 0.9999999, y: 0.99999994, z: 0.99999994}
+ - name: Ankle_L
+ parentName: Leg_2_L
+ position: {x: -0.000019310237, y: -0.0025961706, z: 0.00038391133}
+ rotation: {x: 0.44290522, y: 0.695263, z: 0.38431135, w: 0.4156309}
+ scale: {x: 1, y: 0.9999999, z: 1.0000001}
+ - name: Ankle_L_end
+ parentName: Ankle_L
+ position: {x: -0, y: 0.00006831873, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Leg_1_R
+ parentName: Skl_Root
+ position: {x: 0.0004820577, y: 0.0012244481, z: -0.00016237333}
+ rotation: {x: 0.018891929, y: 0.9935955, z: -0.11084521, w: -0.011162682}
+ scale: {x: 1, y: 0.99999994, z: 0.99999994}
+ - name: Leg_2_R
+ parentName: Leg_1_R
+ position: {x: -0.0029990696, y: -0.00000016089528, z: 0.000054637192}
+ rotation: {x: 0.84910434, y: -0.022140535, z: 0.5240824, w: -0.062203437}
+ scale: {x: 0.9999999, y: 0.9999999, z: 0.99999994}
+ - name: Ankle_R
+ parentName: Leg_2_R
+ position: {x: 0.00035560734, y: 0.00003682382, z: -0.0025999998}
+ rotation: {x: -0.41944757, y: 0.53825307, z: 0.66963845, w: 0.2931412}
+ scale: {x: 1, y: 0.99999994, z: 1}
+ - name: Ankle_R_end
+ parentName: Ankle_R
+ position: {x: -0, y: 0.0000683188, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Waist
+ parentName: Skl_Root
+ position: {x: -0.000011850246, y: -1.0635972e-10, z: -0.00006796107}
+ rotation: {x: -0.081661806, y: -0.025835225, z: -0.046427183, w: 0.9952429}
+ scale: {x: 1, y: 0.99999994, z: 1}
+ - name: Spine
+ parentName: Waist
+ position: {x: -0.00285833, y: 4.6566126e-11, z: -0.00014242729}
+ rotation: {x: -0.19188948, y: 0.3852869, z: -0.053714685, w: 0.90102565}
+ scale: {x: 1, y: 0.99999994, z: 1}
+ - name: Arm_1_L
+ parentName: Spine
+ position: {x: -0.0014556204, y: -0.0014599604, z: -0.00012458261}
+ rotation: {x: -0.28129122, y: -0.44526345, z: 0.59765553, w: 0.6045028}
+ scale: {x: 1.0000001, y: 1, z: 1}
+ - name: Arm_2_L
+ parentName: Arm_1_L
+ position: {x: -0.0027749697, y: 0.00000016977778, z: -0.000005434118}
+ rotation: {x: -0.009569032, y: 0.04283372, z: -0.008593103, w: 0.9989995}
+ scale: {x: 1, y: 1.0000001, z: 0.99999994}
+ - name: Wrist_L
+ parentName: Arm_2_L
+ position: {x: -0.0020982707, y: -0.00000016995705, z: 0.000005434453}
+ rotation: {x: 0.0015187274, y: -0.34756982, z: 0.57559866, w: 0.7401886}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Wrist_L_end
+ parentName: Wrist_L
+ position: {x: -0, y: 0.00006831884, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Arm_1_R
+ parentName: Spine
+ position: {x: -0.0014555797, y: 0.0014553501, z: -0.00012458238}
+ rotation: {x: -0.091404326, y: -0.2838889, z: 0.65810406, w: 0.6913403}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Arm_2_R
+ parentName: Arm_1_R
+ position: {x: 0.00279524, y: 7.4505804e-11, z: 7.4505804e-11}
+ rotation: {x: -0.021586465, y: 0.0049736337, z: 0.035006884, w: 0.9991416}
+ scale: {x: 1, y: 1, z: 0.99999994}
+ - name: Wrist_R
+ parentName: Arm_2_R
+ position: {x: 0.00200266, y: -2.4214386e-10, z: 3.9115547e-10}
+ rotation: {x: 0.0020077813, y: 0.03459511, z: -0.6778131, w: 0.73441714}
+ scale: {x: 0.99999994, y: 0.9999999, z: 1}
+ - name: Wrist_R_end
+ parentName: Wrist_R
+ position: {x: -0, y: 0.00006831884, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: Head
+ parentName: Spine
+ position: {x: -0.00273719, y: -2.4214386e-10, z: -0.00019367904}
+ rotation: {x: -0.22803612, y: -0.3707989, z: -0.1509692, w: 0.88753366}
+ scale: {x: 1, y: 0.99999994, z: 1}
+ - name: Head_end
+ parentName: Head
+ position: {x: -0, y: 0.0000683188, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: board_model
+ parentName: airboy
+ position: {x: -0, y: -0.001552491, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: eft_fire_L
+ parentName: board_model
+ position: {x: -0.013613599, y: -0.0010463799, z: 0.0040700096}
+ rotation: {x: 0, y: -0, z: -0.0000000074505797, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: eft_fire_L_end
+ parentName: eft_fire_L
+ position: {x: -0, y: 0.00006831877, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: eft_fire_R
+ parentName: board_model
+ position: {x: -0.013613599, y: -0.0010463799, z: -0.0040804893}
+ rotation: {x: 0, y: -0, z: -0.0000000074505797, w: 1}
+ scale: {x: 1, y: 1, z: 1}
+ - name: eft_fire_R_end
+ parentName: eft_fire_R
+ position: {x: -0, y: 0.00006831877, z: 0}
+ rotation: {x: 0, y: -0, z: -0, w: 1}
+ scale: {x: 1, y: 1, z: 1}
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
@@ -106,7 +256,7 @@ ModelImporter:
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
- hasExtraRoot: 0
+ hasExtraRoot: 1
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 3d7bd1a24..8a49dd4af 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -551,9 +551,9 @@ RectTransform:
m_Father: {fileID: 574002313}
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: 0, 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 &9435782
@@ -4172,9 +4172,9 @@ RectTransform:
m_Father: {fileID: 539838476}
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: 32, 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: 1, y: 0.5}
--- !u!114 &121871281
@@ -4396,9 +4396,9 @@ RectTransform:
m_Father: {fileID: 539838476}
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: 72, 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: 1, y: 0.5}
--- !u!114 &129013734
@@ -4532,9 +4532,9 @@ RectTransform:
m_Father: {fileID: 539838476}
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: 112, 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: 1, y: 0.5}
--- !u!114 &151246938
@@ -7278,7 +7278,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 24.3
+ m_fontSize: 8
m_fontSizeBase: 24.3
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -8906,7 +8906,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 2.9
+ m_fontSize: 0
m_fontSizeBase: 14.3
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -17806,8 +17806,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 704039021}
m_HandleRect: {fileID: 704039020}
m_Direction: 0
- m_Value: 0
- m_Size: 1
+ m_Value: -0.0000011559699
+ m_Size: 0.53800046
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -26850,8 +26850,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
- m_Value: 0
- m_Size: 1
+ m_Value: 1
+ m_Size: 0.9994133
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: 64.28572}
+ m_AnchoredPosition: {x: 0, y: 119.22439}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@@ -34643,7 +34643,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -8}
+ m_AnchoredPosition: {x: 0, y: -8.0000305}
m_SizeDelta: {x: 0, y: -63.99999}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1244621693
@@ -37250,9 +37250,9 @@ RectTransform:
m_Father: {fileID: 574002313}
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: 40, 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 &1345846031
@@ -43455,8 +43455,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
- m_Value: 1.0000002
- m_Size: 0.13436738
+ m_Value: 1.0000005
+ m_Size: 0.58957434
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -46876,9 +46876,9 @@ RectTransform:
m_Father: {fileID: 574002313}
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: 80, 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 &1783491359
diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs
index 8ddd86ad3..4000cf3dd 100644
--- a/Assets/Scripts/Games/Airboarder/Airboarder.cs
+++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs
@@ -99,7 +99,24 @@ namespace HeavenStudio.Games.Loaders
{
new Param("sound", true, "Play Sound", "Toggle if the 'YEAAAAAH LET'S GO' voice clip plays."),
}
- }
+ },
+
+ new GameAction("camera", "Camera Controls")
+ {
+ function = delegate {
+ var e = eventCaller.currentEntity;
+ // var rotation = new Vector3(0, e["valA"], 0);
+ Airboarder.instance.ChangeCamera(eventCaller.currentEntity.beat, eventCaller.currentEntity["valA"], eventCaller.currentEntity["valB"], eventCaller.currentEntity.length, (Util.EasingFunction.Ease)eventCaller.currentEntity["type"], eventCaller.currentEntity["additive"]);
+ },
+ defaultLength = 4,
+ resizable = true,
+ parameters = new List() {
+ new Param("valA", new EntityTypes.Integer(-360, 360, 0), "Rotation", "Set the rotation of the camera around the pivot point."),
+ new Param("valB", new EntityTypes.Float(0.1f, 4f, 0.5f), "Zoom", "Set the camera's level of zoom."),
+ new Param("type", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action."),
+ new Param("additive", true, "Additive Rotation", "Toggle if the above rotation should be added to the current angle instead of setting the target angle to travel to.")
+ }
+ },
},
@@ -128,6 +145,11 @@ namespace HeavenStudio.Games
public static Airboarder instance;
public bool wantsCrouch;
+
+ [Header("Camera")]
+ [SerializeField] Transform cameraPivot;
+ [SerializeField] Transform cameraPos;
+ [SerializeField] float cameraFOV;
[Header("Objects")]
[SerializeField] Arch archBasic;
@@ -150,6 +172,13 @@ namespace HeavenStudio.Games
public double switchBeat;
+ double cameraRotateBeat = double.MaxValue;
+ double cameraRotateLength;
+ Util.EasingFunction.Ease cameraRotateEase;
+ float cameraRotateLast = 0, cameraScaleLast = 1;
+ float cameraRotateNext = 0, cameraScaleNext = 1;
+
+
public float startFloor;
private void Awake()
@@ -157,6 +186,9 @@ namespace HeavenStudio.Games
instance = this;
SetupBopRegion("airboarder", "bop", "auto");
wantsCrouch = false;
+ GameCamera.AdditionalPosition = cameraPos.position + (Quaternion.Euler(cameraPos.rotation.eulerAngles) * Vector3.forward * 10f);
+ GameCamera.AdditionalRotEuler = cameraPos.rotation.eulerAngles;
+ GameCamera.AdditionalFoV = cameraFOV;
}
public override void OnGameSwitch(double beat)
@@ -195,22 +227,62 @@ namespace HeavenStudio.Games
wallBasic.CueJump(e.beat);
break;
}
- }
-
-
-
-
-
+ }
}
+ private void Start()
+ {
+ EntityPreCheck(Conductor.instance.songPositionInBeatsAsDouble);
+ }
+
+ void EntityPreCheck(double beat)
+ {
+ cameraRotateBeat = double.MaxValue;
+ cameraRotateLength = 0;
+ cameraRotateEase = Util.EasingFunction.Ease.Linear;
+ cameraRotateLast = 0; cameraScaleLast = 1;
+ cameraRotateNext = 0; cameraScaleNext = 1;
+
+ List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat < beat && c.datamodel.Split(0) == "airboarder");
+ RiqEntity lastGameSwitch = GameManager.instance.Beatmap.Entities.FindLast(c => c.beat <= beat && c.datamodel == "gameManager/switchGame/airboarder");
+
+ if (lastGameSwitch == null) return;
+ List cameraEntities = prevEntities.FindAll(c => c.beat >= lastGameSwitch.beat && c.datamodel == "airboarder/camera");
+
+ foreach (var entity in cameraEntities)
+ {
+ ChangeCamera(entity.beat, entity["valA"], entity["valB"], entity.length, (Util.EasingFunction.Ease)entity["type"], entity["additive"]);
+ }
+
+ UpdateCamera(beat);
+ }
public override void OnPlay(double beat)
{
+ EntityPreCheck(beat);
OnGameSwitch(beat);
}
+ void UpdateCamera(double beat)
+ {
+ if (beat >= cameraRotateBeat)
+ {
+ Util.EasingFunction.Function func = Util.EasingFunction.GetEasingFunction(cameraRotateEase);
+ float rotProg = Conductor.instance.GetPositionFromBeat(cameraRotateBeat, cameraRotateLength, true);
+ rotProg = Mathf.Clamp01(rotProg);
+ float rot = func(cameraRotateLast, cameraRotateNext, rotProg);
+ cameraPivot.rotation = Quaternion.Euler(0, rot, 0);
+ cameraPivot.localScale = Vector3.one * func(cameraScaleLast, cameraScaleNext, rotProg);
+ }
+
+ GameCamera.AdditionalPosition = cameraPos.position + (Quaternion.Euler(cameraPos.rotation.eulerAngles) * Vector3.forward * 10f);
+ GameCamera.AdditionalRotEuler = cameraPos.rotation.eulerAngles;
+ GameCamera.AdditionalFoV = cameraFOV;
+ }
+
+
public void Update()
{
@@ -262,8 +334,12 @@ namespace HeavenStudio.Games
}
}
+ UpdateCamera(currentBeat);
+
}
+
+
public void ForceCharge()
{
CPU1.DoScaledAnimationAsync("charge", 1f, 0, 1);
@@ -293,6 +369,24 @@ namespace HeavenStudio.Games
}
+ public void ChangeCamera(double beat, float rotation, float camZoom, double length, Util.EasingFunction.Ease ease, bool additive = true)
+ {
+ cameraRotateBeat = beat;
+ cameraRotateLength = length;
+ cameraRotateEase = ease;
+ cameraRotateLast = cameraRotateNext % 360f;
+ cameraScaleLast = cameraScaleNext;
+ cameraScaleNext = camZoom;
+ if (additive)
+ {
+ cameraRotateNext = cameraRotateLast + rotation;
+ }
+ else
+ {
+ cameraRotateNext = rotation;
+ }
+ }
+
public void BopToggle(double beat, float length, bool boarders, bool autoBop)
{
diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs
index 2f2d07a8b..286538f7d 100644
--- a/Assets/Scripts/Games/Airboarder/Arch.cs
+++ b/Assets/Scripts/Games/Airboarder/Arch.cs
@@ -35,6 +35,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
private void Awake()
{
game = Airboarder.instance;
+
// archBasic.transform.position = new Vector3(-140, -1, 0.8f);
}
@@ -143,7 +144,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
public void DuckMiss(PlayerActionEvent caller)
{
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
- anim.DoScaledAnimationAsync("break", 1f, 0f, animLayer:1);
+ anim.DoScaledAnimationAsync("break", 1f, 0, animLayer:1);
double beat = caller.startBeat + caller.timer;
game.MissSound(beat);
BeatAction.New(this, new() {
@@ -178,7 +179,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder
public void CrouchMiss(PlayerActionEvent caller){
game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1);
- anim.DoScaledAnimationAsync("break", 1f, 0f, animLayer:1);
+ anim.DoScaledAnimationAsync("break", 1f, 0, animLayer:1);
double beat = caller.startBeat + caller.timer;
game.MissSound(beat);
BeatAction.New(this, new() {