Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pv7 #13

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Pv7 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8547290
Added more SFX
Pikachuxxxx Jun 7, 2020
c9c00f8
Added bgm's and tuned bear sequence
Pikachuxxxx Jun 8, 2020
141ff92
remoced large files
Pikachuxxxx Jun 8, 2020
0f82ec0
Restored Project
Pikachuxxxx Jun 8, 2020
a738983
Added pause menu and dialogue system
Pikachuxxxx Jun 8, 2020
a468910
Finished along with builds
Pikachuxxxx Jun 10, 2020
4558f2b
Fixed shading and UI issues for mac and windows
Pikachuxxxx Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.wav filter=lfs diff=lfs merge=lfs -text
23 changes: 23 additions & 0 deletions WGJ-146/.vs/WGJ-146/xs/UserPrefs 4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Properties StartupConfiguration="{864886A1-6679-790E-754A-5DDCF294FA47}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/SFXManager.cs">
<Files>
<File FileName="Assets/Scripts/Tag Holder.cs" Line="57" Column="45" IsPinned="True" />
<File FileName="Assets/Scripts/Player/PlayerState.cs" Line="16" Column="18" />
<File FileName="Assets/Scripts/ReverseAnimationClip.cs" />
<File FileName="Assets/Scripts/BearAI.cs" Line="37" Column="1" />
<File FileName="Assets/Scripts/Player/PlayerDamage.cs" />
<File FileName="Assets/Scripts/Rocks.cs" />
<File FileName="Assets/Scripts/AvalancheSpawnner.cs" />
<File FileName="Assets/Scripts/Player/PlayerMovement.cs" Line="129" Column="1" NotebookId="1" />
<File FileName="Assets/Scripts/Player/PlayerCollisions.cs" Line="53" Column="39" NotebookId="1" />
<File FileName="Assets/Scripts/SFXManager.cs" Line="9" Column="42" NotebookId="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="103a5a23-967e-493a-924a-06c853044650" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
21 changes: 13 additions & 8 deletions WGJ-146/.vs/WGJ-146/xs/UserPrefs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
<Properties StartupConfiguration="{864886A1-6679-790E-754A-5DDCF294FA47}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Player/PlayerMovement.cs">
<Files>
<File FileName="Assets/Scripts/Tag Holder.cs" Line="16" Column="49" IsPinned="True" />
<File FileName="Assets/Scripts/Player/PlayerState.cs" Line="48" Column="1" />
<File FileName="Assets/Scripts/ReverseAnimationClip.cs" Line="31" Column="59" />
<File FileName="Assets/Scripts/Tag Holder.cs" Line="34" Column="32" IsPinned="True" />
<File FileName="Assets/Scripts/Player/PlayerState.cs" Line="198" Column="1" />
<File FileName="Assets/Scripts/ReverseAnimationClip.cs" />
<File FileName="Assets/Scripts/BearAI.cs" />
<File FileName="Assets/Scripts/Player/PlayerDamage.cs" />
<File FileName="Assets/Scripts/SFXManager.cs" Line="17" Column="42" />
<File FileName="Assets/Scripts/Rocks.cs" Line="9" Column="40" />
<File FileName="Assets/Scripts/Player/PlayerMovement.cs" Line="38" Column="1" NotebookId="1" />
<File FileName="Assets/Scripts/Player/PlayerCollisions.cs" NotebookId="1" />
<File FileName="Assets/Scripts/Rocks.cs" />
<File FileName="Assets/Scripts/AvalancheSpawnner.cs" />
<File FileName="Assets/Scripts/Player/PlayerMovement.cs" Line="128" Column="1" NotebookId="1" />
<File FileName="Assets/Scripts/Player/PlayerCollisions.cs" Line="73" Column="1" NotebookId="1" />
<File FileName="Assets/Scripts/SFXManager.cs" Line="1" Column="1" NotebookId="1" />
<File FileName="Assets/Scripts/UI scripts/PauseMenu.cs" NotebookId="1" />
<File FileName="Assets/Scripts/UI scripts/Dialog.cs" Line="64" Column="1" NotebookId="1" />
<File FileName="Assets/CreditsManager.cs" Line="11" Column="1" NotebookId="1" />
<File FileName="Assets/MainMenu.cs" Line="19" Column="1" NotebookId="1" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="7e8ce97d-4cc7-43ad-8818-bc88fd3b5159" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="e2f76dbe-5cd8-4b25-96cf-01e02f2879e0" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
Expand Down
2 changes: 1 addition & 1 deletion WGJ-146/.vs/WGJ-146/xs/project-cache/Assembly-CSharp-Debug.json
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions WGJ-146/Assembly-CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_2019_3_12;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_OSX;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_SPATIALTRACKING;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;UNITY_POST_PROCESSING_STACK_V2;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_2019_3_12;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;UNITY_POST_PROCESSING_STACK_V2;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
Expand All @@ -48,7 +48,7 @@
<ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<UnityProjectGenerator>Unity/VSTU</UnityProjectGenerator>
<UnityProjectType>Game:1</UnityProjectType>
<UnityBuildTarget>StandaloneOSX:2</UnityBuildTarget>
<UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
<UnityVersion>2019.3.12f1</UnityVersion>
</PropertyGroup>
<ItemGroup>
Expand All @@ -63,8 +63,11 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\CreditsManager.cs" />
<Compile Include="Assets\MainMenu.cs" />
<Compile Include="Assets\Scripts\AvalancheSpawnner.cs" />
<Compile Include="Assets\Scripts\BearAI.cs" />
<Compile Include="Assets\Scripts\Player\DialogueSystem.cs" />
<Compile Include="Assets\Scripts\Player\PlayerCollisions.cs" />
<Compile Include="Assets\Scripts\Player\PlayerDamage.cs" />
<Compile Include="Assets\Scripts\Player\PlayerMovement.cs" />
Expand All @@ -74,6 +77,10 @@
<Compile Include="Assets\Scripts\SFXManager.cs" />
<Compile Include="Assets\Scripts\Seagull.cs" />
<Compile Include="Assets\Scripts\Tag Holder.cs" />
<Compile Include="Assets\Scripts\UI scripts\Dialog.cs" />
<Compile Include="Assets\Scripts\UI scripts\PauseMenu.cs" />
<Compile Include="Assets\[Imported Assets]\Kira\Characters\Kira\Demo\DemoStuff\Customizable.cs" />
<Compile Include="Assets\[Imported Assets]\Kira\Characters\Kira\Demo\DemoStuff\DragToRotate.cs" />
<Compile Include="Assets\[Imported Assets]\Low Poly Animated Animals\- Scripts\AnimationControl.cs" />
<Compile Include="Assets\[Imported Assets]\Low Poly Animated Animals\- Scripts\DeathButtonControl.cs" />
<Compile Include="Assets\[Imported Assets]\Low Poly Animated Animals\- Scripts\KillSwitch.cs" />
Expand Down Expand Up @@ -142,7 +149,6 @@
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\EdgeDetectNormals 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\ScreenSpaceRaytrace 2.cginc" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap.shader" />
<None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL 2.txt" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\VignettingShader.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\ColorCorrectionCurves.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\GrayscaleEffect 2.shader" />
Expand All @@ -163,22 +169,21 @@
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\MinMaxReduction 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\TwirlEffect.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Custom-Atlas 2.shader" />
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution 2.txt" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Apply.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\Contrast Stretch\Adaptation.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\VignetteShader 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\SSAOShader 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA2 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\LensFlareCreate.shader" />
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Following Characters 2.txt" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\MotionBlurClear 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom 2.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile 2.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\CameraMotionBlur.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\ScreenSpaceAmbientObscurance.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\SimpleClear 2.shader" />
<None Include="Assets\[Imported Assets]\Kira\Characters\Kira\Demo\DemoStuff\Raleway\OFL.txt" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\CreaseApply.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BrightPassFilter2 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_Antialiasing\FXAA3Console.shader" />
Expand Down Expand Up @@ -251,7 +256,6 @@
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\ChromaticAberrationShader.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\ScreenSpaceAmbientObscurance 2.shader" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrainDX11.shader" />
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters 2.txt" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\_DepthOfField\SeparableWeightedBlurDof34.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Properties 2.cginc" />
<None Include="Assets\[Imported Assets]\Low Poly Animated Animals\Standard Assets\Effects\ImageEffects\Shaders\NoiseAndGrain 2.shader" />
Expand Down
72 changes: 72 additions & 0 deletions WGJ-146/Assets/Animations/Canvas.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-8652414414589119925
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: StartGame
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: 7391f12aaf17e4c2aa96ad6ad8967bb9, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-4413864833629492811
AnimatorStateMachine:
serializedVersion: 5
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: -8652414414589119925}
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: -8652414414589119925}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Canvas
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4413864833629492811}
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}
8 changes: 8 additions & 0 deletions WGJ-146/Assets/Animations/Canvas.controller.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 34 additions & 25 deletions WGJ-146/Assets/Animations/Controllers/Father AC.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,12 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: standUp
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -455,10 +461,11 @@ AnimatorStateMachine:
m_AnyStateTransitions:
- {fileID: 6652357388057058786}
- {fileID: 3389852998556812840}
- {fileID: 5220547078884697865}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: -40, y: -70, z: 0}
m_AnyStatePosition: {x: -320, y: -80, z: 0}
m_EntryPosition: {x: -30, y: 140, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
Expand Down Expand Up @@ -591,6 +598,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &5220547078884697865
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: standUp
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4117760711071428222}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6652357388057058786
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -653,8 +685,7 @@ AnimatorState:
m_Name: Sitting Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 8433431294113676558}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand All @@ -670,25 +701,3 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &8433431294113676558
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4117760711071428222}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 2
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
Loading