Skip to content
GitLab
Commit 31d094cb authored by Tommé Nöll's avatar Tommé Nöll
Browse files

merge master; overwrite player prefab

parents 58985806 e6b80251
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 31d094cb
......@@ -17,6 +17,9 @@
# TextMesh Pro files
[Aa]ssets/TextMesh*Pro/
# Remove if you actually want to use Plugins
[Aa]ssets/Plugins*
# Visual Studio cache directory
.vs/
.vscode/
......@@ -27,6 +30,7 @@
# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
.idea/
*.csproj
*.unityproj
*.sln
......
.idea/.idea.seedling/.idea/contentModel.xml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelStore">
<e p="C:\Users\Dominik\.Rider2019.1\system\extResources" t="IncludeRecursive" />
<e p="C:\Users\Dominik\.Rider2019.1\system\resharper-host\local\Transient\ReSharperHost\v191\SolutionCaches\_seedling.1686364454.00" t="ExcludeRecursive" />
<e p="C:\Users\Dominik\Documents\seedling" t="IncludeRecursive">
<e p="Assembly-CSharp.csproj" t="IncludeRecursive" />
<e p="Assets" t="Include">
<e p="CheckforGround.cs" t="Include" />
<e p="Scripts" t="Include">
<e p="AudioManager.cs" t="Include" />
<e p="Character.cs" t="Include" />
<e p="Corruption" t="Include">
<e p="CorruptionCamera.cs" t="Include" />
<e p="CorruptionMap.cs" t="Include" />
<e p="CorruptionZone.cs" t="Include" />
</e>
<e p="Enemies" t="Include">
<e p="CrawlerWalkBehaviour.cs" t="Include" />
<e p="PlantAI.cs" t="Include" />
<e p="ShroombieMeleeBehaviour.cs" t="Include" />
<e p="ShroombieRangedBehaviour.cs" t="Include" />
<e p="ShroombieWalkBehaviour.cs" t="Include" />
<e p="sporeMovement.cs" t="Include" />
</e>
<e p="Player" t="Include">
<e p="InputManager.cs" t="Include" />
<e p="Life.cs" t="Include" />
<e p="Player.cs" t="Include" />
</e>
<e p="PostEffectScript.cs" t="Include" />
<e p="UI_Health.cs" t="Include" />
<e p="UI_SceneManager.cs" t="Include" />
</e>
<e p="Shaders" t="Include">
<e p="CorruptionZoneShader.shader" t="Include" />
<e p="PlantSurfaceShader.shader" t="Include" />
<e p="PostEffectShader.shader" t="Include" />
</e>
<e p="TextMesh Pro" t="Include">
<e p="Fonts" t="Include">
<e p="LiberationSans - OFL.txt" t="Include" />
</e>
<e p="Resources" t="Include">
<e p="LineBreaking Following Characters.txt" t="Include" />
<e p="LineBreaking Leading Characters.txt" t="Include" />
<e p="Shaders" t="Include">
<e p="TMP_Bitmap-Custom-Atlas.shader" t="Include" />
<e p="TMP_Bitmap-Mobile.shader" t="Include" />
<e p="TMP_Bitmap.shader" t="Include" />
<e p="TMP_SDF Overlay.shader" t="Include" />
<e p="TMP_SDF-Mobile Masking.shader" t="Include" />
<e p="TMP_SDF-Mobile Overlay.shader" t="Include" />
<e p="TMP_SDF-Mobile.shader" t="Include" />
<e p="TMP_SDF-Surface-Mobile.shader" t="Include" />
<e p="TMP_SDF-Surface.shader" t="Include" />
<e p="TMP_SDF.shader" t="Include" />
<e p="TMP_Sprite.shader" t="Include" />
<e p="TMPro.cginc" t="Include" />
<e p="TMPro_Properties.cginc" t="Include" />
<e p="TMPro_Surface.cginc" t="Include" />
</e>
</e>
<e p="Sprites" t="Include">
<e p="EmojiOne Attribution.txt" t="Include" />
</e>
</e>
</e>
<e p="obj" t="ExcludeRecursive" />
<e p="Packages" t="ExcludeRecursive" />
<e p="seedling.sln" t="IncludeFlat" />
<e p="Temp\bin" t="ExcludeRecursive" />
</e>
</component>
</project>
\ No newline at end of file
.idea/.idea.seedling/.idea/indexLayout.xml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ContentModelUserStore">
<attachedFolders />
<explicitIncludes>
<Path>Library/PackageCache/com.unity.ads@2.0.8</Path>
<Path>Library/PackageCache/com.unity.analytics@3.3.2</Path>
<Path>Library/PackageCache/com.unity.collab-proxy@1.2.16</Path>
<Path>Library/PackageCache/com.unity.purchasing@2.0.6</Path>
<Path>Library/PackageCache/com.unity.textmeshpro@2.0.0</Path>
<Path>Packages</Path>
<Path>ProjectSettings</Path>
</explicitIncludes>
<explicitExcludes>
<Path>.git</Path>
<Path>.idea</Path>
<Path>.vs</Path>
<Path>Library</Path>
<Path>Logs</Path>
<Path>Temp</Path>
<Path>obj</Path>
</explicitExcludes>
</component>
</project>
\ No newline at end of file
.idea/.idea.seedling/.idea/modules.xml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.seedling/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.seedling/riderModule.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/.idea.seedling/.idea/vcs.xml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/.idea.seedling/.idea/workspace.xml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="733d3c65-0808-4521-9eb8-db65378fcec2" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/Scripts/UI_Health.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="51" column="68" selection-start-line="51" selection-start-column="68" selection-end-line="51" selection-end-column="68" />
<folding>
<marker date="1559250519818" expanded="true" signature="6:114" ph="..." />
<marker date="1559250519818" expanded="true" signature="154:1362" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="324:387" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="413:515" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="542:1360" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="605:727" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="789:912" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="974:1098" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="1160:1354" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/Life.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="26" column="9" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
<folding>
<marker date="1559246913589" expanded="true" signature="6:92" ph="..." />
<marker date="1559246913589" expanded="true" signature="127:514" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="221:251" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="309:330" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="386:512" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="466:506" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Player/Player.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/UI_SceneManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Player/InputManager.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Player/Life.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/UI_Health.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Enemies/sporeMovement.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Assets/Scripts/Player/Player.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/SceneManager.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Player/InputManager.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/UI_SceneManager.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/Player/Life.cs" />
<option value="$PROJECT_DIR$/Assets/Scripts/UI_Health.cs" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="170" />
<option name="y" value="91" />
<option name="width" value="1026" />
<option name="height" value="546" />
</component>
<component name="ProjectView">
<navigator currentView="UnityExplorer" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="AssemblyExplorer" />
<pane id="UnityExplorer">
<option name="show-hidden-items" value="false" />
<option name="show-project-names" value="true" />
</pane>
<pane id="SolutionExplorer">
<option name="show-all-files" value="false" />
</pane>
<pane id="FileSystemExplorer" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="Discover.Launch.Via.Unity" value="true" />
<property name="Rider.DefaultBreakpoints.AreToggled" value="true" />
<property name="Rider.ProjectViewActivator.IsNotFirstRun" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
<configuration name="Attach to Unity Editor &amp; Play" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="UNITY_ATTACH_AND_PLAY" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="userSelectedPid" value="false" />
<method v="2" />
</configuration>
<configuration name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" show_console_on_std_err="false" show_console_on_std_out="false" port="50000" address="localhost">
<option name="allowRunningInParallel" value="false" />
<option name="listenPortForConnections" value="false" />
<option name="pid" />
<option name="userSelectedPid" value="false" />
<method v="2" />
</configuration>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="733d3c65-0808-4521-9eb8-db65378fcec2" name="Default Changelist" comment="" />
<created>1559225649697</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1559225649697</updated>
<workItem from="1559225707665" duration="7193000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="7193000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="170" y="91" width="1026" height="546" extended-state="0" />
<layout>
<window_info id="Favorites" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24948241" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="NuGet" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="bottom" id="Unity" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Version Control" />
<window_info anchor="bottom" id="Unit Tests" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Performance Profiler" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="Errors In Solution" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="Unit Tests Coverage" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="true" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="EditMode" />
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<breakpoint enabled="true" suspend="NONE" type="DotNet Exception Breakpoints">
<properties exception="System.Threading.ThreadAbortException" displayValue="System.Threading.ThreadAbortException" />
<option name="timeStamp" value="1" />
</breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/Player.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="14" column="28" lean-forward="true" selection-start-line="14" selection-start-column="28" selection-end-line="14" selection-end-column="28" />
<folding>
<marker date="1559225917861" expanded="true" signature="6:78" ph="..." />
<marker date="1559225917861" expanded="true" signature="111:409" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="309:322" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="341:354" ph="{...}" />
<marker date="1559225917861" expanded="true" signature="386:407" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/DamageTestScript.cs">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/SceneManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59">
<caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/InputManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
<folding>
<marker date="1559236875213" expanded="false" signature="6:78" ph="..." />
<marker date="1559236875213" expanded="true" signature="121:1359" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="438:917" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="487:540" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="571:611" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="661:706" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="758:805" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="941:1271" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="965:1038" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="1067:1144" ph="{...}" />
<marker date="1559236875213" expanded="true" signature="1315:1357" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/UI_SceneManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="49" column="5" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
<folding>
<marker date="1559245746919" expanded="false" signature="6:149" ph="..." />
<marker date="1559245746919" expanded="true" signature="195:1026" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="234:317" ph="/* public GameObject mainscene; ... */" />
<marker date="1559245746919" expanded="true" signature="334:355" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="413:434" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="469:511" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="554:678" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="723:808" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="840:880" ph="{...}" />
<marker date="1559245746919" expanded="true" signature="915:1024" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Player/Life.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="26" column="9" selection-start-line="26" selection-start-column="9" selection-end-line="26" selection-end-column="9" />
<folding>
<marker date="1559246913589" expanded="true" signature="6:92" ph="..." />
<marker date="1559246913589" expanded="true" signature="127:514" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="221:251" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="309:330" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="386:512" ph="{...}" />
<marker date="1559246913589" expanded="true" signature="466:506" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemies/sporeMovement.cs">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<marker date="1559227404947" expanded="false" signature="6:78" ph="..." />
<marker date="1559227404947" expanded="true" signature="122:918" ph="{...}" />
<marker date="1559227404947" expanded="true" signature="291:485" ph="{...}" />
<marker date="1559227404947" expanded="true" signature="543:657" ph="{...}" />
<marker date="1559227404947" expanded="true" signature="713:916" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Scripts/UI_Health.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="51" column="68" selection-start-line="51" selection-start-column="68" selection-end-line="51" selection-end-column="68" />
<folding>
<marker date="1559250519818" expanded="true" signature="6:114" ph="..." />
<marker date="1559250519818" expanded="true" signature="154:1362" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="324:387" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="413:515" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="542:1360" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="605:727" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="789:912" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="974:1098" ph="{...}" />
<marker date="1559250519818" expanded="true" signature="1160:1354" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
.idea/.idea.seedling/riderModule.iml deleted 100644 → 0
View file @ 58985806
<?xml version="1.0" encoding="UTF-8"?>
<module type="RIDER_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../.." />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
Assets/Plugins.meta → Assets/Animations/Enemies.meta
View file @ 31d094cb
fileFormatVersion: 2
guid: e86e0b261769faa4f911ea200102aa20
guid: 6dab31ca60a1c874d9e4ff3e418149be
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
Assets/Animations/CrawlerAnimator.controller → Assets/Animations/Enemies/CrawlerAnimator.controller
View file @ 31d094cb
......@@ -13,7 +13,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
isIdle: 0
isWalkingRight: 1
alertDistance: 10
backToIdleDistance: 15
speed: 3
......@@ -82,7 +81,6 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 8632554525025145564}
- {fileID: 8227272925300115454}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
......@@ -98,56 +96,6 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-5742401130475968656
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Alerted
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -7097322385695646406}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-5435497801864865747
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: MovingRight
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -2126546418195010665}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1107 &-5123846830434819261
AnimatorStateMachine:
serializedVersion: 5
......@@ -166,20 +114,14 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -2126546418195010665}
m_Position: {x: 540, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: 995698411359686797}
m_Position: {x: 210, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: 6309730053966185214}
m_Position: {x: 210, y: 100, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 870, y: 600, z: 0}
m_AnyStatePosition: {x: 810, y: 50, z: 0}
m_EntryPosition: {x: 560, y: 10, z: 0}
m_ExitPosition: {x: 870, y: 670, z: 0}
m_ExitPosition: {x: 810, y: 10, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8415805674711102845}
--- !u!114 &-4336568722481481660
......@@ -242,7 +184,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
isIdle: 1
isWalkingRight: 1
alertDistance: 10
backToIdleDistance: 15
speed: 1
......@@ -289,12 +230,11 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MoveRight
m_Name: Move
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -7665864225873023536}
- {fileID: -87046515038896864}
m_StateMachineBehaviours:
- {fileID: -9194874249604500891}
m_Position: {x: 50, y: 50, z: 0}
......@@ -358,56 +298,6 @@ MonoBehaviour:
myTransform: {fileID: 0}
myWidth: 0
myHeight: 0
--- !u!1101 &-647988718983959964
AnimatorStateTransition: