Conjure/overmelted
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Level 1 integrated + bug fix

Browse Source
This commit is contained in:
Jimmy Tremblay-Bernier 2023-11-04 23:04:02 -04:00
parent 86581b5631
commit 6b53e212d5
24 changed files with 11439 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/Alts/PolygonFantasyKingdom_Mat_03_B.mat
View File

@ -63,7 +63,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: f49f627af78c74843923759d1c40fa86, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

4
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/Ground_Mat/PolygonFantasyKingdom_Mat_Ground_Grass_01.mat
View File

@ -50,8 +50,8 @@ Material:
m_Scale: {x: 50, y: 50}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Texture: {fileID: 2800000, guid: 023a7d6bc5fbf764f94d182c42369e61, type: 3}
m_Scale: {x: 50, y: 50}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}

4
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/Ground_Mat/PolygonFantasyKingdom_Mat_Ground_Mud_01.mat
View File

@ -50,8 +50,8 @@ Material:
m_Scale: {x: 50, y: 50}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Texture: {fileID: 2800000, guid: 8dd9c98cbc4581f4fb73e8920b223544, type: 3}
m_Scale: {x: 50, y: 50}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}

3
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/Misc/PolygonFantasyKingdom_Mat_Water.mat
View File

@ -35,6 +35,7 @@ Material:
RenderType: Transparent
disabledShaderPasses:
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@ -131,7 +132,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.079044096, g: 0.306364, b: 0.31617644, a: 0.69}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.07904407, g: 0.30636397, b: 0.3161764, a: 0.69}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

46
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant Variant Variant.mat Normal file
View File

@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4283544561168900123
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: PolygonFantasyKingdom_Mat_01_A Variant Variant Variant
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 2100000, guid: 32c3f2060658f2c4f90a0c921afef1bf, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _NORMALMAP
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: []
m_Ints: []
m_Floats: []
m_Colors:
- _BaseColor: {r: 0.72697544, g: 0, b: 1, a: 1}
- _Color: {r: 0.72697544, g: 0, b: 1, a: 1}
m_BuildTextureStacks: []

8
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant Variant Variant.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 904d6ea1568a3df4c9838e6b1d16470e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

46
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant Variant.mat Normal file
View File

@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3088154073298546087
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: PolygonFantasyKingdom_Mat_01_A Variant Variant
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 2100000, guid: a22dd30c2d177cc49b9a1b0eef9c019b, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _NORMALMAP
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: []
m_Ints: []
m_Floats: []
m_Colors:
- _BaseColor: {r: 0, g: 0.92417073, b: 1, a: 1}
- _Color: {r: 0, g: 0.92417073, b: 1, a: 1}
m_BuildTextureStacks: []

8
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant Variant.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 32c3f2060658f2c4f90a0c921afef1bf
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

46
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant.mat Normal file
View File

@ -0,0 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4437812461384899642
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: PolygonFantasyKingdom_Mat_01_A Variant
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 2100000, guid: 71e41e43b459a244abaf5acca76b89ee, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _NORMALMAP
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: []
m_Ints: []
m_Floats: []
m_Colors:
- _BaseColor: {r: 1, g: 0.46728972, b: 0, a: 1}
- _Color: {r: 1, g: 0.46728963, b: 0, a: 1}
m_BuildTextureStacks: []

8
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_01_A Variant.mat.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a22dd30c2d177cc49b9a1b0eef9c019b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

2
Assets/AssetStoreImports/PolygonFantasyKingdom/Materials/PolygonFantasyKingdom_Mat_Castle_Wall_01.mat
View File

@ -63,7 +63,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 24f1ea296c9e695449086de7c2eca5e4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

1
Assets/MenuInputManager.cs
View File

@ -20,6 +20,7 @@ public class MenuInputManager : SerializedMonoBehaviour
}
public void OnJoin(int playerSeat)
{
if (inputSystemUIInputModule.actionsAsset.devices == null)
{

66
Assets/New Lighting Settings.lighting Normal file
View File

@ -0,0 +1,66 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!850595691 &4890085278179872738
LightingSettings:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Lighting Settings
serializedVersion: 6
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 1
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_BakeBackend: 2
m_LightmapMaxSize: 2048
m_BakeResolution: 40
m_Padding: 2
m_LightmapCompression: 3
m_AO: 1
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 0
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
m_FinalGatherRayCount: 256
m_FinalGatherFiltering: 1
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 5
m_PVRMinBounces: 2
m_PVREnvironmentImportanceSampling: 1
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0
m_NumRaysToShootPerTexel: -1
m_RespectSceneVisibilityWhenBakingGI: 0

8
Assets/New Lighting Settings.lighting.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b915d865add834745a56e4acefdefde4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4890085278179872738
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Prefabs/Players/Player1.prefab
View File

@ -121,7 +121,7 @@ MonoBehaviour:
- Name: _interractable
Entry: 6
Data:
characterData: {fileID: 11400000, guid: 93e3c66a2c7ffa843999949b879cfb9f, type: 2}
characterData: {fileID: 11400000, guid: 95cfdca18b75abe4693c81eb2ffc50ac, type: 2}
grabingParent: {fileID: 982500859641281310}
holdedObject: {fileID: 0}
--- !u!65 &8666395363848543891

28
Assets/Prefabs/Players/Player2.prefab
View File

@ -41,9 +41,10 @@ GameObject:
m_Component:
- component: {fileID: 2926021624558573829}
- component: {fileID: 3165207323767456707}
- component: {fileID: 5080018360383404287}
- component: {fileID: 601460039674696213}
- component: {fileID: 4283501204518202696}
- component: {fileID: 3399061519945774450}
- component: {fileID: 3797391778422748067}
m_Layer: 0
m_Name: Player2
m_TagString: Untagged
@ -95,7 +96,7 @@ MonoBehaviour:
animator: {fileID: 1175523527754715148}
direction: {x: 0, y: 0, z: 0}
RB: {fileID: 0}
--- !u!114 &5080018360383404287
--- !u!114 &601460039674696213
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -119,7 +120,7 @@ MonoBehaviour:
- Name: _interractable
Entry: 6
Data:
characterData: {fileID: 11400000, guid: c2ddc882ca1ea274e81f4db3123864d3, type: 2}
characterData: {fileID: 11400000, guid: 984fd901ed6704e4baaae0624a3d1804, type: 2}
grabingParent: {fileID: 409399269466425513}
holdedObject: {fileID: 0}
--- !u!136 &4283501204518202696
@ -172,6 +173,27 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!65 &3797391778422748067
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7905190991276204682}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.4432087, y: 1.8134935, z: 1}
m_Center: {x: 0.7339523, y: 0.9129211, z: 0}
--- !u!1001 &1226365007989958020
PrefabInstance:
m_ObjectHideFlags: 0

8
Assets/Scenes/GameLevels/Level1.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1a4780a480b197c4ea0e68573a7b6aea
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

11132
Assets/Scenes/GameLevels/Level1.unity
View File

File diff suppressed because it is too large Load Diff

BIN
Assets/Scenes/GameLevels/Level1/LightingData.asset Normal file
View File

Binary file not shown.

8
Assets/Scenes/GameLevels/Level1/LightingData.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b8da5ad085d46cb4eae0720b36d8a043
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Scenes/GameLevels/Level1/ReflectionProbe-0.exr (Stored with Git LFS) Normal file
View File

Binary file not shown.

140
Assets/Scenes/GameLevels/Level1/ReflectionProbe-0.exr.meta Normal file
View File

@ -0,0 +1,140 @@
fileFormatVersion: 2
guid: 28772712a8849fc4d924f0725dd192b1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/Conjure/Interraction/PlayerInterraction.cs
View File

@ -93,7 +93,7 @@ namespace Conjure.Interraction
}
}
private void OnTriggerLeave(Collider other)
private void OnTriggerExit(Collider other)
{
InterractableElement interactable;
if (other.gameObject.TryGetComponent(out interactable))

8
Assets/Scripts/Conjure/Items/Item.cs
View File

@ -8,6 +8,10 @@ namespace Conjure.Items
private bool _isHolded = false;
public override void InterractEnter(PlayerInterraction playerInterraction)
{
if (_isHolded)
{
return;
}
playerInterraction.SetInterractable(this);
}
@ -24,6 +28,10 @@ namespace Conjure.Items
public override void InterractLeave(PlayerInterraction playerInterraction)
{
if (_isHolded)
{
return;
}
playerInterraction.UnsetInterractable(this);
}