mindfulminun/FebGameJam
1
0
Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed her arm glitching.

Browse Source
This commit is contained in:
MindfulMinun
2022-02-26 22:51:25 -06:00
parent 41456ba59d
commit 71ede1885c
4 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Art Final/Fuki + Seiden/seiden-move.controller
+7 -1
View File
@@ -259,6 +259,9 @@ AnimatorStateTransition:
- m_ConditionMode: 4
m_ConditionEvent: Horizontal
m_EventTreshold: -0.01
- m_ConditionMode: 2
m_ConditionEvent: Airborne
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5184000313039322506}
m_Solo: 0
@@ -311,6 +314,9 @@ AnimatorStateTransition:
- m_ConditionMode: 3
m_ConditionEvent: Horizontal
m_EventTreshold: 0.01
- m_ConditionMode: 2
m_ConditionEvent: Airborne
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1236971542150945798}
m_Solo: 0
@@ -320,7 +326,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Assets/Scenes/Game Scenes/Speed Level.unity
+14 -5
View File
@@ -595,7 +595,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 724325280980919345, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_LocalScale.x
value: -2
value: 2
objectReference: {fileID: 0}
- target: {fileID: 724325280980919345, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_LocalScale.y
@@ -2810,7 +2810,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1689002319}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -27}
m_LocalPosition: {x: 0, y: -0.74, z: -27}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5439994588421920178}
@@ -3050,7 +3050,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 724325280980919345, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 2.15
objectReference: {fileID: 0}
- target: {fileID: 724325280980919345, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_LocalPosition.z
@@ -3486,6 +3486,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 724325280980919344, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 6200000, guid: 52e104d77b96cbf4680cc9d0faad8d73, type: 2}
- target: {fileID: 724325280980919345, guid: b274944a91eb84d54a7346908db30791, type: 3}
propertyPath: m_RootOrder
value: 0
@@ -3581,6 +3585,11 @@ MonoBehaviour:
OnHit:
m_PersistentCalls:
m_Calls: []
three: {fileID: 0}
two: {fileID: 0}
one: {fileID: 0}
zero: {fileID: 0}
audioManager: {fileID: 0}
--- !u!212 &5439994586861385601
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -3721,7 +3730,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5439994588211060845}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.95, y: -3.9, z: 0}
m_LocalPosition: {x: -0.28, y: 10.77, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5439994588421920178}
@@ -3946,7 +3955,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5439994588421920179}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.2, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1689002322}
Assets/Scripts/CarScript.cs
+1 -1
View File
@@ -27,7 +27,7 @@ public class CarScript : MonoBehaviour {
Vector2 temp = absStartPosition;
absStartPosition = absEndPosition;
absEndPosition = temp;
transform.localScale = new Vector3(-transform.localScale.x, 1, 1);
transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
}
Vector2 direction = absEndPosition - rb.position;
UserSettings/EditorUserSettings.asset
-44
View File
@@ -5,50 +5,6 @@ EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-1:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
=======
RecentlyUsedScenePath-3:
>>>>>>> origin/main
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662e23e7e53078cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
=======
value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662e23e7e53078cee220eceb742a323016f6
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
>>>>>>> origin/main
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0