NeonTea/Cyber
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply the Character model properly, no animations yet #14

Browse Source
This commit is contained in:
Sofia 2017-05-23 21:11:18 +03:00
parent 2255daa6a7
commit 61df886662
9 changed files with 3091 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Models/Items/Materials/HatMaterial.mat
View File

@ -59,7 +59,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.03
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0

4
Assets/Models/Items/Materials/JacketMaterial.mat
View File

@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_Name: jacketMaterial m_Name: JacketMaterial
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
@ -59,7 +59,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0

2
Assets/Models/Items/Materials/PantsMaterial.mat
View File

@ -59,7 +59,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.172
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0

2
Assets/Models/Items/Materials/ShirtMaterial.mat
View File

@ -59,7 +59,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.074
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0

6
Assets/Models/Materials/HelmetGlass.mat
View File

@ -59,9 +59,9 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0.796
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0.201
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
@ -71,5 +71,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 0.0668, g: 0.0668, b: 0.0668, a: 1} - _Color: {r: 0.172, g: 0.153, b: 0.159, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

4
Assets/Models/Materials/Suit.mat
View File

@ -59,7 +59,7 @@ Material:
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 0 - _DstBlend: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 0
- _Mode: 0 - _Mode: 0
@ -71,5 +71,5 @@ Material:
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 0.5489, g: 0.2686, b: 0.0522, a: 1} - _Color: {r: 0.71323526, g: 0.41136312, b: 0.17830881, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

1537
Assets/Prefabs/NPC.prefab
View File

File diff suppressed because it is too large Load Diff

1541
Assets/Prefabs/PC.prefab
View File

File diff suppressed because it is too large Load Diff

9
Assets/Scripts/Entities/SyncBases/Character.cs
View File

@ -36,6 +36,11 @@ namespace Cyber.Entities.SyncBases {
/// </summary> /// </summary>
public Transform Head; public Transform Head;
/// <summary>
/// The head bone for rotation.
/// </summary>
public Transform HeadBone;
private Vector3 MovementDirection = new Vector3(); private Vector3 MovementDirection = new Vector3();
private Vector3 ServerPosition = new Vector3(); private Vector3 ServerPosition = new Vector3();
private bool ServerPositionShouldLerpSync = false; private bool ServerPositionShouldLerpSync = false;
@ -71,6 +76,10 @@ namespace Cyber.Entities.SyncBases {
HeadRot.z = EulerAngles.z; HeadRot.z = EulerAngles.z;
Head.localEulerAngles = HeadRot; Head.localEulerAngles = HeadRot;
Vector3 HeadBoneRot = HeadBone.localEulerAngles;
HeadBoneRot.z = EulerAngles.x;
HeadBone.localEulerAngles = HeadBoneRot;
Vector3 BodyRot = transform.localEulerAngles; Vector3 BodyRot = transform.localEulerAngles;
BodyRot.y = EulerAngles.y; BodyRot.y = EulerAngles.y;
transform.localEulerAngles = BodyRot; transform.localEulerAngles = BodyRot;