배경음 추가/그래플 움직임 롤백

8f88c23f · 15박보승 · d0eab39a · 8f88c23f · 8f88c23f · 8f88c23f
Commit 8f88c23f authored Oct 14, 2019 by 15박보승
Showing with 213 additions and 10 deletions

Ingame.unity Grapplers/Assets/Scenes/Ingame.unity +98 -1

Main.unity Grapplers/Assets/Scenes/Main.unity +107 -5

DistanceJoint3D.cs Grapplers/Assets/Scripts/DistanceJoint3D.cs +8 -4

No files found.
--- a/Grapplers/Assets/Scenes/Ingame.unity
+++ b/Grapplers/Assets/Scenes/Ingame.unity
@@ -6713,6 +6713,7 @@ GameObject:
  - component: {fileID: 963194230}
  - component: {fileID: 963194231}
  - component: {fileID: 963194232}
+  - component: {fileID: 963194233}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -6981,6 +6982,102 @@ MonoBehaviour:
  m_BeforeTransparentBundles: []
  m_BeforeStackBundles: []
  m_AfterStackBundles: []
+--- !u!82 &963194233
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 0bf361464bce1454fbbeabbab67634f0, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!4 &1018699965 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 808483076966640907, guid: 60f985c4e15827746af49ee480a2d6f9,
@@ -13103,7 +13200,7 @@ AudioSource:
  serializedVersion: 4
  OutputAudioMixerGroup: {fileID: 0}
  m_audioClip: {fileID: 8300000, guid: 53672d7ab39c3ee4abe61348623c9825, type: 3}
-  m_PlayOnAwake: 1
+  m_PlayOnAwake: 0
  m_Volume: 0.815
  m_Pitch: 1
  Loop: 0

--- a/Grapplers/Assets/Scenes/Main.unity
+++ b/Grapplers/Assets/Scenes/Main.unity
@@ -535,6 +535,11 @@ PrefabInstance:
      propertyPath: m_Name
      value: Player
      objectReference: {fileID: 0}
+    - target: {fileID: 6749310162749802333, guid: d06de160369998643b438095a9d8244e,
+        type: 3}
+      propertyPath: hook
+      value: 
+      objectReference: {fileID: 0}
    - target: {fileID: 6749310162749802334, guid: d06de160369998643b438095a9d8244e,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -590,16 +595,16 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6749310162749802333, guid: d06de160369998643b438095a9d8244e,
-        type: 3}
-      propertyPath: hook
-      value: 
-      objectReference: {fileID: 0}
    - target: {fileID: 6749310162749802322, guid: d06de160369998643b438095a9d8244e,
        type: 3}
      propertyPath: ConnectedRigidbody
      value: 
      objectReference: {fileID: 0}
+    - target: {fileID: 6749310162749802324, guid: d06de160369998643b438095a9d8244e,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: d06de160369998643b438095a9d8244e, type: 3}
 --- !u!1 &687674551
@@ -1837,6 +1842,7 @@ GameObject:
  - component: {fileID: 1649475061}
  - component: {fileID: 1649475060}
  - component: {fileID: 1649475062}
+  - component: {fileID: 1649475063}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -2039,6 +2045,102 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 7f80bf6bfb728594287e09ae2567967a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!82 &1649475063
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1649475055}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: 18e4719e2869a3b4493cd271528c4756, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
 --- !u!1 &1656945311
 GameObject:
  m_ObjectHideFlags: 0

--- a/Grapplers/Assets/Scripts/DistanceJoint3D.cs
+++ b/Grapplers/Assets/Scripts/DistanceJoint3D.cs
@@ -31,6 +31,7 @@ public class DistanceJoint3D : MonoBehaviour

    private void Update()
    {
+		/*
        if (distance > 0)
        {
            if (Input.GetMouseButton(1))
@@ -47,16 +48,19 @@ public class DistanceJoint3D : MonoBehaviour


        }
+		*/
+		distance = Mathf.Max(0, distance - ps * Time.deltaTime);
 	}
    private void FixedUpdate()
    {
        
        var connection = rb.position - ConnectedRigidbody.position;
-        if(!pull)
+		/*
+		if (!pull)
        {
            connection = Vector3.Cross(transform.right, connection) * 2;
        }
-
+		*/
 		var distanceDiscrepancy = distance - connection.magnitude;

 		//rb.position += distanceDiscrepancy * connection.normalized;