diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab index d31794044..d3b9ba3ce 100644 --- a/Assets/Resources/Games/airboarder.prefab +++ b/Assets/Resources/Games/airboarder.prefab @@ -29,7 +29,6 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 4214217034035880541} - - {fileID: 8303252332203352562} m_Father: {fileID: 6788947284919293199} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -236,6 +235,38 @@ MonoBehaviour: startBeat: 0 switchBeat: 0 startFloor: 1 +--- !u!1 &3550516441994710030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4522032203519345872} + m_Layer: 0 + m_Name: WallFinePosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4522032203519345872 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3550516441994710030} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.25, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7560210517393434621} + m_Father: {fileID: 9145231469005479427} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4293746314319839782 GameObject: m_ObjectHideFlags: 0 @@ -481,6 +512,38 @@ Transform: m_Father: {fileID: 4475688631540571435} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6487284518632088781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8940920552412959252} + m_Layer: 0 + m_Name: ArchFinePosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8940920552412959252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6487284518632088781} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.25, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8644837133873799696} + m_Father: {fileID: 9145231469005479427} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6707612264994879636 GameObject: m_ObjectHideFlags: 0 @@ -576,8 +639,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6843636135936194274} - - {fileID: 8644837133873799696} - - {fileID: 7560210517393434621} + - {fileID: 4522032203519345872} + - {fileID: 8940920552412959252} m_Father: {fileID: 4475688631540571435} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -708,6 +771,18 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Materials.Array.size value: 3 @@ -905,75 +980,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1001 &1668676186462176245 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8303252332203352562} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalPosition.y - value: -0.12500003 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} - propertyPath: m_Name - value: airboy_shadow_model - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} --- !u!1001 &2267938930607798607 PrefabInstance: m_ObjectHideFlags: 0 @@ -1068,6 +1074,63 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ff59f8d97b493cd48be0648a02466412, type: 3} m_PrefabInstance: {fileID: 2267938930607798607} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2877353907410208422 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 305587567084456861} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.43 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 270 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} + propertyPath: m_Name + value: airboy_shadow_model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 94df92b5e5343dd40b32bcc24267b22b, type: 3} --- !u!1001 &4463438238432265654 PrefabInstance: m_ObjectHideFlags: 0 @@ -1123,6 +1186,10 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Name value: neo_airboy @@ -1219,6 +1286,10 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: -8679921383154817045, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + - target: {fileID: -4422346733805593034, guid: 333100bf553a5924d870acafacb4f53a, type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 333100bf553a5924d870acafacb4f53a, type: 3} propertyPath: m_Name value: neo_airboy @@ -1623,11 +1694,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_LocalPosition.y - value: 51.154 + value: 47.1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_LocalPosition.z - value: -37.6 + value: -29.8 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0fda9d12bd084a047aa0dd724e70fc36, type: 3} propertyPath: m_LocalRotation.w @@ -1703,27 +1774,27 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9145231469005479427} + m_TransformParent: {fileID: 4522032203519345872} m_Modifications: - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalScale.x - value: 0.79999995 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 0.8999999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 0.8999999 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalPosition.x - value: -139.99998 + value: -140.99988 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cdd45697068de0942941fd70c7b8b9a2, type: 3} propertyPath: m_LocalPosition.y @@ -1837,31 +1908,31 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9145231469005479427} + m_TransformParent: {fileID: 8940920552412959252} m_Modifications: - target: {fileID: -8766383658213384184, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -37.06499 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalScale.x - value: 0.8 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalScale.y - value: 0.8 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalScale.z - value: 0.8 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalPosition.x - value: -140 + value: -139.99998 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalPosition.y @@ -1869,7 +1940,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalPosition.z - value: 0.8 + value: 0.7999998 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalRotation.w @@ -1877,7 +1948,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalRotation.y @@ -1905,20 +1976,24 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0.000019719326 + value: 0 objectReference: {fileID: 0} - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 108.56061 + value: 20.256481 objectReference: {fileID: 0} - target: {fileID: -7958247470785735037, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.0000039188253 + value: 0 objectReference: {fileID: 0} - target: {fileID: -5147326476637436832, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 38.98263 + value: 30.607336 objectReference: {fileID: 0} + - target: {fileID: -1678005120720012587, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 35ed2295779a9214993f4719b9fa7912, type: 2} - target: {fileID: -159968170859025008, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1941,15 +2016,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 4.942557e-19 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -89.54185 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2655114101700337920, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 6.4470497e-17 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2978568521074353718, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1965,27 +2040,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 61.645573 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -149.63603 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6542873122286168406, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -173.87607 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 16.019001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -52.4238 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6570937167159203763, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 133.77698 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7505648016901801114, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1993,51 +2068,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -2.194736 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -87.9102 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7688517518177890494, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -157.34372 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -86.767265 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -35.31678 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7980539796491867384, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0.11429839 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 25.823307 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -72.77457 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8369734185194120076, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -102.184746 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -0.82829905 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 125.46006 + value: 27.630806 objectReference: {fileID: 0} - target: {fileID: 8373497436259496942, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -4.3181586 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49f7ce11d95b7954a8b997bfb1effb51, type: 3} @@ -2090,89 +2165,3 @@ MonoBehaviour: normalizedStart: 0 cueStart: 0 anim: {fileID: 8289865541076859572} ---- !u!1001 &8408692734140302873 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4282064293073332267} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalScale.x - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalScale.y - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalScale.z - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalPosition.x - value: -0.97 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalPosition.y - value: -0.9 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 270 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_Name - value: airboy_model (2) - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1887855735402411857, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - propertyPath: m_LocalPosition.y - value: 0.1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} ---- !u!4 &8303252332203352562 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bad7ac774d6d2d74ea0716633b8cee42, type: 3} - m_PrefabInstance: {fileID: 8408692734140302873} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller index 1d478ac35..793549f25 100644 --- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller +++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/arch.controller @@ -26,32 +26,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &-5823513995563224045 -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: -846839717617555184} - m_Position: {x: 320, y: 20, z: 0} - - serializedVersion: 1 - m_State: {fileID: -2970421746828851933} - m_Position: {x: 360, y: 90, 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: -2970421746828851933} ---- !u!1102 &-2970421746828851933 +--- !u!1102 &-2205100406500097306 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -77,7 +52,66 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-846839717617555184 +--- !u!1107 &-1793289606080654395 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: movement + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 817453574679570227} + m_Position: {x: 260, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2205100406500097306} + m_Position: {x: 267.75577, y: 160.53676, 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: -2205100406500097306} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: arch + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - 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: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: movement + m_StateMachine: {fileID: -1793289606080654395} + 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!1102 &817453574679570227 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -103,40 +137,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: arch - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -5823513995563224045} - 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: 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 @@ -149,12 +149,12 @@ AnimatorStateMachine: - 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} + - serializedVersion: 1 + m_State: {fileID: 5773130082680349530} + m_Position: {x: 282.9432, y: 34.36415, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -164,8 +164,8 @@ 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: 4955128078807161858} ---- !u!1102 &4955128078807161858 + m_DefaultState: {fileID: 5773130082680349530} +--- !u!1102 &5773130082680349530 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim b/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim index 83e867279..d6d2bb0cf 100644 --- a/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim +++ b/Assets/Resources/Models/Games/Airboarder/Animations/arch/idle.anim @@ -27,15 +27,6 @@ AnimationClip: 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: -139.7999, y: -1, z: 0.7399999} - 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 @@ -63,12 +54,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -91,15 +82,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: -139.7999 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -119,15 +101,6 @@ AnimationClip: 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 @@ -147,15 +120,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0.7399999 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 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/idle.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim index c713dbb0d..9bf454ba6 100644 --- a/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim +++ b/Assets/Resources/Models/Games/Airboarder/Animations/wall/idle.anim @@ -59,7 +59,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim b/Assets/Resources/Models/Games/Airboarder/Animations/wall/move.anim index f93fa599f..05ec916f9 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: 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 @@ -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 @@ -68,7 +112,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -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: 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: 1 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.png.meta index 7842f5b27..1d807f592 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.png.meta +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_board.png.meta @@ -36,9 +36,9 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 2 - wrapV: 2 - wrapW: 2 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_shadow.mat b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_shadow.mat index 8ef094eeb..59b1b994f 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_shadow.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_shadow.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: airboy_shadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -42,7 +42,7 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 686955983c8271b40bfbe5a47db451d7, type: 3} - m_Scale: {x: 128, y: 64} + m_Scale: {x: 0, y: 0} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat index 0b0dd45f4..a81409cdb 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/block_shadow.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: block_shadow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat b/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat index b8dd96157..0bf9082fc 100644 --- a/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat +++ b/Assets/Resources/Models/Games/Airboarder/Materials/dog_shadow.mat @@ -8,9 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: dog_shadow - m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] - m_InvalidKeywords: [] + m_InvalidKeywords: + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -73,7 +74,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 88d0e5d73..42f4f768d 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -8906,7 +8906,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 14 + m_fontSize: 0 m_fontSizeBase: 14.3 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -14029,7 +14029,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 171581557} m_HandleRect: {fileID: 171581556} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -26850,7 +26850,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -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: 119.63262} + m_AnchoredPosition: {x: 0, y: 66.89796} 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.0000005 - m_Size: 0.5929562 + m_Value: 1.0000002 + m_Size: 0.15601167 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs index a6550d9bf..f21925c5e 100644 --- a/Assets/Scripts/Games/Airboarder/Airboarder.cs +++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs @@ -74,6 +74,13 @@ namespace HeavenStudio.Games.Loaders } }, + new GameAction("forceCharge", "Force Charge") + { + function = delegate {Airboarder.instance.ForceCharge(); }, + defaultLength = 0.5f, + resizable = false, + }, + new GameAction("letsGo", "YEAAAAAH LET'S GO") { @@ -140,13 +147,15 @@ namespace HeavenStudio.Games private void Awake() { instance = this; - SetupBopRegion("airboarder", "bop", "auto"); + SetupBopRegion("airboarder", "bop", "auto"); + wantsCrouch = false; } public override void OnGameSwitch(double beat) { List actions = new() {}; + wantsCrouch = false; double switchBeat = beat; double startBeat = double.MaxValue; @@ -156,56 +165,37 @@ namespace HeavenStudio.Games //find when the next game switch/remix end happens var nextGameSwitches = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame" }).FindAll(x => x.beat > beat && x.datamodel != "gameManager/switchGame/airboarder"); double nextGameSwitchBeat = double.MaxValue; + + //lists arch and wall events + List blockEvents = gameManager.Beatmap.Entities.FindAll(e => e.datamodel is "airboarder/duck" or "airboarder/crouch" or "airboarder/jump" && e.beat >= beat && e.beat < endBeat); + + foreach (var e in entities.FindAll(e => e.beat >= beat && e.beat < endBeat && e.datamodel is "airboarder/duck" or "airboarder/crouch" or "airboarder/jump")) + { + switch (e.datamodel) { + case "airboarder/duck": + // do the stuff + RequestArch(e.beat-25); + archBasic.CueDuck(e.beat); + break; + case "airboarder/crouch": + // do the stuff + RequestArch(e.beat-25); + archBasic.CueCrouch(e.beat); + break; + case "airboarder/jump": + RequestWall(e.beat-25); + wallBasic.CueJump(e.beat); + break; + } + } - 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) @@ -213,23 +203,6 @@ namespace HeavenStudio.Games OnGameSwitch(beat); } - private List GetAllArches(double beat, double endBeat) - { - //lists arch and wall events - 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() { @@ -241,7 +214,7 @@ namespace HeavenStudio.Games Floor.Play("moving", 0, normalizedBeat); Floor.speed = 0; Dog.Play("run", 0, normalizedBeat*5); - Tail.Play("wag",0,normalizedBeat*5); + Tail.Play("wag",0,normalizedBeat/(3/5)); CPU1.Play("hover",0,normalizedBeat); CPU2.Play("hover",0,normalizedBeat); Player.Play("hover",0,normalizedBeat); @@ -269,6 +242,17 @@ namespace HeavenStudio.Games } + public void ForceCharge() + { + CPU1.DoScaledAnimationAsync("charge", 1f, 0, 1); + CPU2.DoScaledAnimationAsync("charge", 1f, 0, 1); + Player.DoScaledAnimationAsync("charge", 1f, 0, 1); + cpu1CantBop = true; + cpu2CantBop = true; + playerCantBop = true; + wantsCrouch = true; + } + public override void OnBeatPulse(double beat) { if (goBop) @@ -335,6 +319,29 @@ namespace HeavenStudio.Games ); } + public void MissSound(double beat) + { + MultiSound.Play(new MultiSound.Sound[] + { + new MultiSound.Sound("airboarder/miss1", beat), + new MultiSound.Sound("airboarder/missvox", beat), + new MultiSound.Sound("airboarder/miss2", beat + 0.25f), + new MultiSound.Sound("airboarder/miss3", beat + 0.75f), + new MultiSound.Sound("airboarder/miss4", beat + 0.875f), + new MultiSound.Sound("airboarder/miss5", beat + 1f), + new MultiSound.Sound("airboarder/miss6", beat + 1.125f), + new MultiSound.Sound("airboarder/miss7", beat + 1.25f), + new MultiSound.Sound("airboarder/miss8", beat + 1.5f), + new MultiSound.Sound("airboarder/miss9", beat + 1.75f), + new MultiSound.Sound("airboarder/miss10", beat + 2f), + new MultiSound.Sound("airboarder/miss11", beat + 2.25f), + new MultiSound.Sound("airboarder/miss12", beat + 2.5f), + new MultiSound.Sound("airboarder/miss13", beat + 2.75f), + new MultiSound.Sound("airboarder/miss14", beat + 3f), + new MultiSound.Sound("airboarder/miss15", beat + 3.25f) + }); + } + public void RequestArch(double beat) { Arch newArch = Instantiate(archBasic, transform); diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs index b056f6818..c5326ff15 100644 --- a/Assets/Scripts/Games/Airboarder/Arch.cs +++ b/Assets/Scripts/Games/Airboarder/Arch.cs @@ -95,7 +95,8 @@ namespace HeavenStudio.Games.Scripts_Airboarder var currentBeat = cond.songPositionInBeatsAsDouble; float normalizedStart = Conductor.instance.GetPositionFromBeat(appearBeat, 40f); float horizArch = (5*normalizedStart) - 140; - anim.GetComponent().DoNormalizedAnimation("move", normalizedStart, 0); +// gameObject.transform.position = new Vector3(horizArch, -1, 0.8f); + anim.GetComponent().DoNormalizedAnimation("move", normalizedStart, 1); if (normalizedStart > 1) Destroy(gameObject); } @@ -112,7 +113,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void DuckMiss(PlayerActionEvent caller) { game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f, 0, 1); - anim.DoScaledAnimationAsync("shake", 1f, 0, 1); + anim.DoScaledAnimationAsync("shake", 1f, 0, 0); double beat = caller.startBeat + caller.timer; BeatAction.New(this, new() { new(beat+1.5f, ()=>game.playerCantBop = false)}); @@ -122,8 +123,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void DuckEmpty(PlayerActionEvent caller) { game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); - anim.DoScaledAnimationAsync("break", 1f, 0, 1); + anim.DoScaledAnimationAsync("break", 1f, 0, 0); double beat = caller.startBeat + caller.timer; + game.MissSound(beat); BeatAction.New(this, new() { new(beat+1.5f, ()=>game.playerCantBop = false)}); @@ -139,12 +141,14 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void CrouchMiss(PlayerActionEvent caller){ game.Player.GetComponent().DoScaledAnimationAsync("hit1",1f, 0, 1); - anim.DoScaledAnimationAsync("shake", 1f, 0, 1); + anim.DoScaledAnimationAsync("shake", 1f, 0, 0); } public void CrouchEmpty(PlayerActionEvent caller){ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); - anim.DoScaledAnimationAsync("break", 1f, 0, 1); + anim.DoScaledAnimationAsync("break", 1f, 0, 0); + double beat = caller.startBeat + caller.timer; + game.MissSound(beat); } diff --git a/Assets/Scripts/Games/Airboarder/Wall.cs b/Assets/Scripts/Games/Airboarder/Wall.cs index f70f53582..0318c4e1b 100644 --- a/Assets/Scripts/Games/Airboarder/Wall.cs +++ b/Assets/Scripts/Games/Airboarder/Wall.cs @@ -46,13 +46,14 @@ namespace HeavenStudio.Games.Scripts_Airboarder 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 {game.cpu1CantBop = false;} ), new BeatAction.Action(jumpBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/jump");}), new BeatAction.Action(jumpBeat + 2, delegate {SoundByte.PlayOneShotGame("airboarder/jumpvox");}), + new BeatAction.Action(jumpBeat+3, delegate {game.cpu2CantBop = false;} ), }); } @@ -94,6 +95,7 @@ namespace HeavenStudio.Games.Scripts_Airboarder public void JumpEmpty(PlayerActionEvent caller){ game.Player.GetComponent().DoScaledAnimationAsync("hit2", 1f, 0, 1); double beat = caller.startBeat + caller.timer; + game.MissSound(beat); BeatAction.New(this, new() { new(beat+1.5f, ()=>game.playerCantBop = false)}); game.wantsCrouch = false;