adjusted camera and some other small stuff

2 years ago · fff9d16480
4 changed files with 228 additions and 105 deletions
--- a/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity
+++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/01_Game.unity
@ -779,7 +779,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -3.845
+      value: -2.81
      objectReference: {fileID: 0}
    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
      propertyPath: m_LocalRotation.w
@ -801,7 +801,7 @@ PrefabInstance:
        type: 3}
      propertyPath: spawnItem
      value: 
-      objectReference: {fileID: 1611375829293178, guid: fcd0b346c69460a4ea8393d7dee9c741,
+      objectReference: {fileID: 1937479339862522, guid: 865f6a72e8814bd4fbe38b1508a98bba,
        type: 3}
    - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181,
        type: 3}
@ -1798,6 +1798,7 @@ Transform:
  - {fileID: 476611446}
  - {fileID: 215887392}
  - {fileID: 2102502827}
+  - {fileID: 980647185}
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4566,6 +4567,68 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 977688234}
  m_Mesh: {fileID: 4300016, guid: 56a9e5d3ec4e1d045ad05d326d5980ef, type: 3}
+--- !u!1001 &980647184
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 386790988}
+    m_Modifications:
+    - target: {fileID: 1217764232122442, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_Name
+      value: WoodenCrate (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.52
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.574
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000021855694
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181,
+        type: 3}
+      propertyPath: spawnItem
+      value: 
+      objectReference: {fileID: 1611375829293178, guid: fcd0b346c69460a4ea8393d7dee9c741,
+        type: 3}
+    - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181,
+        type: 3}
+      propertyPath: spawnChance
+      value: 100
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b8fcdd73fd0d4bc4d9d961b61d541181, type: 3}
+--- !u!4 &980647185 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4882213012863746, guid: b8fcdd73fd0d4bc4d9d961b61d541181,
+    type: 3}
+  m_PrefabInstance: {fileID: 980647184}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &986530348
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -8874,7 +8937,7 @@ PrefabInstance:
        type: 3}
      propertyPath: spawnItem
      value: 
-      objectReference: {fileID: 1978773268404412, guid: 13e39a7c8e002c948af41a065e7d1135,
+      objectReference: {fileID: 1937479339862522, guid: 865f6a72e8814bd4fbe38b1508a98bba,
        type: 3}
    - target: {fileID: 114225313807016428, guid: b8fcdd73fd0d4bc4d9d961b61d541181,
        type: 3}
--- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/GameCamera.prefab
+++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Resources/GameCamera.prefab
@ -3,9 +3,10 @@
 --- !u!1 &171854
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 419476}
  - component: {fileID: 11459238}
@ -18,9 +19,10 @@ GameObject:
  m_IsActive: 1
 --- !u!4 &419476
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 171854}
  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
  m_LocalPosition: {x: 8.05, y: 1.52, z: 11.59}
@ -33,19 +35,21 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!114 &11459238
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 171854}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e474beb4bb9fa744e8968f072c30786b, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  target: {fileID: 0}
+  MiddlePosition: {x: 0, y: 0, z: 0}
+  targets: []
  distanceToTarget: 10
-  heightOffset: -2.5
-  viewAngle: -6.3
+  heightOffset: -3.9
+  viewAngle: -21.14
  AdditionalOffset: {x: 0, y: 0, z: 0}
  FollowZAxis: 0
  DampX: 3
@ -56,23 +60,13 @@ MonoBehaviour:
  UseWaveAreaCollider: 1
  CurrentAreaCollider: {fileID: 0}
  AreaColliderViewOffset: 4.5
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 171854}
-  m_IsPrefabParent: 1
 --- !u!1 &1197060837874028
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
  - component: {fileID: 4914548019038378}
  - component: {fileID: 20550194634016478}
@ -85,40 +79,12 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!1 &1851096947677712
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
-  m_Component:
-  - component: {fileID: 4594020345313398}
-  - component: {fileID: 81228338436471866}
-  m_Layer: 0
-  m_Name: AudioListener
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4594020345313398
-Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1851096947677712}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -1, z: 12.8}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 419476}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4914548019038378
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1197060837874028}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
@ -129,14 +95,21 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!20 &20550194634016478
 Camera:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1197060837874028}
  m_Enabled: 1
  serializedVersion: 2
  m_ClearFlags: 2
  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
@ -158,34 +131,17 @@ Camera:
  m_TargetEye: 3
  m_HDR: 0
  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
  m_ForceIntoRT: 0
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
--- !u!81 &81228338436471866
-AudioListener:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1851096947677712}
-  m_Enabled: 1
--- !u!114 &114058280678535174
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1197060837874028}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3da800b4ab91e9e4cb9dde7daa7a3f6d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  slowMotionTimeScale: 0.08
 --- !u!114 &114870926869580142
 MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1197060837874028}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -195,123 +151,226 @@ MonoBehaviour:
  camShakeY:
    serializedVersion: 2
    m_Curve:
-    - serializedVersion: 2
+    - serializedVersion: 3
      time: 0
      value: 0
      inSlope: 9.223664
      outSlope: 9.223664
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.109375
      value: 0.7292328
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.30012682
      value: -0.3850708
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.48472533
      value: 0.33099365
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.64375764
      value: -0.1697998
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.7749751
      value: 0.10967098
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.9114236
      value: -0.00462183
      inSlope: -0.4317239
      outSlope: -0.4317239
      tangentMode: 0
-    - serializedVersion: 2
+      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: 0
  camShakeX:
    serializedVersion: 2
    m_Curve:
-    - serializedVersion: 2
+    - serializedVersion: 3
      time: 0
      value: 0
      inSlope: 9.223664
      outSlope: 9.223664
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.109375
      value: 0.7292328
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.26190212
      value: -0.3850708
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.40950897
      value: 0.33099365
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.5366729
      value: -0.1697998
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.64159566
      value: 0.10967098
      inSlope: 0
      outSlope: 0
      tangentMode: 0
-    - serializedVersion: 2
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
      time: 0.7507013
      value: -0.00462183
      inSlope: -0.4317239
      outSlope: -0.4317239
      tangentMode: 0
-    - serializedVersion: 2
+      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: 0
  camShakeZ:
    serializedVersion: 2
    m_Curve:
-    - serializedVersion: 2
+    - 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: 0
  multiplier: 0.5
  randomize: 1
  time: 0.5
+--- !u!114 &114058280678535174
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197060837874028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3da800b4ab91e9e4cb9dde7daa7a3f6d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  slowMotionTimeScale: 0.08
+--- !u!1 &1851096947677712
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4594020345313398}
+  - component: {fileID: 81228338436471866}
+  m_Layer: 0
+  m_Name: AudioListener
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4594020345313398
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851096947677712}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -1, z: 12.8}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 419476}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &81228338436471866
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851096947677712}
+  m_Enabled: 1
--- a/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Camera/CameraFollow.cs
+++ b/unity_project/Assets/BeatEmUp_GameTemplate3D/Scripts/Camera/CameraFollow.cs
@ -65,7 +65,7 @@ public class CameraFollow : MonoBehaviour {
 			currentX = Mathf.Lerp(currentX, MiddlePosition.x, DampX * Time.deltaTime);

 			//DampY
-			currentY = Mathf.Lerp(currentY, MiddlePosition.y - heightOffset, DampY * Time.deltaTime);
+			currentY = Mathf.Lerp(currentY, 3.9f, DampY * Time.deltaTime);

 			//DampZ
 			if (FollowZAxis) { 
--- a/unity_project/Assets/Characters/dorothy/Tin
+++ b/unity_project/Assets/Characters/dorothy/Tin
@ -580,7 +580,8 @@ PrefabInstance:
      propertyPath: m_Controller
      value: 
      objectReference: {fileID: 9100000, guid: f21b05c218c1d684fbeb45aad84b001d, type: 2}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 5866666021909216657, guid: 0f92708c0c1f53e46a2681496383fb82, type: 3}
  m_SourcePrefab: {fileID: 100100000, guid: 0f92708c0c1f53e46a2681496383fb82, type: 3}
 --- !u!4 &229671680376873097 stripped
 Transform: