izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kidagine
2022-03-09 16:28:29 +01:00
parent 1d703057df
commit f5fe975cf3
10 changed files with 362 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Version.txt
View File

@@ -4,6 +4,8 @@ Version:
Patch Notes:
Changed gameplay buttons layout.
Added light attacks and animations for every character.
Changed the direction all bars progress in-game.
Changed the direction all UI bars progress in-game.
Many minor framedata changes.
Added more information for framedata in training.
Added more information for framedata in training.
Simplified hurtboxes.
Minor changes to all animations.

7
Assets/_Project/Animations/CharacterAnimations/TobiDarkAnimations/TobiDarkHeavyCrouch.anim
View File

@@ -1326,13 +1326,6 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.3
functionName: StartFrameCount
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 9
intParameter: 0
messageOptions: 0
- time: 0.38333333
functionName: UnlockMovement
data:

12
Assets/_Project/Animations/CharacterAnimations/TobiDarkAnimations/TobiDarkLightCrouch.anim
View File

@@ -64,7 +64,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.13333334
time: 0.11666667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -353,7 +353,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.11666667
value: -3.1124126e+29
inSlope: Infinity
outSlope: Infinity
@@ -501,7 +501,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.21666667
m_StopTime: 0.23333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -539,7 +539,7 @@ AnimationClip:
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.13333334
time: 0.11666667
value: 0
inSlope: Infinity
outSlope: Infinity
@@ -912,7 +912,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.13333334
time: 0.11666667
value: -3.1124126e+29
inSlope: Infinity
outSlope: Infinity
@@ -966,7 +966,7 @@ AnimationClip:
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 0.21666667
- time: 0.23333333
functionName: UnlockMovement
data:
objectReferenceParameter: {fileID: 0}

14
Assets/_Project/Scenes/GameScenes/GameScene.unity
View File

@@ -3119,7 +3119,7 @@ MonoBehaviour:
m_Follow: {fileID: 1821676146}
m_Lens:
FieldOfView: 40
OrthographicSize: 6
OrthographicSize: 5
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
@@ -4202,13 +4202,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ee34fd0a2311cf1499332a4f01184100, type: 3}
m_Name:
m_EditorClassIdentifier:
_stage: 0
_characterOne: 0
_stage: 1
_characterOne: 2
_characterTwo: 1
_assistOne: 1
_assistTwo: 0
_controllerOne: 0
_controllerTwo: 5
_controllerTwo: 2
_isTrainingMode: 1
_isOnlineMode: 0
_gameSpeed: 1
@@ -4562,7 +4562,7 @@ PrefabInstance:
- target: {fileID: 8073473789928578676, guid: 9b4cc346b13c14c4d825365f34663594, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -290234520100094163, guid: 93e500ebbc2769a4d848786e7ad37c3a, type: 3}
objectReference: {fileID: 4615509854267872986, guid: 93e500ebbc2769a4d848786e7ad37c3a, type: 3}
- target: {fileID: 8073473789928578676, guid: 9b4cc346b13c14c4d825365f34663594, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
@@ -5465,7 +5465,7 @@ Camera:
far clip plane: 5000
field of view: 40
orthographic: 1
orthographic size: 6
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -5489,7 +5489,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.33983994, z: -10}
m_LocalPosition: {x: 0, y: -0.625, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

328
Assets/_Project/Scenes/UIScenes/MainMenuScene.unity
View File

@@ -4151,7 +4151,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 51.61
value: 79.21
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -4159,7 +4159,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.805
value: -39.605
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
@@ -4203,7 +4203,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 51.61
value: 79.21
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
@@ -4239,7 +4239,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -311.82498
value: -242.825
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4267,7 +4267,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.805
value: -39.605
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
@@ -5714,7 +5714,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 106.81
value: 51.61
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -5722,7 +5722,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -53.405
value: -25.805
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
@@ -5766,7 +5766,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 106.81
value: 51.61
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
@@ -5802,7 +5802,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -182.61499
value: -127.415
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -5830,7 +5830,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -53.405
value: -25.805
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
@@ -6246,6 +6246,148 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 279306102}
m_CullTransparentMesh: 1
--- !u!1001 &284600781
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 582856004}
m_Modifications:
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 24.01
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 476.25
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
value: Simplified hurtboxes.
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435281, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Name
value: MoreInfoNote_group (5)
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.x
value: 900
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 225
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -529.04
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 26.25
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
--- !u!224 &284600782 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
m_PrefabInstance: {fileID: 284600781}
m_PrefabAsset: {fileID: 0}
--- !u!1 &289086703
GameObject:
m_ObjectHideFlags: 0
@@ -7926,7 +8068,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -311.82498
value: -438.235
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -11825,6 +11967,8 @@ RectTransform:
- {fileID: 174505881}
- {fileID: 1040961621}
- {fileID: 385009599}
- {fileID: 284600782}
- {fileID: 785185956}
m_Father: {fileID: 110976068}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15221,6 +15365,148 @@ PrefabInstance:
- {fileID: 3543166444540643264, guid: fe9aec40b1177c44b9491596f7c9e9b2, type: 3}
- {fileID: 3543166444540643266, guid: fe9aec40b1177c44b9491596f7c9e9b2, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: fe9aec40b1177c44b9491596f7c9e9b2, type: 3}
--- !u!1001 &785185955
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 582856004}
m_Modifications:
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 24.01
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 476.25
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
value: Minor changes to all animations.
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435281, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Name
value: MoreInfoNote_group (6)
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.x
value: 900
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 30
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 225
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -609.04
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
value: 26.25
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
--- !u!224 &785185956 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
m_PrefabInstance: {fileID: 785185955}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &787826274
PrefabInstance:
m_ObjectHideFlags: 0
@@ -18973,7 +19259,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 51.61
value: 24.01
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -18981,7 +19267,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.805
value: -15
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
@@ -19025,7 +19311,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 51.61
value: 30
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
@@ -19061,7 +19347,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -311.82498
value: -347.43
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -19089,7 +19375,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -25.805
value: -15
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
@@ -38949,7 +39235,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 79.21
value: 51.61
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -38957,7 +39243,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871644, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -39.605
value: -25.805
objectReference: {fileID: 0}
- target: {fileID: 8684339992983871645, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_text
@@ -39005,7 +39291,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_SizeDelta.y
value: 79.21
value: 51.61
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalPosition.x
@@ -39041,7 +39327,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -39.605
value: -25.805
objectReference: {fileID: 0}
- target: {fileID: 8684339993823435294, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -39069,7 +39355,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8684339993879517473, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}
propertyPath: m_AnchoredPosition.y
value: -39.605
value: -25.805
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ff8efce8373c43e408dd89dfe5961245, type: 3}

3
Assets/_Project/SciptableObjects/AttackScriptableObjects/TobiDarkAttacks/HeavyAttacks/2H.asset
View File

@@ -31,3 +31,6 @@ MonoBehaviour:
hurtEffect: {fileID: 6697712921357175186, guid: 42fff4f540e4cdd4b9969996164b54a8, type: 3}
hurtEffectPosition: {x: -6.3604755, y: -2.3850002}
hurtEffectRotation: 0
startUpFrames: 9
activeFrames: 11
recoveryFrames: 4

3
Assets/_Project/SciptableObjects/AttackScriptableObjects/TobiDarkAttacks/LightAttacks/2L.asset
View File

@@ -31,3 +31,6 @@ MonoBehaviour:
hurtEffect: {fileID: 6697712921357175186, guid: 42fff4f540e4cdd4b9969996164b54a8, type: 3}
hurtEffectPosition: {x: 4.28625, y: -3.7825003}
hurtEffectRotation: 0
startUpFrames: 5
activeFrames: 2
recoveryFrames: 7

2
Assets/_Project/Scripts/InputBufferItem.cs
View File

@@ -3,7 +3,7 @@ using UnityEngine;
public class InputBufferItem
{
private readonly float _timeBeforeActionsExpire = 0.29f;
private readonly float _timeBeforeActionsExpire = 0.3f;
private readonly float _timestamp;
public Func<bool> Execute;

2
Assets/_Project/Scripts/VersionUpdater.cs
View File

@@ -35,7 +35,7 @@ public class VersionUpdater : MonoBehaviour
string[] patchNotes = patchNotesWhole.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
_menuVersionText.text += versionNumber;
for (int i = 0; i < patchNotes.Length; i++)
for (int i = 0; i < 3; i++)
{
TextMeshProUGUI patchNote = Instantiate(_patchNotePrefab, _patchNotesGroup).transform.GetChild(1).GetComponent<TextMeshProUGUI>();
patchNote.text = patchNotes[i].Trim();

59
UserSettings/Layouts/default-2021.dwlt
View File

@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1920
height: 989
m_ShowMode: 4
m_Title: Animation
m_Title: Game
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 542}
m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
controlID: 46
controlID: 30
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 0
controlID: 106
controlID: 31
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 93
controlID: 32
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -189,8 +189,8 @@ MonoBehaviour:
y: 0
width: 1077
height: 417
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -209,7 +209,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: AnimationWindow
m_Name: GameView
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -218,15 +218,15 @@ MonoBehaviour:
y: 417
width: 1077
height: 522
m_MinSize: {x: 101, y: 121}
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 20}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
- {fileID: 19}
- {fileID: 20}
m_Selected: 2
m_LastSelected: 0
m_Selected: 0
m_LastSelected: 2
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -251,7 +251,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 107
controlID: 65
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -324,8 +324,8 @@ MonoBehaviour:
y: 0
width: 438
height: 939
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 24}
m_Panes:
- {fileID: 24}
@@ -648,9 +648,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -5.6716986, y: -3.0756702, z: 0.018301852}
m_Target: {x: -5.1575637, y: -3.2956138, z: 179.25798}
speed: 2
m_Value: {x: -5.6716986, y: -3.0756702, z: 0.018301852}
m_Value: {x: -5.1575637, y: -3.2956138, z: 179.25798}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -701,9 +701,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 1.9876661
m_Target: 4.512168
speed: 2
m_Value: 1.9876661
m_Value: 4.512168
m_Ortho:
m_Target: 1
speed: 2
@@ -1978,24 +1978,24 @@ MonoBehaviour:
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 762dffff
m_LastClickedID: -53898
m_ExpandedIDs: 922dffff0631ffff304effff9254ffffd056ffff7659ffff845affff18fbffffeac1000070c2000006c300007ec40000c8c5000086c700000ec8000026c80000b8ca00007ecb0000d8cb0000
scrollPos: {x: 0, y: 120}
m_SelectedIDs: a4570000
m_LastClickedID: 0
m_ExpandedIDs: b2eeffffc6eeffffdaeeffffe2eefffff0f8ffff3efaffff18fbffff765000008050000068510000a451000028520000c05200008e530000b0530000bc540000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Border_image
m_OriginalName: Border_image
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 49776
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 11}
m_SearchString:
@@ -2045,7 +2045,8 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SkipHidden: 0
m_SearchArea: 1
m_Folders: []
m_Folders:
- Assets/_Project/SciptableObjects/SpriteLibraryScriptableObjects
m_Globs: []
m_OriginalText:
m_ViewMode: 0
@@ -2059,7 +2060,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 154}
m_SelectedIDs: da490000
m_LastClickedID: 18906
m_ExpandedIDs: 00000000f8570000de600000e0600000e2600000e4600000e6600000e8600000ea600000ec600000ee600000f0600000f2600000f4600000f6600000f8600000fa600000fc600000fe60000000610000026100000461000006610000086100000a6100000c6100000e61000010610000126100001461000016610000186100001a6100001c6100001e610000206100002261000024610000
m_ExpandedIDs: 00000000f857000006610000086100000a6100000c6100000e61000010610000126100001461000016610000186100001a6100001c6100001e61000020610000226100002461000026610000286100002a6100002c6100002e61000030610000326100003461000036610000386100003a6100003c6100003e61000040610000426100004461000046610000486100004a610000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -2087,7 +2088,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 250}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff00000000f8570000de600000e0600000e2600000e4600000e6600000e8600000ea600000ec600000ee600000f0600000f2600000f4600000f6600000f8600000fa600000fc600000fe60000000610000026100000461000006610000086100000c6100000e61000010610000126100001461000016610000186100001a6100001c6100001e610000206100002261000024610000
m_ExpandedIDs: ffffffff00000000f857000006610000086100000a6100000c6100000e61000010610000126100001461000016610000186100001a6100001c6100001e61000020610000226100002461000026610000286100002a6100002c6100002e61000030610000326100003461000036610000386100003a6100003c6100003e61000040610000426100004461000046610000486100004a610000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: