BIN
Assets/.DS_Store
vendored
BIN
Assets/.DS_Store
vendored
Binary file not shown.
@@ -271,6 +271,8 @@ MonoBehaviour:
|
|||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
terminalVelocity: -15
|
terminalVelocity: -15
|
||||||
|
<<<<<<< Updated upstream
|
||||||
|
=======
|
||||||
--- !u!111 &6769589999303328011
|
--- !u!111 &6769589999303328011
|
||||||
Animation:
|
Animation:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -301,6 +303,10 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
blockArea: {fileID: 4413221056628714154}
|
blockArea: {fileID: 4413221056628714154}
|
||||||
blocking: 0
|
blocking: 0
|
||||||
|
<<<<<<< Updated upstream
|
||||||
|
>>>>>>> Stashed changes
|
||||||
|
=======
|
||||||
|
>>>>>>> Stashed changes
|
||||||
--- !u!1 &1648017802882051395
|
--- !u!1 &1648017802882051395
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
Reference in New Issue
Block a user