Skip to content

Commit

Permalink
Fix chest lid skew non-client
Browse files Browse the repository at this point in the history
  • Loading branch information
@daniellochner
daniellochner committed Jul 25, 2023
1 parent 6acc0c2 commit 310207e
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 172 deletions.
322 changes: 161 additions & 161 deletions Assets/Game/Worlds/Farm/Scenes/Farm.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4268,6 +4268,55 @@ Transform:
m_Father: {fileID: 1750634433}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &64081146
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/Underwater
m_Shader: {fileID: 4800000, guid: d52d145ed78d68349b5258334b37dd91, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _CausticTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CameraFov: 60
- _CausticSize: 10
- _CausticStrength: 1
- _DistortionStrength: 1
- _Intensity: 1
- _MaxDepth: 30
- _SurfaceColorBoost: 1
- _ViewDistance: 10
- _WaterFlowSpeed: 1
- _WaterLevel: 0
m_Colors:
- _CameraViewDir: {r: 0, g: 0, b: 1, a: 0}
- _DeepFogColor: {r: 0, g: 0, b: 0, a: 0}
- _ShallowFogColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!1 &64286485
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -14387,7 +14436,7 @@ MonoBehaviour:
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
InLocalSpace: 1
InLocalSpace: 0
Interpolate: 1
--- !u!4 &222961469 stripped
Transform:
Expand Down Expand Up @@ -37037,35 +37086,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4123812541407438, guid: 014c95de16cbd4c4c97277dca595b01e, type: 3}
m_PrefabInstance: {fileID: 588089324}
m_PrefabAsset: {fileID: 0}
--- !u!21 &588312267
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/WetLens
m_Shader: {fileID: 4800000, guid: 30516261272302448add6f8b38386238, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _WetLensTex:
m_Texture: {fileID: 2800000, guid: 4d6c193a4acebf14db2085757b1db25f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Strength: 1
m_Colors: []
m_BuildTextureStacks: []
--- !u!1 &588993278
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -88866,55 +88886,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1214736208}
m_Mesh: {fileID: 4300000, guid: 9265e032db99235459750f706826072a, type: 3}
--- !u!21 &1215101068
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/Underwater
m_Shader: {fileID: 4800000, guid: d52d145ed78d68349b5258334b37dd91, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _CausticTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CameraFov: 60
- _CausticSize: 10
- _CausticStrength: 1
- _DistortionStrength: 1
- _Intensity: 1
- _MaxDepth: 30
- _SurfaceColorBoost: 1
- _ViewDistance: 10
- _WaterFlowSpeed: 1
- _WaterLevel: 0
m_Colors:
- _CameraViewDir: {r: 0, g: 0, b: 1, a: 0}
- _DeepFogColor: {r: 0, g: 0, b: 0, a: 0}
- _ShallowFogColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1216339154
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -118558,6 +118529,55 @@ Mesh:
offset: 0
size: 0
path:
--- !u!21 &1583092136
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/Underwater
m_Shader: {fileID: 4800000, guid: d52d145ed78d68349b5258334b37dd91, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _CausticTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CameraFov: 60
- _CausticSize: 10
- _CausticStrength: 1
- _DistortionStrength: 1
- _Intensity: 1
- _MaxDepth: 30
- _SurfaceColorBoost: 1
- _ViewDistance: 10
- _WaterFlowSpeed: 1
- _WaterLevel: 0
m_Colors:
- _CameraViewDir: {r: 0, g: 0, b: 1, a: 0}
- _DeepFogColor: {r: 0, g: 0, b: 0, a: 0}
- _ShallowFogColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1583945627
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -132916,8 +132936,8 @@ MonoBehaviour:
onExitWater:
m_PersistentCalls:
m_Calls: []
cacheUnderwaterMaterial: {fileID: 1866170372}
cacheWetLensMaterial: {fileID: 1844635405}
cacheUnderwaterMaterial: {fileID: 64081146}
cacheWetLensMaterial: {fileID: 2084146442}
--- !u!1 &1765898155
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -134657,6 +134677,35 @@ Transform:
m_Father: {fileID: 1466067860}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1791297729
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/WetLens
m_Shader: {fileID: 4800000, guid: 30516261272302448add6f8b38386238, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _WetLensTex:
m_Texture: {fileID: 2800000, guid: 4d6c193a4acebf14db2085757b1db25f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Strength: 1
m_Colors: []
m_BuildTextureStacks: []
--- !u!1 &1792241093
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -139192,35 +139241,6 @@ Transform:
m_Father: {fileID: 1132106845}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &1844635405
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/WetLens
m_Shader: {fileID: 4800000, guid: 30516261272302448add6f8b38386238, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _WetLensTex:
m_Texture: {fileID: 2800000, guid: 4d6c193a4acebf14db2085757b1db25f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Strength: 1
m_Colors: []
m_BuildTextureStacks: []
--- !u!1001 &1845643206
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -140112,55 +140132,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7427212019282563188, guid: 350dccc9f7e7e0245894cd357bc7a091, type: 3}
m_PrefabInstance: {fileID: 1863718389}
m_PrefabAsset: {fileID: 0}
--- !u!21 &1866170372
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/Underwater
m_Shader: {fileID: 4800000, guid: d52d145ed78d68349b5258334b37dd91, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _CausticTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DistortionTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NoiseTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _CameraFov: 60
- _CausticSize: 10
- _CausticStrength: 1
- _DistortionStrength: 1
- _Intensity: 1
- _MaxDepth: 30
- _SurfaceColorBoost: 1
- _ViewDistance: 10
- _WaterFlowSpeed: 1
- _WaterLevel: 0
m_Colors:
- _CameraViewDir: {r: 0, g: 0, b: 1, a: 0}
- _DeepFogColor: {r: 0, g: 0, b: 0, a: 0}
- _ShallowFogColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
--- !u!1 &1867099989
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -154271,6 +154242,35 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2083861927}
m_Mesh: {fileID: 4300000, guid: 9265e032db99235459750f706826072a, type: 3}
--- !u!21 &2084146442
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Hidden/Poseidon/WetLens
m_Shader: {fileID: 4800000, guid: 30516261272302448add6f8b38386238, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _WetLensTex:
m_Texture: {fileID: 2800000, guid: 4d6c193a4acebf14db2085757b1db25f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Strength: 1
m_Colors: []
m_BuildTextureStacks: []
--- !u!1 &2085471119
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -156644,8 +156644,8 @@ MonoBehaviour:
onExitWater:
m_PersistentCalls:
m_Calls: []
cacheUnderwaterMaterial: {fileID: 1215101068}
cacheWetLensMaterial: {fileID: 588312267}
cacheUnderwaterMaterial: {fileID: 1583092136}
cacheWetLensMaterial: {fileID: 1791297729}
--- !u!1 &2113386156
GameObject:
m_ObjectHideFlags: 0
Expand Down

0 comments on commit 310207e

Please sign in to comment.