Skip to content

Commit

Permalink
Battle transition, photo animation, general bugfixes
Browse files Browse the repository at this point in the history
-Added in a battle transition slide
- Photo animation
- General bugfixes and typo corrections
  • Loading branch information
MoAzza98 committed Oct 10, 2023
1 parent 146fc24 commit d8107be
Show file tree
Hide file tree
Showing 85 changed files with 6,816 additions and 8,719 deletions.
10 changes: 0 additions & 10 deletions ToyoWorld/Assets/AddressableAssetsData/link.xml

This file was deleted.

53 changes: 53 additions & 0 deletions ToyoWorld/Assets/Animations/Circlewipe_start.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Circlewipe_start
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

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

15 changes: 15 additions & 0 deletions ToyoWorld/Assets/Animations/Clash.overrideController
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!221 &22100000
AnimatorOverrideController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Clash
m_Controller: {fileID: 9100000, guid: 3992ad3b85fc4594da3c82107a22e5b4, type: 2}
m_Clips:
- m_OriginalClip: {fileID: 7400000, guid: 224ef72800cae2f4b94050fa27fffd09, type: 2}
m_OverrideClip: {fileID: 7400000, guid: e60b5df2ab056fc42b2023a744eaa727, type: 2}
- m_OriginalClip: {fileID: 7400000, guid: 78fc69075ff077d4eb0a4206d433051c, type: 2}
m_OverrideClip: {fileID: 7400000, guid: c69aa62e3461bce4fbbe01ae05028551, type: 2}

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

Loading

0 comments on commit d8107be

Please sign in to comment.