Skip to content

Commit

Permalink
Enhancement/new player select room (#487)
Browse files Browse the repository at this point in the history
* Update Player Select PokerRoom model with materials

* Update PokerRoom WoodMaterial

* Fix player eye movement after player texture update

* Add cards on table and refactor PlayerEyeMovement

* Fix all players active in playerselect
  • Loading branch information
ChrisKrane authored Feb 11, 2024
1 parent fd78020 commit 27aac3a
Show file tree
Hide file tree
Showing 23 changed files with 2,004 additions and 1,361 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1444,21 +1444,21 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.5
functionName: peekLeft
functionName: PeekLeft
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
floatParameter: 0.4
intParameter: 0
messageOptions: 0
- time: 3
functionName: lookLeft
functionName: LookLeft
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
floatParameter: 0.5
intParameter: 0
messageOptions: 0
- time: 4
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -856,21 +856,21 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_Events:
- time: 2.3333333
functionName: lookRight
functionName: LookRight
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.4
intParameter: 0
messageOptions: 0
- time: 2.75
functionName: setAngery
functionName: SetAngery
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
intParameter: 0
messageOptions: 0
- time: 4
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -392,28 +392,28 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.33333334
functionName: lookRight
functionName: LookRight
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
intParameter: 0
messageOptions: 0
- time: 1.1666666
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
- time: 1.55
functionName: lookLeft
functionName: LookLeft
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
intParameter: 0
messageOptions: 0
- time: 2.2833333
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,14 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.5
functionName: lookLeft
functionName: LookLeft
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.3
intParameter: 0
messageOptions: 0
- time: 2
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,14 @@ AnimationClip:
m_HasMotionFloatCurves: 0
m_Events:
- time: 0.5
functionName: lookRight
functionName: LookRight
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0.6
intParameter: 0
messageOptions: 0
- time: 2
functionName: resetEyePosition
functionName: ResetEyePosition
data:
objectReferenceParameter: {fileID: 0}
floatParameter: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/Materials/PlayerSelect.meta

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

155 changes: 155 additions & 0 deletions Assets/Materials/PlayerSelect/TableMaterialPlayerSelect.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TableMaterialPlayerSelect
m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- MAIN_LIGHT_CALCULATE_SHADOWS
- _MAIN_LIGHT_SHADOWS_CASCADE
- _SHADOWS_SOFT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Metallic_Texture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Normal_Map:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Texture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- MAIN_LIGHT_CALCULATE_SHADOWS: 1
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _MAIN_LIGHT_SHADOWS_CASCADE: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SHADOWS_SOFT: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _Texture_Intensity: 2.88
- _Use_Normal_Map: 0
- _Use_Specular: 1
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.018743295, g: 0.3679245, b: 0.04595223, a: 1}
- _Color: {r: 0.018743295, g: 0.36792448, b: 0.04595221, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
- _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!114 &3442308417953317156
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

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

Loading

0 comments on commit 27aac3a

Please sign in to comment.