Change transform offset from player to raygun

2020-08-14 17:57:25 +03:00 · 2020-08-14 17:57:25 +03:00 · 3fbd0393da
parent 15ab77cd91
commit 3fbd0393da
3 changed files with 68 additions and 69 deletions
--- a/Assets/Items/Raygun.prefab
+++ b/Assets/Items/Raygun.prefab
@ -198,7 +198,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5022353220472231776}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1605033999665909937}
--- a/Assets/Player/Player.prefab
+++ b/Assets/Player/Player.prefab
@ -1216,7 +1216,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6689431852042077044}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.15, y: -0.271, z: 0.309}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1865991757674780053}
@ -1574,14 +1574,6 @@ MonoBehaviour:
  - {fileID: 7391558912582364398}
  - {fileID: 7391558913556166741}
  CameraRoot: {fileID: 4833458671639168932}
-  BulletSourcePoint: {fileID: 2637233632139837434}
-  BulletHitLayer:
-    serializedVersion: 2
-    m_Bits: 768
-  BulletPassLayer:
-    serializedVersion: 2
-    m_Bits: 8192
-  Cooldown: 1
  LerpedDesyncDistance: 2
  Lerpables:
  - {fileID: 6585337033203946896}
@ -2945,9 +2937,9 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: -1675871812770890977, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &6953174386727810892 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+--- !u!4 &2498596356784760024 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5615618764339399952 stripped
@ -2965,9 +2957,9 @@ Animator:
  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &2498596356784760024 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
+--- !u!1 &6953174386727810892 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4996979199693665407, guid: e18005d630710ec40b4e791ef3ee97c7, type: 3}
  m_PrefabInstance: {fileID: 2676956051575718707}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2909126165159328361 stripped
@ -3693,39 +3685,34 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+--- !u!1 &8134722540108977799 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4799245472480801387 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 9070741543337286203, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &5077275728796870648 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &439248789966776954 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &7861152345155936203 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!95 &7931246460515997121 stripped
-Animator:
-  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5143876166499415354 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 8654052703341272426, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &4103164600241655739 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+--- !u!1 &3404627525641887855 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &439248789966776954 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -5088115977802186198, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &5077275728796870648 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8722905492793823144, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7078895688717378999 stripped
@ -3733,29 +3720,34 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: -2502122241363620377, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4420112016416942592 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1328534562678190810 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 3248221432074918538, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7861152345155936203 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -3286630041556977765, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4103164600241655739 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+  m_PrefabInstance: {fileID: 4574503883554023504}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8167146500820978587 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -3590372263194287157, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &3404627525641887855 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1172147262814881855, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &4420112016416942592 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 156644665701319248, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
-  m_PrefabInstance: {fileID: 4574503883554023504}
-  m_PrefabAsset: {fileID: 0}
--- !u!1 &8134722540108977799 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -3485874040580669737, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
+--- !u!95 &7931246460515997121 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 5866666021909216657, guid: bb45094e64c7170458884eea0a4f4c68, type: 3}
  m_PrefabInstance: {fileID: 4574503883554023504}
  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6416848661152764776
@ -3769,18 +3761,6 @@ PrefabInstance:
      propertyPath: Camera
      value: 
      objectReference: {fileID: 8440773692779321063}
-    - target: {fileID: 4677107243738498813, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4677107243738498813, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4677107243738498813, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 4677107243738498813, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
      propertyPath: m_LocalRotation.x
      value: -0
@ -3840,8 +3820,3 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 1605033999665909937, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
  m_PrefabInstance: {fileID: 6416848661152764776}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &2637233632139837434 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 9048980524933835922, guid: 5e86b3797a8a43e48abf11dc89da8b00, type: 3}
-  m_PrefabInstance: {fileID: 6416848661152764776}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scenes/Stardust/TestScene.unity
+++ b/Assets/Scenes/Stardust/TestScene.unity
@ -1879,6 +1879,18 @@ PrefabInstance:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1564403007931083473, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1618967478166023428, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@ -1927,6 +1939,18 @@ PrefabInstance:
      propertyPath: m_Name
      value: LocalPlayer
      objectReference: {fileID: 0}
+    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.271
+      objectReference: {fileID: 0}
+    - target: {fileID: 7568009320490465417, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.309
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: e3d975a8d1b28eb4b9f646262c56653d, type: 3}
 --- !u!1 &1002460576