Skip to content

Commit

Permalink
Begin the almighty update
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanzemlin committed Oct 16, 2024
1 parent 9e3f8d3 commit cc73ef3
Show file tree
Hide file tree
Showing 7 changed files with 347 additions and 196 deletions.
135 changes: 135 additions & 0 deletions Assets/Scrabby/Models/Barrel_comb.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2017454816269887060
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
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Barrel_comb
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
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}
- _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}
- 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:
- _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: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Scrabby/Models/Barrel_comb.mat.meta

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

File renamed without changes.

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

44 changes: 22 additions & 22 deletions Assets/Scrabby/Prefabs/Environment/Barrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -28,86 +28,86 @@ Transform:
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7471895571589257391}
- {fileID: 1435003081917461849}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &6934197702332333892
--- !u!1001 &1468348087397946034
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4928911710605206137}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: b5ee97da63083a147995a0af2d1e96f0,
- target: {fileID: 919132149155446097, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
propertyPath: m_Name
value: barrel
value: barrel (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b5ee97da63083a147995a0af2d1e96f0, type: 3}
--- !u!4 &7471895571589257391 stripped
m_SourcePrefab: {fileID: 100100000, guid: d92a48ae3d86d4d4b92b1fee148f64e3, type: 3}
--- !u!4 &1435003081917461849 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: b5ee97da63083a147995a0af2d1e96f0,
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d92a48ae3d86d4d4b92b1fee148f64e3,
type: 3}
m_PrefabInstance: {fileID: 6934197702332333892}
m_PrefabInstance: {fileID: 1468348087397946034}
m_PrefabAsset: {fileID: 0}
Loading

0 comments on commit cc73ef3

Please sign in to comment.