-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #181 from XREAL-SNU/#156_Client_Boat
#156 Boat System in MainRoom
- Loading branch information
Showing
685 changed files
with
68,775 additions
and
1,184 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
43 changes: 43 additions & 0 deletions
43
Assets/StaticAssets/Boat/Animations/Row Animator.controller
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!91 &9100000 | ||
| AnimatorController: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Row Animator | ||
| serializedVersion: 5 | ||
| m_AnimatorParameters: [] | ||
| m_AnimatorLayers: | ||
| - serializedVersion: 5 | ||
| m_Name: Base Layer | ||
| m_StateMachine: {fileID: 1440646578970505598} | ||
| m_Mask: {fileID: 0} | ||
| m_Motions: [] | ||
| m_Behaviours: [] | ||
| m_BlendingMode: 0 | ||
| m_SyncedLayerIndex: -1 | ||
| m_DefaultWeight: 0 | ||
| m_IKPass: 0 | ||
| m_SyncedLayerAffectsTiming: 0 | ||
| m_Controller: {fileID: 9100000} | ||
| --- !u!1107 &1440646578970505598 | ||
| AnimatorStateMachine: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Base Layer | ||
| m_ChildStates: [] | ||
| m_ChildStateMachines: [] | ||
| m_AnyStateTransitions: [] | ||
| m_EntryTransitions: [] | ||
| m_StateMachineTransitions: {} | ||
| m_StateMachineBehaviours: [] | ||
| m_AnyStatePosition: {x: 50, y: 20, z: 0} | ||
| m_EntryPosition: {x: 50, y: 120, z: 0} | ||
| m_ExitPosition: {x: 800, y: 120, z: 0} | ||
| m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
| m_DefaultState: {fileID: 0} |
8 changes: 8 additions & 0 deletions
8
Assets/StaticAssets/Boat/Animations/Row Animator.controller.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!91 &9100000 | ||
| AnimatorController: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Row | ||
| serializedVersion: 5 | ||
| m_AnimatorParameters: [] | ||
| m_AnimatorLayers: | ||
| - serializedVersion: 5 | ||
| m_Name: Base Layer | ||
| m_StateMachine: {fileID: 3792081319698426589} | ||
| m_Mask: {fileID: 0} | ||
| m_Motions: [] | ||
| m_Behaviours: [] | ||
| m_BlendingMode: 0 | ||
| m_SyncedLayerIndex: -1 | ||
| m_DefaultWeight: 0 | ||
| m_IKPass: 0 | ||
| m_SyncedLayerAffectsTiming: 0 | ||
| m_Controller: {fileID: 9100000} | ||
| --- !u!1107 &3792081319698426589 | ||
| AnimatorStateMachine: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Base Layer | ||
| m_ChildStates: | ||
| - serializedVersion: 1 | ||
| m_State: {fileID: 5421160833722688368} | ||
| m_Position: {x: 200, y: 0, z: 0} | ||
| m_ChildStateMachines: [] | ||
| m_AnyStateTransitions: [] | ||
| m_EntryTransitions: [] | ||
| m_StateMachineTransitions: {} | ||
| m_StateMachineBehaviours: [] | ||
| m_AnyStatePosition: {x: 50, y: 20, z: 0} | ||
| m_EntryPosition: {x: 50, y: 120, z: 0} | ||
| m_ExitPosition: {x: 800, y: 120, z: 0} | ||
| m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
| m_DefaultState: {fileID: 5421160833722688368} | ||
| --- !u!1102 &5421160833722688368 | ||
| AnimatorState: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Rowing | ||
| m_Speed: 1 | ||
| m_CycleOffset: 0 | ||
| m_Transitions: [] | ||
| m_StateMachineBehaviours: [] | ||
| m_Position: {x: 50, y: 50, z: 0} | ||
| m_IKOnFeet: 0 | ||
| m_WriteDefaultValues: 1 | ||
| m_Mirror: 0 | ||
| m_SpeedParameterActive: 0 | ||
| m_MirrorParameterActive: 0 | ||
| m_CycleOffsetParameterActive: 0 | ||
| m_TimeParameterActive: 0 | ||
| m_Motion: {fileID: 7400000, guid: 1f4bdfe0a3d411b43838f971ee123e96, type: 2} | ||
| m_Tag: | ||
| m_SpeedParameter: | ||
| m_MirrorParameter: | ||
| m_CycleOffsetParameter: | ||
| m_TimeParameter: |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.