Commit 5b52380d authored by Abdulrahman Mohammed's avatar Abdulrahman Mohammed

Done with collision game

parent e8c83c80
fileFormatVersion: 2
guid: a440631f88cb44445b8fa61818569676
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
...@@ -90,6 +90,8 @@ namespace AL_Arcade.DialogueSystem.Scripts ...@@ -90,6 +90,8 @@ namespace AL_Arcade.DialogueSystem.Scripts
SubscribeToAIEvents(); SubscribeToAIEvents();
Debug.Log("[InGameAIChatPanel] Initialized - Ready for gameplay overlay"); Debug.Log("[InGameAIChatPanel] Initialized - Ready for gameplay overlay");
recordButtonImage.sprite = recordingSprite;
} }
void OnEnable() void OnEnable()
......
...@@ -5,6 +5,8 @@ using UnityEngine.SceneManagement; ...@@ -5,6 +5,8 @@ using UnityEngine.SceneManagement;
public class ApplicationManager : MonoBehaviour public class ApplicationManager : MonoBehaviour
{ {
[SerializeField] string ExitUrl = "https://www.google.com/";
private void Start() private void Start()
{ {
Application.targetFrameRate = 60; Application.targetFrameRate = 60;
...@@ -16,6 +18,8 @@ public class ApplicationManager : MonoBehaviour ...@@ -16,6 +18,8 @@ public class ApplicationManager : MonoBehaviour
} }
public void Exit() public void Exit()
{ {
Application.Quit(); Application.OpenURL(ExitUrl);
// Application.OpenURL(Application.absoluteURL);
//Application.Quit();
} }
} }
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ChangeInput : MonoBehaviour
{
public static ChangeInput Instance;
[SerializeField] Sprite[] icons; // first is pc;
[SerializeField] RectTransform joyStickPanel;
bool SwitchToJoystick;
public float mouseSensitivity { get; private set; }
private void Awake()
{
if (Instance == null)
Instance = this;
else
Destroy(this);
}
void Start()
{
GetComponent<Button>().onClick.AddListener(Change);
mouseSensitivity = .1f;
if(PlayerPrefs.GetInt("input",0) == 0)
{
SwitchToJoystick = false;
joyStickPanel.gameObject.SetActive(false);
SetPC();
}
else
{
SwitchToJoystick = true;
SetJoystick();
joyStickPanel.gameObject.SetActive(true);
}
}
private void Change()
{
SwitchToJoystick = !SwitchToJoystick;
joyStickPanel.gameObject.SetActive(SwitchToJoystick);
if (!SwitchToJoystick)
{
SetPC();
PlayerPrefs.SetInt("input",0);
}
else
{
SetJoystick();
PlayerPrefs.SetInt("input",1);
}
}
void SetPC()
{
transform.GetChild(0).GetComponent<Image>().sprite = icons[1];
mouseSensitivity = .1f;
}
void SetJoystick()
{
transform.GetChild(0).GetComponent<Image>().sprite = icons[0];
mouseSensitivity = 1;
}
}
fileFormatVersion: 2
guid: 5ad2153cc3950bd4b9e69f0dd19de2f2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEditor;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
public class CursorVisible : MonoBehaviour public class CursorVisible : MonoBehaviour
{ {
[SerializeField] bool isCursorVisible; [SerializeField] bool isCursorVisible;
private void Start() private void Start()
{ {
if(isCursorVisible) return; if (isCursorVisible) return;
Cursor.lockState = CursorLockMode.Locked; Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false; Cursor.visible = false;
} }
...@@ -23,13 +25,15 @@ public class CursorVisible : MonoBehaviour ...@@ -23,13 +25,15 @@ public class CursorVisible : MonoBehaviour
Cursor.lockState = (Cursor.lockState == CursorLockMode.Locked) ? CursorLockMode.None : CursorLockMode.Locked; Cursor.lockState = (Cursor.lockState == CursorLockMode.Locked) ? CursorLockMode.None : CursorLockMode.Locked;
Cursor.visible = !Cursor.visible; Cursor.visible = !Cursor.visible;
} }
if (Input.GetMouseButtonDown(0) && !EventSystem.current.IsPointerOverGameObject()) if (Input.GetMouseButtonDown(0))
{ {
if (!EventSystem.current.IsPointerOverGameObject())
HideMouseCursor(); HideMouseCursor();
} }
} }
public void ShowMouseCursor() public void ShowMouseCursor()
{ {
Cursor.lockState = CursorLockMode.None; Cursor.lockState = CursorLockMode.None;
Cursor.visible = true; Cursor.visible = true;
} }
......
using UnityEngine; using UnityEngine;
using UnityEngine.InputSystem.EnhancedTouch;
public class InputManager : MonoBehaviour public class InputManager : MonoBehaviour
{ {
...@@ -18,10 +19,14 @@ public class InputManager : MonoBehaviour ...@@ -18,10 +19,14 @@ public class InputManager : MonoBehaviour
private void OnEnable() private void OnEnable()
{ {
_inputActions.Enable(); _inputActions.Enable();
TouchSimulation.Enable();
} }
private void OnDisable() private void OnDisable()
{ {
_inputActions.Disable(); _inputActions.Disable();
TouchSimulation.Disable();
} }
void Start() void Start()
{ {
...@@ -35,5 +40,30 @@ public class InputManager : MonoBehaviour ...@@ -35,5 +40,30 @@ public class InputManager : MonoBehaviour
_inputActions.Player.Boost.performed += ctx => Boost = true; _inputActions.Player.Boost.performed += ctx => Boost = true;
_inputActions.Player.Boost.canceled += ctx => Boost = false; _inputActions.Player.Boost.canceled += ctx => Boost = false;
}
void OnApplicationPause(bool pause)
{
if (pause)
{
Time.timeScale = 0f;
}
else
{
Time.timeScale = 1f;
}
} }
void OnApplicationFocus(bool focus)
{
if (!focus)
{
Time.timeScale = 0f;
}
else
{
Time.timeScale = 1f;
}
}
} }
...@@ -8,7 +8,7 @@ namespace DavidJalbert ...@@ -8,7 +8,7 @@ namespace DavidJalbert
public class TinyCarAudio : MonoBehaviour public class TinyCarAudio : MonoBehaviour
{ {
public TinyCarController carController; public TinyCarController carController;
[SerializeField] float AudioSourceVolume = 1f; float AudioSourceVolume = .2f;
[Header("Engine audio")] [Header("Engine audio")]
[Tooltip("Looping engine sound clip.")] [Tooltip("Looping engine sound clip.")]
......
...@@ -7,6 +7,7 @@ namespace DavidJalbert ...@@ -7,6 +7,7 @@ namespace DavidJalbert
public class TinyCarCamera : MonoBehaviour public class TinyCarCamera : MonoBehaviour
{ {
[SerializeField] LayerMask LayerMask; [SerializeField] LayerMask LayerMask;
ChangeInput _changeInputScript;
InputManager _inputManager; InputManager _inputManager;
public enum CAMERA_MODE public enum CAMERA_MODE
{ {
...@@ -36,28 +37,22 @@ namespace DavidJalbert ...@@ -36,28 +37,22 @@ namespace DavidJalbert
[Tooltip("Smoothing of the camera's rotation. The lower the value, the smoother the rotation. Set to 0 to disable smoothing.")] [Tooltip("Smoothing of the camera's rotation. The lower the value, the smoother the rotation. Set to 0 to disable smoothing.")]
public float thirdPersonInterpolation = 10; public float thirdPersonInterpolation = 10;
float mouseSensitivity = 2;
float yaw; float yaw;
float pitch; float pitch;
public void SetPcMouseSensitivity()
{
mouseSensitivity = .1f;
}
public void SetJoyStickMouseSensitivity()
{
mouseSensitivity = 2;
}
private void Start() private void Start()
{ {
_inputManager = InputManager.Instance; _inputManager = InputManager.Instance;
_changeInputScript = ChangeInput.Instance;
} }
private void Update() private void Update()
{ {
//yaw += Input.GetAxis("Mouse X") * mouseSensitivity; //yaw += Input.GetAxis("Mouse X") * mouseSensitivity;
//pitch -= Input.GetAxis("Mouse Y") * mouseSensitivity; //pitch -= Input.GetAxis("Mouse Y") * mouseSensitivity;
yaw += _inputManager.Camera.x * mouseSensitivity; // yaw += _inputManager.Camera.x * _changeInputScript.mouseSensitivity;
pitch -= _inputManager.Camera.y * mouseSensitivity; //pitch -= _inputManager.Camera.y * _changeInputScript.mouseSensitivity;
} }
void FixedUpdate() void FixedUpdate()
{ {
...@@ -73,8 +68,8 @@ namespace DavidJalbert ...@@ -73,8 +68,8 @@ namespace DavidJalbert
switch (viewMode) switch (viewMode)
{ {
case CAMERA_MODE.ThirdPerson: case CAMERA_MODE.ThirdPerson:
//Vector3 rotationEuler = thirdPersonAngle + Vector3.up * followRotation.eulerAngles.y; Vector3 rotationEuler = thirdPersonAngle + Vector3.up * followRotation.eulerAngles.y;
Vector3 rotationEuler = thirdPersonAngle + new Vector3(pitch, yaw, 0); // Vector3 rotationEuler = thirdPersonAngle + new Vector3(pitch, yaw, 0);
targetPosition = followPosition; targetPosition = followPosition;
......
...@@ -13,7 +13,6 @@ namespace DavidJalbert ...@@ -13,7 +13,6 @@ namespace DavidJalbert
{ {
private static float GroundCheckDistanceDelta = 0.1f; private static float GroundCheckDistanceDelta = 0.1f;
private static float GroundCheckSkinWidthDelta = 0.05f; private static float GroundCheckSkinWidthDelta = 0.05f;
public enum GRAVITY_MODE public enum GRAVITY_MODE
{ {
AlwaysDown, TowardsGround AlwaysDown, TowardsGround
...@@ -57,7 +56,7 @@ namespace DavidJalbert ...@@ -57,7 +56,7 @@ namespace DavidJalbert
[Header("Steering")] [Header("Steering")]
[Tooltip("Sharpness of the steering.")] [Tooltip("Sharpness of the steering.")]
public float maxSteering = 200; float maxSteering = 50;
[Tooltip("Multiplier applied to steering when in the air. Setting this to zero makes the car unsteerable in the air.")] [Tooltip("Multiplier applied to steering when in the air. Setting this to zero makes the car unsteerable in the air.")]
public float steeringMultiplierInAir = 0.25f; public float steeringMultiplierInAir = 0.25f;
[Tooltip("How much steering to apply relative to the speed of the car.")] [Tooltip("How much steering to apply relative to the speed of the car.")]
......
This source diff could not be displayed because it is too large. You can view the blob instead.
fileFormatVersion: 2
guid: 59c4901188edb07419fdf524f371afe4
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -107,7 +107,6 @@ AudioSource: ...@@ -107,7 +107,6 @@ AudioSource:
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0} OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0} m_audioClip: {fileID: 0}
m_Resource: {fileID: 0}
m_PlayOnAwake: 1 m_PlayOnAwake: 1
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
...@@ -333,10 +332,10 @@ Rigidbody: ...@@ -333,10 +332,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1297155998961957838} m_GameObject: {fileID: 1297155998961957838}
serializedVersion: 5 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
...@@ -415,10 +414,10 @@ Rigidbody: ...@@ -415,10 +414,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1332433445322325132} m_GameObject: {fileID: 1332433445322325132}
serializedVersion: 5 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
...@@ -658,10 +657,10 @@ Rigidbody: ...@@ -658,10 +657,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2276153804441725687} m_GameObject: {fileID: 2276153804441725687}
serializedVersion: 5 serializedVersion: 4
m_Mass: 10 m_Mass: 10
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
...@@ -752,7 +751,6 @@ MonoBehaviour: ...@@ -752,7 +751,6 @@ MonoBehaviour:
maxSpeedReverse: 20 maxSpeedReverse: 20
brakeStrength: 100 brakeStrength: 100
slopeFriction: 1 slopeFriction: 1
maxSteering: 200
steeringMultiplierInAir: 0.25 steeringMultiplierInAir: 0.25
steeringBySpeed: steeringBySpeed:
serializedVersion: 2 serializedVersion: 2
...@@ -5722,11 +5720,6 @@ ParticleSystemRenderer: ...@@ -5722,11 +5720,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -5749,7 +5742,6 @@ ParticleSystemRenderer: ...@@ -5749,7 +5742,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -5826,10 +5818,10 @@ Rigidbody: ...@@ -5826,10 +5818,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4974377823222256906} m_GameObject: {fileID: 4974377823222256906}
serializedVersion: 5 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
...@@ -10720,11 +10712,6 @@ ParticleSystemRenderer: ...@@ -10720,11 +10712,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -10746,7 +10733,6 @@ ParticleSystemRenderer: ...@@ -10746,7 +10733,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -10823,10 +10809,10 @@ Rigidbody: ...@@ -10823,10 +10809,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6518797752743812544} m_GameObject: {fileID: 6518797752743812544}
serializedVersion: 5 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
...@@ -15659,11 +15645,6 @@ ParticleSystemRenderer: ...@@ -15659,11 +15645,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -15686,7 +15667,6 @@ ParticleSystemRenderer: ...@@ -15686,7 +15667,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -20575,11 +20555,6 @@ ParticleSystemRenderer: ...@@ -20575,11 +20555,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -20602,7 +20577,6 @@ ParticleSystemRenderer: ...@@ -20602,7 +20577,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -25491,11 +25465,6 @@ ParticleSystemRenderer: ...@@ -25491,11 +25465,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -25518,7 +25487,6 @@ ParticleSystemRenderer: ...@@ -25518,7 +25487,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -30349,11 +30317,6 @@ ParticleSystemRenderer: ...@@ -30349,11 +30317,6 @@ ParticleSystemRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
...@@ -30376,7 +30339,6 @@ ParticleSystemRenderer: ...@@ -30376,7 +30339,6 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
...@@ -30605,10 +30567,10 @@ Rigidbody: ...@@ -30605,10 +30567,10 @@ Rigidbody:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9026058285377746648} m_GameObject: {fileID: 9026058285377746648}
serializedVersion: 5 serializedVersion: 4
m_Mass: 1 m_Mass: 1
m_LinearDamping: 0 m_Drag: 0
m_AngularDamping: 0 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
......
...@@ -2,12 +2,12 @@ fileFormatVersion: 2 ...@@ -2,12 +2,12 @@ fileFormatVersion: 2
guid: 70e6f47b855a5824daceb98c0bfb27bb guid: 70e6f47b855a5824daceb98c0bfb27bb
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 7
defaultSettings: defaultSettings:
serializedVersion: 2 serializedVersion: 2
loadType: 1 loadType: 1
sampleRateSetting: 1 sampleRateSetting: 2
sampleRateOverride: 44100 sampleRateOverride: 8000
compressionFormat: 1 compressionFormat: 1
quality: 0.5 quality: 0.5
conversionMode: 0 conversionMode: 0
......
...@@ -2,12 +2,12 @@ fileFormatVersion: 2 ...@@ -2,12 +2,12 @@ fileFormatVersion: 2
guid: 2511287151526dd4997b1d8cff35558e guid: 2511287151526dd4997b1d8cff35558e
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 7
defaultSettings: defaultSettings:
serializedVersion: 2 serializedVersion: 2
loadType: 1 loadType: 1
sampleRateSetting: 1 sampleRateSetting: 2
sampleRateOverride: 44100 sampleRateOverride: 8000
compressionFormat: 1 compressionFormat: 1
quality: 0.5 quality: 0.5
conversionMode: 0 conversionMode: 0
......
...@@ -2,12 +2,12 @@ fileFormatVersion: 2 ...@@ -2,12 +2,12 @@ fileFormatVersion: 2
guid: addc7495b750e694ebafd7ea80210fd4 guid: addc7495b750e694ebafd7ea80210fd4
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 7
defaultSettings: defaultSettings:
serializedVersion: 2 serializedVersion: 2
loadType: 1 loadType: 1
sampleRateSetting: 1 sampleRateSetting: 2
sampleRateOverride: 44100 sampleRateOverride: 8000
compressionFormat: 1 compressionFormat: 1
quality: 0.5 quality: 0.5
conversionMode: 0 conversionMode: 0
......
...@@ -2,12 +2,12 @@ fileFormatVersion: 2 ...@@ -2,12 +2,12 @@ fileFormatVersion: 2
guid: 04617ee1ce851af43a1193a1242a12c8 guid: 04617ee1ce851af43a1193a1242a12c8
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 7
defaultSettings: defaultSettings:
serializedVersion: 2 serializedVersion: 2
loadType: 1 loadType: 1
sampleRateSetting: 1 sampleRateSetting: 2
sampleRateOverride: 44100 sampleRateOverride: 8000
compressionFormat: 1 compressionFormat: 1
quality: 0.5 quality: 0.5
conversionMode: 0 conversionMode: 0
......
...@@ -2,12 +2,12 @@ fileFormatVersion: 2 ...@@ -2,12 +2,12 @@ fileFormatVersion: 2
guid: 265432814eaac9b4abf995afdba9e2fa guid: 265432814eaac9b4abf995afdba9e2fa
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 8 serializedVersion: 7
defaultSettings: defaultSettings:
serializedVersion: 2 serializedVersion: 2
loadType: 1 loadType: 1
sampleRateSetting: 1 sampleRateSetting: 2
sampleRateOverride: 44100 sampleRateOverride: 8000
compressionFormat: 1 compressionFormat: 1
quality: 0.5 quality: 0.5
conversionMode: 0 conversionMode: 0
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Back Hit Idle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Back
path:
classID: 137
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 3455872521
script: {fileID: 0}
typeID: 137
customType: 20
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Back
path:
classID: 137
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2 fileFormatVersion: 2
guid: aede445ab7b5a7c4c9ff009adc18389e guid: 7c5444b4c0547d64d81631686a227976
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000 mainObjectFileID: 7400000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Back Hit
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Back
path:
classID: 137
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 3455872521
script: {fileID: 0}
typeID: 137
customType: 20
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Back
path:
classID: 137
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6586f9d8e20a4c24fb7dfca866e7ba85 guid: 41eb247c4114eb148a5b9feeedf75e49
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000 mainObjectFileID: 7400000
......
...@@ -21,7 +21,7 @@ AnimatorState: ...@@ -21,7 +21,7 @@ AnimatorState:
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 20538ffee7df8854794713cfdc074969, type: 2} m_Motion: {fileID: 7400000, guid: 014ebb5bf6340ba4ea839f47f9e51043, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
...@@ -33,10 +33,16 @@ AnimatorController: ...@@ -33,10 +33,16 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Lattice Front m_Name: Body
serializedVersion: 5 serializedVersion: 5
m_AnimatorParameters: m_AnimatorParameters:
- m_Name: IsHit - m_Name: Front
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: Back
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
...@@ -44,7 +50,7 @@ AnimatorController: ...@@ -44,7 +50,7 @@ AnimatorController:
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Front
m_StateMachine: {fileID: 8618535494906865389} m_StateMachine: {fileID: 8618535494906865389}
m_Mask: {fileID: 0} m_Mask: {fileID: 0}
m_Motions: [] m_Motions: []
...@@ -55,6 +61,18 @@ AnimatorController: ...@@ -55,6 +61,18 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
- serializedVersion: 5
m_Name: Back
m_StateMachine: {fileID: 2831094940008477094}
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!1101 &487693019545880720 --- !u!1101 &487693019545880720
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -64,7 +82,7 @@ AnimatorStateTransition: ...@@ -64,7 +82,7 @@ AnimatorStateTransition:
m_Name: m_Name:
m_Conditions: m_Conditions:
- m_ConditionMode: 1 - m_ConditionMode: 1
m_ConditionEvent: IsHit m_ConditionEvent: Front
m_EventTreshold: 0 m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1131583804512623448} m_DstState: {fileID: 1131583804512623448}
...@@ -101,12 +119,89 @@ AnimatorState: ...@@ -101,12 +119,89 @@ AnimatorState:
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6586f9d8e20a4c24fb7dfca866e7ba85, type: 2} m_Motion: {fileID: 7400000, guid: 44c0330e32a59854e934541e48b14aa3, type: 2}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &2769962702836644422
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LatticeBackdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 3891257666695934856}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7c5444b4c0547d64d81631686a227976, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &2831094940008477094
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Back
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8783648439417945919}
m_Position: {x: 260, y: 200, z: 0}
- serializedVersion: 1
m_State: {fileID: 2769962702836644422}
m_Position: {x: 260, y: 100, 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: 2769962702836644422}
--- !u!1101 &3891257666695934856
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Back
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8783648439417945919}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.05
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6150651356740762161 --- !u!1101 &6150651356740762161
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -116,7 +211,7 @@ AnimatorStateTransition: ...@@ -116,7 +211,7 @@ AnimatorStateTransition:
m_Name: m_Name:
m_Conditions: m_Conditions:
- m_ConditionMode: 2 - m_ConditionMode: 2
m_ConditionEvent: IsHit m_ConditionEvent: Front
m_EventTreshold: 0 m_EventTreshold: 0
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -67740369973707398} m_DstState: {fileID: -67740369973707398}
...@@ -124,7 +219,32 @@ AnimatorStateTransition: ...@@ -124,7 +219,32 @@ AnimatorStateTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 5 m_TransitionDuration: 3
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &7083606522258586211
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: Back
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 2769962702836644422}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 3
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.75 m_ExitTime: 0.75
m_HasExitTime: 0 m_HasExitTime: 0
...@@ -139,7 +259,7 @@ AnimatorStateMachine: ...@@ -139,7 +259,7 @@ AnimatorStateMachine:
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Base Layer m_Name: Front
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1131583804512623448} m_State: {fileID: 1131583804512623448}
...@@ -157,3 +277,30 @@ AnimatorStateMachine: ...@@ -157,3 +277,30 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -67740369973707398} m_DefaultState: {fileID: -67740369973707398}
--- !u!1102 &8783648439417945919
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LatticeBackHit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7083606522258586211}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 41eb247c4114eb148a5b9feeedf75e49, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Front Hit Idle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Front
path:
classID: 137
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1060785650
script: {fileID: 0}
typeID: 137
customType: 20
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Front
path:
classID: 137
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2 fileFormatVersion: 2
guid: 84f68efb0c3ad7c40be9c60a54132209 guid: 014ebb5bf6340ba4ea839f47f9e51043
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000 mainObjectFileID: 7400000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Front Hit
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Front
path:
classID: 137
script: {fileID: 0}
flags: 0
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1060785650
script: {fileID: 0}
typeID: 137
customType: 20
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 100
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: blendShape.Front
path:
classID: 137
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2 fileFormatVersion: 2
guid: 20538ffee7df8854794713cfdc074969 guid: 44c0330e32a59854e934541e48b14aa3
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 7400000 mainObjectFileID: 7400000
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-6424927931250617509
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: 7301210383216807525}
m_Position: {x: 250, y: 60, z: 0}
- serializedVersion: 1
m_State: {fileID: 737909632042136830}
m_Position: {x: 250, y: 130, 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: 7301210383216807525}
--- !u!1101 &-351284481444450850
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: IsHit
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7301210383216807525}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 5
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Lattice Back
serializedVersion: 5
m_AnimatorParameters:
- m_Name: IsHit
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -6424927931250617509}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &737909632042136830
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LatticeBackHit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -351284481444450850}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: aede445ab7b5a7c4c9ff009adc18389e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7301210383216807525
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LatticeBackIdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7385407259339108068}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 84f68efb0c3ad7c40be9c60a54132209, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7385407259339108068
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: IsHit
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 737909632042136830}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.05
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
...@@ -5,16 +5,24 @@ using UnityEngine; ...@@ -5,16 +5,24 @@ using UnityEngine;
public class LatticeHitScript : MonoBehaviour public class LatticeHitScript : MonoBehaviour
{ {
[SerializeField] Animator latticeAnimator; [SerializeField] Animator latticeAnimator;
[SerializeField] bool isFront;
private void OnTriggerEnter(Collider other) private void OnTriggerEnter(Collider other)
{ {
if (other.CompareTag("Player") || other.CompareTag("Edge") || other.CompareTag("NotHit") || other.CompareTag("Chip") || other.CompareTag("soccer") || other.CompareTag("ball")) return; if (other.CompareTag("Player") || other.CompareTag("Edge") || other.CompareTag("NotHit") || other.CompareTag("Chip") || other.CompareTag("soccer") || other.CompareTag("ball")) return;
// Debug.Log(other.name); // Debug.Log(other.name);
latticeAnimator.SetBool("IsHit", true); if(isFront)
latticeAnimator.SetBool("Front", true);
else
latticeAnimator.SetBool("Back", true);
} }
private void OnTriggerExit(Collider other) private void OnTriggerExit(Collider other)
{ {
if (other.CompareTag("Player") || other.CompareTag("Edge") || other.CompareTag("NotHit") || other.CompareTag("Chip") || other.CompareTag("soccer") || other.CompareTag("ball")) return; if (other.CompareTag("Player") || other.CompareTag("Edge") || other.CompareTag("NotHit") || other.CompareTag("Chip") || other.CompareTag("soccer") || other.CompareTag("ball")) return;
latticeAnimator.SetBool("IsHit", false); if (isFront)
latticeAnimator.SetBool("Front", false);
else
latticeAnimator.SetBool("Back", false);
} }
} }
fileFormatVersion: 2
guid: 06c596e3341576044a594144067d5fb2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0e1efe76718444a46a968741bfe1a5e3
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 1096704542ae40240952955bad3eb6f7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a6f48c4d6f0bdb54bad3cf3646237598
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 0eb84af8fb6bd9e4eb63a4976dec3e1a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
...@@ -198,6 +198,17 @@ public partial class @InputActions: IInputActionCollection2, IDisposable ...@@ -198,6 +198,17 @@ public partial class @InputActions: IInputActionCollection2, IDisposable
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
}, },
{
""name"": """",
""id"": ""ddd7d7bf-64b2-42c6-8453-cc9c829ca670"",
""path"": ""<Mouse>/delta"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Camera"",
""isComposite"": false,
""isPartOfComposite"": false
},
{ {
""name"": """", ""name"": """",
""id"": ""1f71851a-d235-437d-bc02-3665928cb689"", ""id"": ""1f71851a-d235-437d-bc02-3665928cb689"",
......
...@@ -112,6 +112,17 @@ ...@@ -112,6 +112,17 @@
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
}, },
{
"name": "",
"id": "ddd7d7bf-64b2-42c6-8453-cc9c829ca670",
"path": "<Mouse>/delta",
"interactions": "",
"processors": "",
"groups": "",
"action": "Camera",
"isComposite": false,
"isPartOfComposite": false
},
{ {
"name": "", "name": "",
"id": "1f71851a-d235-437d-bc02-3665928cb689", "id": "1f71851a-d235-437d-bc02-3665928cb689",
......
...@@ -34,7 +34,7 @@ Material: ...@@ -34,7 +34,7 @@ Material:
- _MainTex: - _MainTex:
m_Texture: {fileID: 2800000, guid: 348fa4d278c53ad4dacd07df1e63a248, type: 3} m_Texture: {fileID: 2800000, guid: 348fa4d278c53ad4dacd07df1e63a248, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 1.2342993, y: 0} m_Offset: {x: 0.51186323, y: 0}
- _MainTex2: - _MainTex2:
m_Texture: {fileID: 2800000, guid: bef54341b6d21864c82d47f3bed4c7db, type: 3} m_Texture: {fileID: 2800000, guid: bef54341b6d21864c82d47f3bed4c7db, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
......
...@@ -14,7 +14,7 @@ MonoBehaviour: ...@@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::DialogueMessageArabic m_EditorClassIdentifier: Assembly-CSharp::DialogueMessageArabic
characterSprite: {fileID: 3448575855859882003, guid: 042826771a175c8408f552cf50122d50, type: 3} characterSprite: {fileID: 3448575855859882003, guid: 042826771a175c8408f552cf50122d50, type: 3}
characterName: characterName:
messageText: "\u062F\u0644\u0648\u0642\u062A\u064A \u062F\u0627\u0648\u0631 \u0639\u0644\u064A messageText: "\u062F\u0644\u0648\u0642\u062A\u064A \u062F\u0648\u0631 \u0639\u0644\u064A
\u0628\u0627\u0642\u064A \u0627\u0644\u0634\u0631\u0627\u0626\u062D \u0625\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u064A\u0629 \u0628\u0627\u0642\u064A \u0627\u0644\u0634\u0631\u0627\u0626\u062D \u0625\u0644\u0627\u0644\u0643\u062A\u0631\u0648\u0646\u064A\u0629
\u0639\u0644\u0634\u0627\u0646 \u062A\u0643\u0633\u0628 \u0627\u0644\u062F\u0648\u0631 \u0639\u0644\u0634\u0627\u0646 \u062A\u0643\u0633\u0628 \u0627\u0644\u062F\u0648\u0631
\u062F\u0629 \u0648\u062A\u062E\u0634 \u0639\u0644\u064A \u0627\u0644\u062F\u0648\u0631 \u062F\u0629 \u0648\u062A\u062E\u0634 \u0639\u0644\u064A \u0627\u0644\u062F\u0648\u0631
......
fileFormatVersion: 2
guid: 3b9724cf4fbe9114bac71e40b89aedf0
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
...@@ -15,9 +15,10 @@ MonoBehaviour: ...@@ -15,9 +15,10 @@ MonoBehaviour:
characterSprite: {fileID: 21300000, guid: 4e528919e91e3864bbf1f9554ae7522b, type: 3} characterSprite: {fileID: 21300000, guid: 4e528919e91e3864bbf1f9554ae7522b, type: 3}
characterName: characterName:
messageText: "\u0627\u0636\u063A\u0637 \u0632\u0631\u0627\u0631 \u0634\u064A\u0641\u062A messageText: "\u0627\u0636\u063A\u0637 \u0632\u0631\u0627\u0631 \u0634\u064A\u0641\u062A
\u0641\u064A \u0627\u0644\u0643\u064A\u0628\u0648\u0631\u062F \u0648\u0646\u062A\u0627 \u0641\u064A \u0627\u0644\u0643\u064A\u0628\u0648\u0631\u062F \u0627\u0648 \u0632\u0631\u0627\u0631
\u0628\u062A\u062A\u062D\u0631\u0643 \u0639\u0644\u0634\u0627\u0646 \u062A\u062E\u0644\u064A \u0627\u0644\u0633\u0631\u0639\u0629 \u0648\u0646\u062A\u0627 \u0628\u062A\u062A\u062D\u0631\u0643
\u0627\u0644\u0639\u0631\u0628\u064A\u0629 \u062A\u062C\u0631\u064A \u0627\u0633\u0631\u0639" \u0639\u0644\u0634\u0627\u0646 \u062A\u062E\u0644\u064A \u0627\u0644\u0639\u0631\u0628\u064A\u0629
voiceClip: {fileID: 8300000, guid: 4d4e82525e45eaa4a91d0cb78fd04c2e, type: 3} \u062A\u062C\u0631\u064A \u0627\u0633\u0631\u0639"
voiceClip: {fileID: 8300000, guid: 3b9724cf4fbe9114bac71e40b89aedf0, type: 3}
replies: [] replies: []
nextMessage: {fileID: 0} nextMessage: {fileID: 0}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -3,10 +3,16 @@ ...@@ -3,10 +3,16 @@
public class CarAirBagDetector : MonoBehaviour public class CarAirBagDetector : MonoBehaviour
{ {
[SerializeField] CarAirBag airBag; [SerializeField] CarAirBag airBag;
InputManager _inputManager;
private void Start()
{
_inputManager = InputManager.Instance;
}
private void OnTriggerStay(Collider other) private void OnTriggerStay(Collider other)
{ {
if (other.CompareTag("Obstacle") && Input.GetKey(KeyCode.LeftShift)) if (other.CompareTag("Obstacle") && _inputManager.Boost)
{ {
airBag.Open(); airBag.Open();
airBag.GetComponent<Collider>().enabled = true; airBag.GetComponent<Collider>().enabled = true;
......
This diff is collapsed.
This diff is collapsed.
fileFormatVersion: 2 fileFormatVersion: 2
guid: a91055d7acaa28c4b9297fc0e00c23c5 guid: a2d2468d8561cb64ba161e84123ff2cd
NativeFormatImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 9100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment