Skip to content

Commit 0cdcd64

Browse files
committed
New art assets
1 parent e47d83f commit 0cdcd64

30 files changed

+3358
-144
lines changed

UOP1_Project/Assets/Art/Characters/FryKing/Animation/FryKing.controller

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ AnimatorStateMachine:
3939
m_ChildStates:
4040
- serializedVersion: 1
4141
m_State: {fileID: 7462806247995721579}
42-
m_Position: {x: 193.81702, y: 315.13092, z: 0}
42+
m_Position: {x: 190, y: 320, z: 0}
4343
- serializedVersion: 1
4444
m_State: {fileID: -5142550071235473073}
4545
m_Position: {x: 510, y: 320, z: 0}
@@ -67,7 +67,7 @@ AnimatorController:
6767
m_DefaultFloat: 0
6868
m_DefaultInt: 0
6969
m_DefaultBool: 0
70-
m_Controller: {fileID: 0}
70+
m_Controller: {fileID: 9100000}
7171
m_AnimatorLayers:
7272
- serializedVersion: 5
7373
m_Name: Base Layer
@@ -98,10 +98,10 @@ AnimatorStateTransition:
9898
m_Mute: 0
9999
m_IsExit: 0
100100
serializedVersion: 3
101-
m_TransitionDuration: 0.25
101+
m_TransitionDuration: 0.5
102102
m_TransitionOffset: 0
103103
m_ExitTime: 0.9906133
104-
m_HasExitTime: 1
104+
m_HasExitTime: 0
105105
m_HasFixedDuration: 1
106106
m_InterruptionSource: 0
107107
m_OrderedInterruption: 1
@@ -123,7 +123,7 @@ AnimatorStateTransition:
123123
m_Mute: 0
124124
m_IsExit: 0
125125
serializedVersion: 3
126-
m_TransitionDuration: 0.1
126+
m_TransitionDuration: 0.5
127127
m_TransitionOffset: 0
128128
m_ExitTime: 0.96231157
129129
m_HasExitTime: 0

UOP1_Project/Assets/Art/Characters/FryKing/Animation/idle.fbx.meta

Lines changed: 30 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Characters/FryKing/Animation/talk.fbx.meta

Lines changed: 30 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Loading

UOP1_Project/Assets/Art/Nature/Ground/GroundDirty_Albedo.png.meta

Lines changed: 92 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Art/Nature/Tree/Tree.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Material:
6868
- _Glossiness: 0
6969
- _GlossyReflections: 0
7070
- _LightProbeContribution: 1
71-
- _MainTint_VariationIntensity: 1
71+
- _MainTint_VariationIntensity: 0.3
7272
- _Metallic: 0
7373
- _OcclusionStrength: 1
7474
- _OutlineDepthSensitivity: 0
@@ -92,7 +92,7 @@ Material:
9292
- _Color: {r: 1, g: 1, b: 1, a: 1}
9393
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
9494
- _MainColor: {r: 1, g: 1, b: 1, a: 1}
95-
- _MainTint: {r: 0.7799547, g: 0.8018868, b: 0, a: 0}
95+
- _MainTint: {r: 0.8018868, g: 0.6990357, b: 0.4274208, a: 0}
9696
- _Offset: {r: 0, g: 0, b: 0, a: 0}
9797
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
9898
- _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
95.6 KB
Binary file not shown.

UOP1_Project/Assets/Art/Nature/Tree/Tree2.FBX.meta

Lines changed: 97 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)