Skip to content

Commit b105a5e

Browse files
committed
Fix animations and lighting. Also adds objects to horizon
1 parent 659bfde commit b105a5e

File tree

12 files changed

+597
-308
lines changed

12 files changed

+597
-308
lines changed

Assets/Animations.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: BoximonWalking
10+
serializedVersion: 5
11+
m_AnimatorParameters: []
12+
m_AnimatorLayers:
13+
- serializedVersion: 5
14+
m_Name: Base Layer
15+
m_StateMachine: {fileID: 6719963037983322705}
16+
m_Mask: {fileID: 0}
17+
m_Motions: []
18+
m_Behaviours: []
19+
m_BlendingMode: 0
20+
m_SyncedLayerIndex: -1
21+
m_DefaultWeight: 0
22+
m_IKPass: 0
23+
m_SyncedLayerAffectsTiming: 0
24+
m_Controller: {fileID: 9100000}
25+
--- !u!1107 &6719963037983322705
26+
AnimatorStateMachine:
27+
serializedVersion: 5
28+
m_ObjectHideFlags: 1
29+
m_CorrespondingSourceObject: {fileID: 0}
30+
m_PrefabInstance: {fileID: 0}
31+
m_PrefabAsset: {fileID: 0}
32+
m_Name: Base Layer
33+
m_ChildStates:
34+
- serializedVersion: 1
35+
m_State: {fileID: 8787850266531920696}
36+
m_Position: {x: 400, y: 110, z: 0}
37+
m_ChildStateMachines: []
38+
m_AnyStateTransitions: []
39+
m_EntryTransitions: []
40+
m_StateMachineTransitions: {}
41+
m_StateMachineBehaviours: []
42+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
43+
m_EntryPosition: {x: 50, y: 120, z: 0}
44+
m_ExitPosition: {x: 800, y: 120, z: 0}
45+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
46+
m_DefaultState: {fileID: 8787850266531920696}
47+
--- !u!1102 &8787850266531920696
48+
AnimatorState:
49+
serializedVersion: 5
50+
m_ObjectHideFlags: 1
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_Name: Walk In Place
55+
m_Speed: 1
56+
m_CycleOffset: 0
57+
m_Transitions: []
58+
m_StateMachineBehaviours: []
59+
m_Position: {x: 50, y: 50, z: 0}
60+
m_IKOnFeet: 0
61+
m_WriteDefaultValues: 1
62+
m_Mirror: 0
63+
m_SpeedParameterActive: 0
64+
m_MirrorParameterActive: 0
65+
m_CycleOffsetParameterActive: 0
66+
m_TimeParameterActive: 0
67+
m_Motion: {fileID: 7400000, guid: 29aefb5f354ef414099d5d72f4702cf7, type: 3}
68+
m_Tag:
69+
m_SpeedParameter:
70+
m_MirrorParameter:
71+
m_CycleOffsetParameter:
72+
m_TimeParameter:

Assets/Animations/BoximonWalking.controller.meta

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

Assets/Free/Desert Rock/Materials/DesertRock512 Displacement.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ Material:
3737
m_Offset: {x: 0, y: 0}
3838
- _EmissionMap:
3939
m_Texture: {fileID: 0}
40-
m_Scale: {x: 1, y: 1}
40+
m_Scale: {x: 100, y: 100}
4141
m_Offset: {x: 0, y: 0}
4242
- _MainTex:
4343
m_Texture: {fileID: 2800000, guid: 1c57985b1706ab1479cc79b226bd6b26, type: 3}
44-
m_Scale: {x: 1, y: 1}
44+
m_Scale: {x: 100, y: 100}
4545
m_Offset: {x: 0, y: 0}
4646
- _MetallicGlossMap:
4747
m_Texture: {fileID: 0}

Assets/Models.meta

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

Assets/Models/Rocks.fbx

42.1 KB
Binary file not shown.

Assets/Models/Rocks.fbx.meta

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

Assets/Models/Rocks2.fbx

65.5 KB
Binary file not shown.

Assets/Models/Rocks2.fbx.meta

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

Assets/Prefabs/Mob Fire.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ Animator:
702702
m_GameObject: {fileID: 5709142836278231614}
703703
m_Enabled: 1
704704
m_Avatar: {fileID: 9000000, guid: ab49f3cef633f1d4c84f8c46ec6c0b74, type: 3}
705-
m_Controller: {fileID: 9100000, guid: cad4cd74f41924a4bbcbe916d2f9cb9b, type: 2}
705+
m_Controller: {fileID: 9100000, guid: c8a6f4348cd3c38e898d8e25f58e7fd5, type: 2}
706706
m_CullingMode: 0
707707
m_UpdateMode: 0
708708
m_ApplyRootMotion: 0

Assets/Prefabs/Mob Water.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Animator:
150150
m_GameObject: {fileID: 3101781604969574382}
151151
m_Enabled: 1
152152
m_Avatar: {fileID: 9000000, guid: ab49f3cef633f1d4c84f8c46ec6c0b74, type: 3}
153-
m_Controller: {fileID: 9100000, guid: cad4cd74f41924a4bbcbe916d2f9cb9b, type: 2}
153+
m_Controller: {fileID: 9100000, guid: c8a6f4348cd3c38e898d8e25f58e7fd5, type: 2}
154154
m_CullingMode: 0
155155
m_UpdateMode: 0
156156
m_ApplyRootMotion: 0

0 commit comments

Comments
 (0)