Skip to content

顺
顺职VR迷宫游戏教学
Unverified Commit eba16d51 authored by mattdatwork's avatar mattdatwork Committed by GitHub
Browse files
Options

Merge pull request #20 from Unity-Technologies/fix-throwangularvelocity 

Change all m_ThrowAngularVelocityScale values to 1
parents cf12db76 67a42182
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 12 deletions
VR/Assets/Prefabs/LlamaBubbleGunPrefab.prefab
View file @ eba16d51
...@@ -255,7 +255,7 @@ MonoBehaviour: ...@@ -255,7 +255,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!65 &306082267053725907 --- !u!65 &306082267053725907
BoxCollider: BoxCollider:
......
VR/Assets/Scenes/WorldInteraction.unity
View file @ eba16d51
...@@ -928,7 +928,7 @@ MonoBehaviour: ...@@ -928,7 +928,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &233368269 --- !u!54 &233368269
Rigidbody: Rigidbody:
...@@ -2176,7 +2176,7 @@ MonoBehaviour: ...@@ -2176,7 +2176,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &752517576 --- !u!54 &752517576
Rigidbody: Rigidbody:
...@@ -3272,7 +3272,7 @@ MonoBehaviour: ...@@ -3272,7 +3272,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1088503777 --- !u!54 &1088503777
Rigidbody: Rigidbody:
...@@ -3731,7 +3731,7 @@ MonoBehaviour: ...@@ -3731,7 +3731,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1146976356 --- !u!54 &1146976356
Rigidbody: Rigidbody:
...@@ -4602,7 +4602,7 @@ MonoBehaviour: ...@@ -4602,7 +4602,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1438830973 --- !u!54 &1438830973
Rigidbody: Rigidbody:
...@@ -5158,7 +5158,7 @@ MonoBehaviour: ...@@ -5158,7 +5158,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1516089320 --- !u!54 &1516089320
Rigidbody: Rigidbody:
...@@ -6465,7 +6465,7 @@ MonoBehaviour: ...@@ -6465,7 +6465,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1875956803 --- !u!54 &1875956803
Rigidbody: Rigidbody:
...@@ -7254,7 +7254,7 @@ MonoBehaviour: ...@@ -7254,7 +7254,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &2005941299 --- !u!54 &2005941299
Rigidbody: Rigidbody:
......
VR/Assets/Scenes/WorldInteractionDemo.unity
View file @ eba16d51
...@@ -7699,7 +7699,7 @@ MonoBehaviour: ...@@ -7699,7 +7699,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!65 &1174435681032161 --- !u!65 &1174435681032161
BoxCollider: BoxCollider:
...@@ -8031,7 +8031,7 @@ MonoBehaviour: ...@@ -8031,7 +8031,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!65 &1544310753573365 --- !u!65 &1544310753573365
BoxCollider: BoxCollider:
...@@ -8208,7 +8208,7 @@ MonoBehaviour: ...@@ -8208,7 +8208,7 @@ MonoBehaviour:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
m_ThrowVelocityScale: 1.5 m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 0.25 m_ThrowAngularVelocityScale: 1
m_GravityOnDetach: 0 m_GravityOnDetach: 0
--- !u!54 &1622505853958277 --- !u!54 &1622505853958277
Rigidbody: Rigidbody:
...@@ -10887,5 +10887,10 @@ PrefabInstance: ...@@ -10887,5 +10887,10 @@ PrefabInstance:
propertyPath: m_InteractionLayerMask.m_Bits propertyPath: m_InteractionLayerMask.m_Bits
value: 55 value: 55
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7606424657617587099, guid: cca5e4e0da45560479c022557d04fa1d,
type: 3}
propertyPath: m_ThrowAngularVelocityScale
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cca5e4e0da45560479c022557d04fa1d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: cca5e4e0da45560479c022557d04fa1d, type: 3}
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