Skip to content
This repository was archived by the owner on Jun 12, 2019. It is now read-only.

Commit d2a67a0

Browse files
authored
Merge pull request #31 from TechAssembly/Create-an-initial-humanoid-model-for-the-player
nice changes
2 parents 3d3447c + dc0aaf7 commit d2a67a0

File tree

470 files changed

+248864
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

470 files changed

+248864
-21
lines changed

client/Assets/Artwork.meta

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

client/Assets/Artwork/AtlasTexture.png.meta

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

client/Assets/Artwork/Bear.controller

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: Bear
9+
serializedVersion: 5
10+
m_AnimatorParameters:
11+
- m_Name: Speed
12+
m_Type: 1
13+
m_DefaultFloat: 0
14+
m_DefaultInt: 0
15+
m_DefaultBool: 0
16+
m_Controller: {fileID: 9100000}
17+
m_AnimatorLayers:
18+
- serializedVersion: 5
19+
m_Name: Base Layer
20+
m_StateMachine: {fileID: 1107804628850111460}
21+
m_Mask: {fileID: 0}
22+
m_Motions: []
23+
m_Behaviours: []
24+
m_BlendingMode: 0
25+
m_SyncedLayerIndex: -1
26+
m_DefaultWeight: 0
27+
m_IKPass: 0
28+
m_SyncedLayerAffectsTiming: 0
29+
m_Controller: {fileID: 9100000}
30+
--- !u!1101 &1101830652544862938
31+
AnimatorStateTransition:
32+
m_ObjectHideFlags: 1
33+
m_PrefabParentObject: {fileID: 0}
34+
m_PrefabInternal: {fileID: 0}
35+
m_Name:
36+
m_Conditions: []
37+
m_DstStateMachine: {fileID: 0}
38+
m_DstState: {fileID: 0}
39+
m_Solo: 0
40+
m_Mute: 0
41+
m_IsExit: 0
42+
serializedVersion: 3
43+
m_TransitionDuration: 0.25
44+
m_TransitionOffset: 0
45+
m_ExitTime: 0.7580645
46+
m_HasExitTime: 1
47+
m_HasFixedDuration: 1
48+
m_InterruptionSource: 0
49+
m_OrderedInterruption: 1
50+
m_CanTransitionToSelf: 1
51+
--- !u!1102 &1102743350905712646
52+
AnimatorState:
53+
serializedVersion: 5
54+
m_ObjectHideFlags: 1
55+
m_PrefabParentObject: {fileID: 0}
56+
m_PrefabInternal: {fileID: 0}
57+
m_Name: Dance
58+
m_Speed: 1
59+
m_CycleOffset: 0
60+
m_Transitions: []
61+
m_StateMachineBehaviours: []
62+
m_Position: {x: 50, y: 50, z: 0}
63+
m_IKOnFeet: 0
64+
m_WriteDefaultValues: 1
65+
m_Mirror: 0
66+
m_SpeedParameterActive: 0
67+
m_MirrorParameterActive: 0
68+
m_CycleOffsetParameterActive: 0
69+
m_Motion: {fileID: 7400000, guid: eb23d366f1f32b94796543c3ba09fd94, type: 3}
70+
m_Tag:
71+
m_SpeedParameter:
72+
m_MirrorParameter:
73+
m_CycleOffsetParameter:
74+
--- !u!1107 &1107804628850111460
75+
AnimatorStateMachine:
76+
serializedVersion: 5
77+
m_ObjectHideFlags: 1
78+
m_PrefabParentObject: {fileID: 0}
79+
m_PrefabInternal: {fileID: 0}
80+
m_Name: Base Layer
81+
m_ChildStates:
82+
- serializedVersion: 1
83+
m_State: {fileID: 1102743350905712646}
84+
m_Position: {x: 312, y: 120, z: 0}
85+
m_ChildStateMachines: []
86+
m_AnyStateTransitions: []
87+
m_EntryTransitions:
88+
- {fileID: 1109800238915755696}
89+
m_StateMachineTransitions: {}
90+
m_StateMachineBehaviours: []
91+
m_AnyStatePosition: {x: 60, y: 168, z: 0}
92+
m_EntryPosition: {x: 60, y: 120, z: 0}
93+
m_ExitPosition: {x: 800, y: 120, z: 0}
94+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
95+
m_DefaultState: {fileID: 1102743350905712646}
96+
--- !u!1109 &1109800238915755696
97+
AnimatorTransition:
98+
m_ObjectHideFlags: 1
99+
m_PrefabParentObject: {fileID: 0}
100+
m_PrefabInternal: {fileID: 0}
101+
m_Name:
102+
m_Conditions: []
103+
m_DstStateMachine: {fileID: 0}
104+
m_DstState: {fileID: 1102743350905712646}
105+
m_Solo: 0
106+
m_Mute: 0
107+
m_IsExit: 0
108+
serializedVersion: 1

client/Assets/Artwork/Bear.controller.meta

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

client/Assets/Artwork/Level.meta

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

client/Assets/Artwork/Level/Materials.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: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: SS_Firewood_SS_Firewood_pCube18Mat
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 0
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}

client/Assets/Artwork/Level/Materials/SS_Firewood_SS_Firewood_pCube18Mat.mat.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: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: pPlane26Mat
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 0
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}

client/Assets/Artwork/Level/Materials/pPlane26Mat.mat.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.

0 commit comments

Comments
 (0)