Skip to content

Commit

Permalink
improvments for UI and gameplay
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmed-alnour123 committed Feb 26, 2021
1 parent eac5bf5 commit 5385280
Show file tree
Hide file tree
Showing 31 changed files with 1,312 additions and 2,358 deletions.
4 changes: 2 additions & 2 deletions Assets/Animations/Hen/Hen Controller.controller
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: hen walk
m_Speed: 5
m_Speed: 3.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
Expand Down Expand Up @@ -38,7 +38,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -8711698898658079623}
m_Position: {x: 330, y: 130, z: 0}
m_Position: {x: 250, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down
Binary file added Assets/Audio/Surprised_1-wav.wav
Binary file not shown.
36 changes: 36 additions & 0 deletions Assets/Audio/Surprised_1-wav.wav.meta

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

Binary file added Assets/Audio/jooojo.mp3
Binary file not shown.
36 changes: 36 additions & 0 deletions Assets/Audio/jooojo.mp3.meta

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

99 changes: 98 additions & 1 deletion Assets/Prefabs/Barbarian.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 6218269325283190625}
- component: {fileID: 2792526140503372825}
- component: {fileID: 2792526140503372830}
- component: {fileID: 4298206995861697877}
m_Layer: 0
m_Name: Barbarian
m_TagString: Barbarian
Expand Down Expand Up @@ -75,6 +76,102 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3ba5ed45534ad2055a191a7f52b69dfa, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!82 &4298206995861697877
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2792526140503372831}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 468945628793fe14e9085bdbc33331e1, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.15
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!95 &2792526139853047448
Animator:
serializedVersion: 3
Expand All @@ -83,7 +180,7 @@ Animator:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3026527162952843078}
m_Enabled: 0
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: e6f43b520298a2d44b9c71a292fe5c64, type: 2}
m_CullingMode: 0
Expand Down

0 comments on commit 5385280

Please sign in to comment.