From 414fd4303647ca32831e97def2a7c4a7a272ab41 Mon Sep 17 00:00:00 2001 From: ev <85412919+iloveoatmeal2022@users.noreply.github.com> Date: Sat, 9 Mar 2024 22:36:41 -0500 Subject: [PATCH] Built to Scale New Models + Lighting (#773) * Yay * fix the weird material hardcoding * done --------- Co-authored-by: minenice55 --- Assets/Resources/Games/builtToScaleDS.prefab | 424 +++++++++++++----- .../Animations/Elevator.controller | 6 +- .../Animations/FlyingRod.controller | 2 +- .../Animations/MissParts.controller | 2 +- .../Animations/MovingBlocks.controller | 2 +- .../BuiltToScaleDS/Animations/PartsHit.anim | 34 +- .../Animations/Shooter.controller | 8 +- .../BuiltToScaleDS/ElevatorWithRod.fbx.meta | 89 +++- .../Games/BuiltToScaleDS/FlyingRod.fbx.meta | 41 +- .../Games/BuiltToScaleDS/HitParts.fbx.meta | 31 +- .../BuiltToScaleDS/Materials/Divider.mat | 8 +- .../Materials/Effects/Impact.mat | 15 +- .../Materials/Effects/ImpactFaded.mat | 15 +- .../Games/BuiltToScaleDS/Materials/Object.mat | 9 +- .../BuiltToScaleDS/Materials/Shooter.mat | 16 +- .../BuiltToScaleDS/Materials/World/Bridge.mat | 20 +- .../Materials/World/GapShadow.mat | 8 +- .../BuiltToScaleDS/Materials/World/Grid.mat | 12 +- .../Materials/World/GridPlane.mat | 10 +- .../Materials/World/Lights 1.mat | 10 +- .../Materials/World/Lights 2.mat | 10 +- .../Materials/World/Lights 3.mat | 10 +- .../Materials/World/Lights 4.mat | 18 +- .../BuiltToScaleDS/Materials/World/Lights.mat | 10 +- .../BuiltToScaleDS/Materials/World/Line.mat | 16 +- .../Games/BuiltToScaleDS/MissParts.fbx.meta | 31 +- .../BuiltToScaleDS/MovingBlocks.fbx.meta | 31 +- .../Games/BuiltToScaleDS/Shooter.fbx.meta | 91 +++- .../Games/BuiltToScaleDS/BuiltToScaleDS.cs | 110 +++-- 29 files changed, 836 insertions(+), 253 deletions(-) diff --git a/Assets/Resources/Games/builtToScaleDS.prefab b/Assets/Resources/Games/builtToScaleDS.prefab index 844401fe..1ce30ea9 100644 --- a/Assets/Resources/Games/builtToScaleDS.prefab +++ b/Assets/Resources/Games/builtToScaleDS.prefab @@ -28,8 +28,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 9192953979162497955} - {fileID: 8319323761679134309} + - {fileID: 794646928585569113} m_Father: {fileID: 3337760827311893485} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -359,7 +359,7 @@ Transform: - {fileID: 842141362349511046} - {fileID: 835389391171181030} m_Father: {fileID: 4631944531018638297} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2589862644963098560 GameObject: @@ -402,6 +402,100 @@ Transform: m_Father: {fileID: 1557051792312115487} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2594221142956942938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 794646928585569113} + - component: {fileID: 8980473610542090131} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &794646928585569113 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2594221142956942938} + m_LocalRotation: {x: 0.8329767, y: -0.2017449, z: -0.1333785, w: 0.4976535} + m_LocalPosition: {x: 0.251, y: 3.843, z: -0.689} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4631944531018638297} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50.828, y: -137.958, z: -132.076} +--- !u!108 &8980473610542090131 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2594221142956942938} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1.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: 2 + 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 &3090516112524541089 GameObject: m_ObjectHideFlags: 0 @@ -1464,9 +1558,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - EligibleHits: [] scheduledInputs: [] - firstEnable: 0 camPos: {fileID: 90712470157425058} cameraFoV: 13 environmentRenderer: {fileID: 3593377758750892331} @@ -1482,102 +1574,16 @@ MonoBehaviour: shooterMaterial: {fileID: 2100000, guid: 97aebf98db2a0bb4a974fbbbbf03fda8, type: 2} objectMaterial: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} gridPlaneMaterial: {fileID: 2100000, guid: 3df450e97190f504d9ac4f14283b2e0a, type: 2} - elevatorMaterial: {fileID: 0} + elevatorMaterial: {fileID: 2100000, guid: f8523e095c9f2194d8ae47687a42305a, type: 2} + beltMaterial: {fileID: 2100000, guid: eafa15cb3393da547b21d564d4e71546, type: 2} + firstPatternLights: + - {fileID: 2100000, guid: da6d7e38b05966f40b51e566d6b339a8, type: 2} + - {fileID: 2100000, guid: 19e1f16b6cfe97b44abbebd8638abba7, type: 2} + - {fileID: 2100000, guid: 9dd5968860c25854c81d2bab1f5413d6, type: 2} + secondPatternLights: + - {fileID: 2100000, guid: 30ee7eac2a3457f469ba20a22c6dede1, type: 2} + - {fileID: 2100000, guid: bb162603bc9317b4c99d15b50be9b8ff, type: 2} beltSpeed: 4.33 ---- !u!1 &8373923870426321472 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9192953979162497955} - - component: {fileID: 5275571480854674939} - m_Layer: 0 - m_Name: Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9192953979162497955 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8373923870426321472} - m_LocalRotation: {x: 0.83511287, y: 0.16274606, z: -0.33740744, w: 0.4028107} - m_LocalPosition: {x: 0, y: 5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4631944531018638297} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 128.5, y: 44, z: 0} ---- !u!108 &5275571480854674939 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8373923870426321472} - 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: 1 - 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: 1 - 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 &8451088964468361308 GameObject: m_ObjectHideFlags: 0 @@ -1826,6 +1832,10 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -5864696771290800692, guid: 21a743717f79155429b45d3a0fd77c68, type: 3} + propertyPath: m_LocalPosition.x + value: 138 + objectReference: {fileID: 0} - target: {fileID: -4863704078625465896, guid: 21a743717f79155429b45d3a0fd77c68, type: 3} propertyPath: m_Layer value: 0 @@ -2123,7 +2133,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -947387224812249842, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000036424658 + value: 0.0000033637534 objectReference: {fileID: 0} - target: {fileID: -944302891571569470, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_Layer @@ -2137,9 +2147,21 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_LocalPosition.x + value: -0.000000017798401 + objectReference: {fileID: 0} + - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5258911 + objectReference: {fileID: 0} + - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} + propertyPath: m_LocalPosition.z + value: -0.117873535 + objectReference: {fileID: 0} - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0.0000036424663 + value: 0.0000033637539 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_Name @@ -2203,7 +2225,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 7.016709e-15 + value: 1.7452948 objectReference: {fileID: 0} - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -2211,7 +2233,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: -180 + value: -0.000015258789 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3} @@ -2323,6 +2345,18 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 1.019213e-22 + objectReference: {fileID: 0} + - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1.390904e-12 + objectReference: {fileID: 0} + - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -2.2417196e-20 + objectReference: {fileID: 0} - target: {fileID: -3203485738917446855, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_Layer value: 0 @@ -2330,7 +2364,7 @@ PrefabInstance: - target: {fileID: -1003055794911221338, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} + objectReference: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} - target: {fileID: -1003055794911221338, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_Materials.Array.data[1] value: @@ -2351,6 +2385,34 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2043205891256864238, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98021 + objectReference: {fileID: 0} + - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.000015258788 + objectReference: {fileID: 0} + - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -179.99998 + objectReference: {fileID: 0} + - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -4.0711103e-13 + objectReference: {fileID: 0} + - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8.1422206e-13 + objectReference: {fileID: 0} + - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 3.546283e-20 + objectReference: {fileID: 0} - target: {fileID: 7226848437003788013, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} propertyPath: m_Layer value: 0 @@ -2461,6 +2523,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7969190219602097434, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.000000091862304 + objectReference: {fileID: 0} + - target: {fileID: -7969190219602097434, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -2.1839556e-16 + objectReference: {fileID: 0} + - target: {fileID: -7969190219602097434, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -5.132258e-14 + objectReference: {fileID: 0} - target: {fileID: -7204237955642933900, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} propertyPath: m_Layer value: 0 @@ -2473,6 +2547,14 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -1869871334352211690, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 89.98021 + objectReference: {fileID: 0} + - target: {fileID: -1869871334352211690, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0000008680054 + objectReference: {fileID: 0} - target: {fileID: -685714951338797429, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} propertyPath: m_Layer value: 0 @@ -2489,6 +2571,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2728175015023002165, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98021 + objectReference: {fileID: 0} - target: {fileID: 3394299690235127225, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} propertyPath: m_Layer value: 0 @@ -2509,6 +2595,30 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} + - target: {fileID: 4798639761827837329, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.00000006127327 + objectReference: {fileID: 0} + - target: {fileID: 4798639761827837329, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -4.0691905e-13 + objectReference: {fileID: 0} + - target: {fileID: 4798639761827837329, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -5.9031007e-16 + objectReference: {fileID: 0} + - target: {fileID: 5219957376676899290, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.000007851365 + objectReference: {fileID: 0} + - target: {fileID: 5219957376676899290, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0000009891345 + objectReference: {fileID: 0} + - target: {fileID: 5219957376676899290, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -45.771156 + objectReference: {fileID: 0} - target: {fileID: 5833730649146179553, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} propertyPath: m_Layer value: 0 @@ -2517,6 +2627,18 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 8667595228939439361, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.0000042472684 + objectReference: {fileID: 0} + - target: {fileID: 8667595228939439361, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0000013062643 + objectReference: {fileID: 0} + - target: {fileID: 8667595228939439361, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -38.218197 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} --- !u!4 &5903939180778773926 stripped @@ -2829,10 +2951,14 @@ PrefabInstance: propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 3783149753680359203, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + propertyPath: m_Materials.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3783149753680359203, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} + objectReference: {fileID: 2100000, guid: f8523e095c9f2194d8ae47687a42305a, type: 2} - target: {fileID: 3783149753680359203, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} propertyPath: m_Materials.Array.data[1] value: @@ -2967,14 +3093,62 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -6725864900740283272, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -89.98021 + objectReference: {fileID: 0} + - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.0000009932132 + objectReference: {fileID: 0} + - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -1.8263537e-20 + objectReference: {fileID: 0} + - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 7.2141267e-22 + objectReference: {fileID: 0} - target: {fileID: -3487895895819380211, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: -2623360714175404741, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 89.98021 + objectReference: {fileID: 0} + - target: {fileID: -2623360714175404741, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.0000008680054 + objectReference: {fileID: 0} + - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.0000034150944 + objectReference: {fileID: 0} + - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.00000047354183 + objectReference: {fileID: 0} + - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.0000031419652 + objectReference: {fileID: 0} - target: {fileID: -244648530497092133, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -47.373425 + objectReference: {fileID: 0} + - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 25.834826 + objectReference: {fileID: 0} + - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -33.344215 + objectReference: {fileID: 0} - target: {fileID: 308257133709792796, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Layer value: 0 @@ -3015,10 +3189,50 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} + - target: {fileID: 4518858451777631492, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2} + - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.000006518555 + objectReference: {fileID: 0} + - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.0000008680054 + objectReference: {fileID: 0} + - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -1.6191626e-15 + objectReference: {fileID: 0} - target: {fileID: 8813323920513627783, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} propertyPath: m_Layer value: 0 objectReference: {fileID: 0} + - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -0.0000004268868 + objectReference: {fileID: 0} + - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.00000066414475 + objectReference: {fileID: 0} + - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.0000018876924 + objectReference: {fileID: 0} + - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -19.721653 + objectReference: {fileID: 0} + - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 49.642414 + objectReference: {fileID: 0} + - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -73.99892 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} --- !u!4 &8251119247562495620 stripped diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Elevator.controller b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Elevator.controller index 37010418..39c67b35 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Elevator.controller +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Elevator.controller @@ -20,7 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -5988718474069186256, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + m_Motion: {fileID: 3800077309258468399, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -46,7 +46,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -6767608362192247663, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + m_Motion: {fileID: -3344633985405764014, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -94,7 +94,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 888322792775095555, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} + m_Motion: {fileID: 6125961371069380270, guid: 266571bf0a87816428e18a51e3c57d0f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/FlyingRod.controller b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/FlyingRod.controller index c1f40793..cf89674c 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/FlyingRod.controller +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/FlyingRod.controller @@ -64,7 +64,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1800392339729405328, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} + m_Motion: {fileID: 2465399158856133786, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MissParts.controller b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MissParts.controller index 274476d3..951fb302 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MissParts.controller +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MissParts.controller @@ -20,7 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 3977097287908140603, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} + m_Motion: {fileID: 9130175970626193648, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MovingBlocks.controller b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MovingBlocks.controller index 2876ab7b..916251d5 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MovingBlocks.controller +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/MovingBlocks.controller @@ -64,7 +64,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -7095431843126280680, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} + m_Motion: {fileID: 5263545620203285798, guid: e6239db4d6763504fa0e5ad6ce9761b7, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim index fb165136..75f64637 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim @@ -767,12 +767,12 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} + value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} - time: 0.041666668 - value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} - time: 0.083333336 value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} - - time: 0.125 + - time: 0.16666667 value: {fileID: 2100000, guid: c2dcdccce937af54aab2ffb52ce8b7e4, type: 2} - time: 7.5416665 value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} @@ -780,6 +780,19 @@ AnimationClip: path: parts_ok.001 classID: 137 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} + - time: 0.083333336 + value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + - time: 0.125 + value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + - time: 0.16666667 + value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} + attribute: m_Materials.Array.data[3] + path: parts_ok.001 + classID: 137 + script: {fileID: 0} m_SampleRate: 24 m_WrapMode: 0 m_Bounds: @@ -843,6 +856,13 @@ AnimationClip: typeID: 137 customType: 21 isPPtrCurve: 1 + - serializedVersion: 2 + path: 2603234997 + attribute: 3 + script: {fileID: 0} + typeID: 137 + customType: 21 + isPPtrCurve: 1 - serializedVersion: 2 path: 2288273962 attribute: 1 @@ -900,11 +920,15 @@ AnimationClip: customType: 0 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} - - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} + - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} - {fileID: 2100000, guid: c2dcdccce937af54aab2ffb52ce8b7e4, type: 2} - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} + - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2} + - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2} + - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Shooter.controller b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Shooter.controller index e85d7c65..845cacb4 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Shooter.controller +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/Shooter.controller @@ -20,7 +20,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -7723785180693003703, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} + m_Motion: {fileID: 3178102532616702734, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -46,7 +46,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 241429122767823071, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} + m_Motion: {fileID: -1408222738841483094, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -72,7 +72,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 241429122767823071, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} + m_Motion: {fileID: -1408222738841483094, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -98,7 +98,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -8998818034351126502, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} + m_Motion: {fileID: -1871232912940249434, guid: 26c46c4ecd6e69145a6e971ac2cf6dcf, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/ElevatorWithRod.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/ElevatorWithRod.fbx.meta index 24787478..b1ad1006 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/ElevatorWithRod.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/ElevatorWithRod.fbx.meta @@ -40,7 +40,94 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: elevator_down + takeName: elevator|elevator|elevator|elevator_down_elevator|elevator|elevator_down + internalID: 3800077309258468399 + firstFrame: 0 + lastFrame: 36 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: elevator_up + takeName: elevator|elevator|elevator|elevator_up_elevator|elevator|elevator_up_ele + internalID: 6125961371069380270 + firstFrame: 0 + lastFrame: 40 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: elevator_wait + takeName: elevator|elevator|elevator|elevator_wait_elevator|elevator|elevator_wait + internalID: -3344633985405764014 + firstFrame: 0 + lastFrame: 1 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/FlyingRod.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/FlyingRod.fbx.meta index 5567fb9b..5e764e05 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/FlyingRod.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/FlyingRod.fbx.meta @@ -18,7 +18,7 @@ ModelImporter: resampleCurves: 1 optimizeGameObjects: 0 removeConstantScaleCurves: 0 - motionNodeName: + motionNodeName: rigImportErrors: rigImportWarnings: animationImportErrors: @@ -27,14 +27,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: parts_airshot + takeName: parts_airshot|parts_airshot|parts_airshot|parts_airshot_parts_airshot|parts_a + internalID: 2465399158856133786 + firstFrame: 0 + lastFrame: 40 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -59,7 +88,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 - optimizeBones: 1 + optimizeBones: 0 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -92,7 +121,7 @@ ModelImporter: legStretch: 0.05 feetSpacing: 0 globalScale: 1 - rootMotionBoneName: + rootMotionBoneName: parts_airshot.001 hasTranslationDoF: 0 hasExtraRoot: 0 skeletonHasParents: 1 @@ -100,7 +129,7 @@ ModelImporter: autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/HitParts.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/HitParts.fbx.meta index 912217ae..db3c12fa 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/HitParts.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/HitParts.fbx.meta @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: partsok + takeName: parts_ok|parts_ok|parts_ok|parts_ok_parts_ok|parts_ok|parts_ok_parts_ok + internalID: 4401626605303300418 + firstFrame: 0 + lastFrame: 180 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Divider.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Divider.mat index fd53ffb7..1c507da0 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Divider.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Divider.mat @@ -2,14 +2,15 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Divider m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -55,6 +56,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 @@ -73,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.509434, g: 0.509434, b: 0.509434, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat index 9f4b18ad..6e451e90 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat @@ -2,15 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Impact m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF - m_LightmapFlags: 4 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -42,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 772d88056ab3bf5408fc8d5a3387df8d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -77,6 +81,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -110,7 +115,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] --- !u!114 &1655112528312275563 diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat index 0b64406c..3c4b5ce5 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat @@ -2,15 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ImpactFaded m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF - m_LightmapFlags: 4 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -42,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 772d88056ab3bf5408fc8d5a3387df8d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -77,6 +81,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -110,7 +115,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] --- !u!114 &1655112528312275563 diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Object.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Object.mat index 55b1189b..024ad14a 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Object.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Object.mat @@ -8,11 +8,12 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Object - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: + - _EMISSION - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -102,7 +103,7 @@ Material: - _EnvironmentReflections: 1 - _FirstOutlineWidth: 0.02 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.621 - _GlossinessSource: 0 - _GlossyReflections: 0 - _IndirectLightMultiplier: 1 @@ -141,7 +142,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 1} - _EmissionMapChannelMask: {r: 1, g: 1, b: 1, a: 0} - _FirstOutlineColor: {r: 0, g: 0, b: 0, a: 0.5} - _IndirectLightMinColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Shooter.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Shooter.mat index 94b52f16..5f321223 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Shooter.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Shooter.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Shooter - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 4 + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -56,6 +57,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - _BumpScale: 1 @@ -63,7 +68,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.684 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 @@ -76,5 +81,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Bridge.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Bridge.mat index 2c9aa06e..06e7e64e 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Bridge.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Bridge.mat @@ -15,15 +15,18 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bridge - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -53,7 +56,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 657c2f9c15dce0541bcc21ff7c7ede1d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: @@ -88,6 +91,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -101,9 +105,10 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.807 - _GlossyReflections: 0 - _Metallic: 0 + - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 @@ -114,11 +119,12 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _Surface: 0 + - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.122641504, g: 0.122641504, b: 0.122641504, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GapShadow.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GapShadow.mat index db5b0cf6..33862c4b 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GapShadow.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GapShadow.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GapShadow m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -105,6 +108,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AdditionalLightIgnoreCelShade: 0.9 - _AlphaClip: 0 diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Grid.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Grid.mat index f2244349..dbceea58 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Grid.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Grid.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Grid - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -104,8 +108,8 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 + - _GlossMapScale: 0.305 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GridPlane.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GridPlane.mat index 2f5e1058..306e4add 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GridPlane.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/GridPlane.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GridPlane - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 1.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 1.mat index 65327de3..f49db703 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 1.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 1.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lights 1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 2.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 2.mat index f5d88e80..616e6fc8 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 2.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 2.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lights 2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 3.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 3.mat index b3aceb70..f72cad60 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 3.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 3.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lights 3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 4.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 4.mat index d1038355..78b61818 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 4.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights 4.mat @@ -15,14 +15,17 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lights 4 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF _RECEIVE_SHADOWS_OFF + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: + - _RECEIVE_SHADOWS_OFF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -76,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -88,6 +95,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -101,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -126,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights.mat index 712c9680..cf36ba99 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Lights.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Lights - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _GLOSSYREFLECTIONS_OFF m_InvalidKeywords: @@ -79,6 +79,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _TerrainHolesTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,7 +109,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.689 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -130,5 +134,5 @@ Material: - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + - _SpecColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Line.mat b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Line.mat index df126c28..5e9cbb81 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Line.mat +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/World/Line.mat @@ -15,15 +15,18 @@ MonoBehaviour: version: 4 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Line - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _GLOSSYREFLECTIONS_OFF - m_LightmapFlags: 4 + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -88,6 +91,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 @@ -101,7 +105,7 @@ Material: - _DstBlend: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - - _Glossiness: 0 + - _Glossiness: 0.711 - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 @@ -125,6 +129,6 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 0, b: 0, a: 1} - _Color: {r: 1, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0.084905684, g: 0.084905684, b: 0.084905684, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/MissParts.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/MissParts.fbx.meta index 22865628..f5acf4a7 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/MissParts.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/MissParts.fbx.meta @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: parts_ng + takeName: parts_ng|parts_ng|parts_ng|parts_ng_parts_ng|parts_ng|parts_ng_parts_ng + internalID: 9130175970626193648 + firstFrame: 0 + lastFrame: 200 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/MovingBlocks.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/MovingBlocks.fbx.meta index cfb0b58f..cad747da 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/MovingBlocks.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/MovingBlocks.fbx.meta @@ -34,7 +34,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: piece_LR + takeName: piece_LR|piece_LR|piece_LR|piece_LR_piece_LR|piece_LR|piece_LR_piece_LR + internalID: 5263545620203285798 + firstFrame: 0 + lastFrame: 80 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Resources/Models/Games/BuiltToScaleDS/Shooter.fbx.meta b/Assets/Resources/Models/Games/BuiltToScaleDS/Shooter.fbx.meta index ca72a2e1..aac78dd4 100644 --- a/Assets/Resources/Models/Games/BuiltToScaleDS/Shooter.fbx.meta +++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Shooter.fbx.meta @@ -33,14 +33,101 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: machine_shot_machine + takeName: machine|machine|machine|machine_shot_machine|machine|machine_shot_machi + internalID: 3178102532616702734 + firstFrame: 0 + lastFrame: 28 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: machine_touch_machine + takeName: machine|machine|machine|machine_touch_machine|machine|machine_touch_mac + internalID: -1408222738841483094 + firstFrame: 0 + lastFrame: 28 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: machine_wait_machine + takeName: machine|machine|machine|machine_wait_machine|machine|machine_wait_machi + internalID: -1871232912940249434 + firstFrame: 0 + lastFrame: 1 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index fa502a5a..09fcdd71 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -97,16 +97,14 @@ namespace HeavenStudio.Games [SerializeField] private Material shooterMaterial; [SerializeField] private Material objectMaterial; [SerializeField] private Material gridPlaneMaterial; - private Material elevatorMaterial; - private Material[] gridMaterials; - private Material[] firstPatternLights; - private Material[] secondPatternLights; - private Material[] elevatorObjectMats; + [SerializeField] private Material elevatorMaterial; + [SerializeField] private Material beltMaterial; + [SerializeField] private Material[] firstPatternLights; + [SerializeField] private Material[] secondPatternLights; [Header("Properties")] [SerializeField] float beltSpeed = 1f; - private Material beltMaterial; private Material[] environmentMaterials; private Material[] elevatorMaterials; private float currentBeltOffset; @@ -132,52 +130,52 @@ namespace HeavenStudio.Games GameCamera.AdditionalRotEuler = camPos.eulerAngles; GameCamera.AdditionalFoV = cameraFoV; - environmentMaterials = environmentRenderer.materials; - elevatorMaterials = elevatorRenderer.materials; - beltMaterial = Instantiate(environmentMaterials[8]); - environmentMaterials[8] = beltMaterial; - elevatorObjectMats = new Material[] - { - Instantiate(elevatorMaterials[0]), - Instantiate(elevatorMaterials[1]), - Instantiate(elevatorMaterials[2]), - }; - elevatorMaterials[0] = elevatorObjectMats[0]; - elevatorMaterials[1] = elevatorObjectMats[1]; - elevatorMaterials[2] = elevatorObjectMats[2]; - elevatorMaterial = Instantiate(elevatorMaterials[3]); - elevatorMaterials[3] = elevatorMaterial; - gridMaterials = new Material[] - { - Instantiate(environmentMaterials[9]), - Instantiate(environmentMaterials[11]), - Instantiate(environmentMaterials[12]), - Instantiate(environmentMaterials[13]), - Instantiate(environmentMaterials[14]), - }; - environmentMaterials[9] = gridMaterials[0]; - environmentMaterials[11] = gridMaterials[1]; - environmentMaterials[12] = gridMaterials[2]; - environmentMaterials[13] = gridMaterials[3]; - environmentMaterials[14] = gridMaterials[4]; + // environmentMaterials = environmentRenderer.materials; + // elevatorMaterials = elevatorRenderer.materials; + // beltMaterial = Instantiate(environmentMaterials[8]); + // environmentMaterials[8] = beltMaterial; + // elevatorObjectMats = new Material[] + // { + // Instantiate(elevatorMaterials[0]), + // Instantiate(elevatorMaterials[1]), + // Instantiate(elevatorMaterials[2]), + // }; + // elevatorMaterials[0] = elevatorObjectMats[0]; + // elevatorMaterials[1] = elevatorObjectMats[1]; + // elevatorMaterials[2] = elevatorObjectMats[2]; + // elevatorMaterial = Instantiate(elevatorMaterials[3]); + // elevatorMaterials[3] = elevatorMaterial; + // gridMaterials = new Material[] + // { + // Instantiate(environmentMaterials[9]), + // Instantiate(environmentMaterials[11]), + // Instantiate(environmentMaterials[12]), + // Instantiate(environmentMaterials[13]), + // Instantiate(environmentMaterials[14]), + // }; + // environmentMaterials[9] = gridMaterials[0]; + // environmentMaterials[11] = gridMaterials[1]; + // environmentMaterials[12] = gridMaterials[2]; + // environmentMaterials[13] = gridMaterials[3]; + // environmentMaterials[14] = gridMaterials[4]; - firstPatternLights = new Material[] - { - Instantiate(environmentMaterials[1]), - Instantiate(environmentMaterials[2]), - Instantiate(environmentMaterials[4]), - }; - environmentMaterials[1] = firstPatternLights[0]; - environmentMaterials[2] = firstPatternLights[1]; - environmentMaterials[4] = firstPatternLights[2]; + // firstPatternLights = new Material[] + // { + // Instantiate(environmentMaterials[1]), + // Instantiate(environmentMaterials[2]), + // Instantiate(environmentMaterials[4]), + // }; + // environmentMaterials[1] = firstPatternLights[0]; + // environmentMaterials[2] = firstPatternLights[1]; + // environmentMaterials[4] = firstPatternLights[2]; - secondPatternLights = new Material[] - { - Instantiate(environmentMaterials[0]), - Instantiate(environmentMaterials[3]) - }; - environmentMaterials[0] = secondPatternLights[0]; - environmentMaterials[3] = secondPatternLights[1]; + // secondPatternLights = new Material[] + // { + // Instantiate(environmentMaterials[0]), + // Instantiate(environmentMaterials[3]) + // }; + // environmentMaterials[0] = secondPatternLights[0]; + // environmentMaterials[3] = secondPatternLights[1]; elevatorAnim.Play("MakeRod", 0, 1f); UpdateColors(); @@ -231,14 +229,6 @@ namespace HeavenStudio.Games beltMaterial.SetColor("_Color", currentEnvironmentColor); gridPlaneMaterial.SetColor("_Color", currentEnvironmentColor); elevatorMaterial.SetColor("_Color", currentEnvironmentColor); - foreach (var mat in gridMaterials) - { - mat.SetColor("_Color", currentEnvironmentColor); - } - foreach (var mat in elevatorObjectMats) - { - mat.SetColor("_Color", currentObjectColor); - } if (!lighting) { foreach (var mat in firstPatternLights) @@ -298,8 +288,8 @@ namespace HeavenStudio.Games currentBeltOffset = (currentBeltOffset + Time.deltaTime * -beltSpeed) % 1f; beltMaterial.mainTextureOffset = new Vector2(0f, currentBeltOffset); - environmentRenderer.materials = environmentMaterials; - elevatorRenderer.materials = elevatorMaterials; + // environmentRenderer.materials = environmentMaterials; + // elevatorRenderer.materials = elevatorMaterials; if (PlayerInput.PlayerHasControl() && PlayerInput.CurrentControlStyle is InputSystem.InputController.ControlStyles.Touch) {