JoshuaReason 5 years ago
parent
commit
c0ba09290d
9 changed files with 23 additions and 482 deletions
  1. +2
    -2
      Assets/Animations/Character_Animate.fbx.meta
  2. +2
    -2
      Assets/Animations/Character_IdleCharacter_Idle.fbx.meta
  3. +2
    -2
      Assets/Animations/Character_PickUp.fbx.meta
  4. +2
    -2
      Assets/Animations/TestWalk.fbx.meta
  5. +4
    -0
      Assets/Scenes/MainScene.unity
  6. +0
    -460
      Assets/Scenes/fog_Soup.prefab
  7. +0
    -8
      Assets/Scenes/fog_Soup.prefab.meta
  8. +8
    -5
      Assets/Scipts/GameMode.cs
  9. +3
    -1
      Assets/Scipts/Timer.cs

+ 2
- 2
Assets/Animations/Character_Animate.fbx.meta View File

@ -120,7 +120,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 100
globalScale: 75
meshCompression: 0
addColliders: 0
importVisibility: 1
@ -140,7 +140,7 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 0.5
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60

+ 2
- 2
Assets/Animations/Character_IdleCharacter_Idle.fbx.meta View File

@ -147,7 +147,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 100
globalScale: 75
meshCompression: 0
addColliders: 0
importVisibility: 1
@ -167,7 +167,7 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 0.35
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60

+ 2
- 2
Assets/Animations/Character_PickUp.fbx.meta View File

@ -147,7 +147,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 100
globalScale: 75
meshCompression: 0
addColliders: 0
importVisibility: 1
@ -167,7 +167,7 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 0.35
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60

+ 2
- 2
Assets/Animations/TestWalk.fbx.meta View File

@ -147,7 +147,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 100
globalScale: 75
meshCompression: 0
addColliders: 0
importVisibility: 1
@ -167,7 +167,7 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 0.35
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60

+ 4
- 0
Assets/Scenes/MainScene.unity View File

@ -1351,6 +1351,7 @@ MonoBehaviour:
Sun: {fileID: 2018855991}
Dawn: {r: 1, g: 0.490047, b: 0, a: 1}
Noon: {r: 1, g: 0.97088087, b: 0, a: 1}
mode: {fileID: 340012153}
--- !u!4 &340012150
Transform:
m_ObjectHideFlags: 0
@ -1448,6 +1449,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
recipe: {fileID: 340012152}
charMove: {fileID: 340012155}
timer: {fileID: 340012149}
winCanvas: {fileID: 1640978391}
loseCanvas: {fileID: 918399140}
--- !u!114 &340012154
MonoBehaviour:
m_ObjectHideFlags: 0

+ 0
- 460
Assets/Scenes/fog_Soup.prefab View File

@ -1,460 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1269054385101070}
m_IsPrefabAsset: 1
--- !u!1 &1027041810918138
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4138824781407786}
- component: {fileID: 114022044459359166}
m_Layer: 0
m_Name: Fog Volume Data
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1269054385101070
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4103543910141356}
m_Layer: 0
m_Name: fog_Soup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1742633774813192
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4401031425651146}
- component: {fileID: 20094090147084042}
- component: {fileID: 114148305408763646}
m_Layer: 0
m_Name: Fog Volume Shadow Camera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!1 &1813471760084128
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4371477047580552}
- component: {fileID: 23443537964980298}
- component: {fileID: 114498607147275396}
- component: {fileID: 33349528928109030}
- component: {fileID: 114465993519516088}
- component: {fileID: 114996526787704558}
m_Layer: 10
m_Name: Fog Volume
m_TagString: Untagged
m_Icon: {fileID: 2800000, guid: 228d0518a8dc08f47847b61368a37c5f, type: 3}
m_NavMeshLayer: 0
m_StaticEditorFlags: 64
m_IsActive: 1
--- !u!4 &4103543910141356
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1269054385101070}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4371477047580552}
- {fileID: 4138824781407786}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4138824781407786
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1027041810918138}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4103543910141356}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4371477047580552
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 159.5, y: -3.7, z: -47.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4401031425651146}
m_Father: {fileID: 4103543910141356}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4401031425651146
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1742633774813192}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 4.9500003, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4371477047580552}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &20094090147084042
Camera:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1742633774813192}
m_Enabled: 0
serializedVersion: 2
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 50.1
field of view: 60
orthographic: 1
orthographic size: 200
m_Depth: -6
m_CullingMask:
serializedVersion: 2
m_Bits: 512
m_RenderingPath: 1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!23 &23443537964980298
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33349528928109030
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_Mesh: {fileID: 0}
--- !u!114 &114022044459359166
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1027041810918138}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9b5fee381bc7db44db761f5cc13c71d5, type: 3}
m_Name:
m_EditorClassIdentifier:
_ForceNoRenderer: 0
_GameCamera: {fileID: 0}
FoundCameras:
- {fileID: 0}
SceneFogVolumes:
- {fileID: 114498607147275396}
--- !u!114 &114148305408763646
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1742633774813192}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68069141b4834cc4c9ba4adc8aabbf07, type: 3}
m_Name:
m_EditorClassIdentifier:
RT_Opacity: {fileID: 0}
RT_OpacityBlur: {fileID: 0}
RT_PostProcess: {fileID: 0}
textureSize: 128
iterations: 3
blurSpread: 0.6
Downsampling: 2
--- !u!114 &114465993519516088
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 28ead9d9608fc8d43827ac46c26c6dae, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114498607147275396
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5e7a52d786954b246ab3797052502655, type: 3}
m_Name:
m_EditorClassIdentifier:
showLighting: 1
OtherTAB: 1
showGradient: 1
showPointLights: 1
showNoiseProperties: 1
showVolumeProperties: 0
showColorTab: 1
tempShadowCaster: 0
showCustomizationOptions: 0
showDebugOptions: 0
showOtherOptions: 0
generalInfo: 0
TexturesGroup: 0
BackgroundImagesPath: C:/Users/holiday/Documents/soupsoup/Assets/FogVolume/Scripts/Editor/Themes/png
_FogType: 1
RenderableInSceneView: 1
ShadowCaster: {fileID: 0}
_PerformanceLUT: {fileID: 2800000, guid: f651c771afb96204b85e925622f5e2b9, type: 3}
fogVolumeScale: {x: 400, y: 30.1, z: 400}
FogMainColor: {r: 0.9528302, g: 0.9496324, b: 0.74158955, a: 0.81960785}
_FogColor: {r: 0.25952297, g: 0.25952297, b: 0.6792453, a: 1}
_AmbientAffectsFogColor: 1
Exposure: 2.5
Offset: 0
Gamma: 1
Tonemap: 0
Visibility: 77.5
ColorAdjust: 0
_SelfShadowSteps: 13
ShadowCameraSkippedFrames: 0
_SelfShadowColor: {r: 0.8396226, g: 0.13861692, b: 0.6085141, a: 1}
VolumeFogInscatteringAnisotropy: 0.37
VolumeFogInscatteringIntensity: 0.119
VolumeFogInscatteringStartDistance: 10
VolumeFogInscatteringTransitionWideness: 1
VolumeFogInscatteringColor: {r: 1, g: 1, b: 1, a: 1}
VolumeFogInscattering: 1
HeightAbsorption: 0
HeightAbsorptionMin: -1
HeightAbsorptionMax: -1
SunAttached: 0
Sun: {fileID: 0}
_ShadeNoise: 0
_DirectionalLighting: 0
_DirectionalLightingDistance: 1.06
DirectLightingShadowDensity: 2.61
LightExtinctionColor: {r: 0.8773585, g: 0.1, b: 0.1, a: 0}
DirectLightingShadowSteps: 1
bAbsorption: 1
Absorption: 0.095
_LightExposure: 3.73
Lambert: 0
LambertianBias: 1
NormalDistance: 0.01
DirectLightingAmount: 5.69
DirectLightingDistance: 10
ShadowBrightness: 1
_AmbientColor: {r: 0.990566, g: 0.7792261, b: 0.4999555, a: 1}
ShadowShift: 1.13
PointLightsIntensity: 13.2
PointLightingDistance: 1000
PointLightingDistance2Camera: 50
PointLightCullSizeMultiplier: 1
PointLightsActive: 0
EnableInscattering: 0
InscatteringColor: {r: 1, g: 1, b: 1, a: 1}
_LightHaloTexture: {fileID: 2800000, guid: fa2064f3c8dffc04f93f4f74eae0d72f, type: 3}
CoverageTex: {fileID: 0}
LightHalo: 0
_HaloWidth: 0.915
_HaloOpticalDispersion: 1
_HaloRadius: 1
_HaloIntensity: 1
_HaloAbsorption: 0.5
InscatteringShape: 0.61
InscatteringIntensity: 0.684
InscatteringStartDistance: 0
InscatteringTransitionWideness: 1
EnableNoise: 1
Octaves: 4
_DetailMaskingThreshold: 30
bSphericalFade: 0
SphericalFadeDistance: 10
DetailDistance: 500
DetailTiling: 3
_DetailRelativeSpeed: 2
_BaseRelativeSpeed: 1.21
_NoiseDetailRange: 0.636
_Curl: 0.453
BaseTiling: 8
Coverage: 1.85
NoiseDensity: 0.1
_3DNoiseScale: 20
Iterations: 85
_BlendMode: 5
IterationStep: 500
_OptimizationFactor: 0
_SamplingMethod: 0
_VisibleByReflectionProbeStatic: 1
GameCameraGO: {fileID: 0}
_DebugMode: 0
useHeightGradient: 0
GradMin: 1
GradMax: -1
GradMin2: -1
GradMax2: -1
_NoiseVolume2: {fileID: 11700000, guid: ce515a5a715cb574eb40037cfb1ab766, type: 2}
_NoiseVolume: {fileID: 11700000, guid: ce515a5a715cb574eb40037cfb1ab766, type: 2}
NoiseIntensity: 0.3
NoiseContrast: 11.9
FadeDistance: 5000
Vortex: 0
_VortexAxis: 2
bVolumeFog: 1
VolumeFogInscatterColorAffectedWithFogColor: 1
_LightScatterMethod: 1
rotation: 0
RotationSpeed: 1.19
Speed: {x: 2, y: 2, z: 0, w: 0}
Stretch: {x: 20, y: 0, z: 0, w: 0}
SceneCollision: 1
ShowPrimitives: 0
EnableDistanceFields: 0
_PrimitiveEdgeSoftener: 1
_PrimitiveCutout: 0
Constrain: 0
_SceneIntersectionSoftness: 1
_jitter: 0.0045
FogRenderer: {fileID: 23443537964980298}
_InspectorBackground:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
_InspectorBackgroundIndex: 0
Description:
EnableGradient: 1
Gradient: {fileID: 2800000, guid: dbd824430443a8e408e7c2807991b44b, type: 3}
HideWireframe: 1
SaveMaterials: 0
RequestSavingMaterials: 0
DrawOrder: 0
ShowDebugGizmos: 0
RT_Opacity: {fileID: 0}
RT_OpacityBlur: {fileID: 0}
ShadowCutoff: 1
CastShadows: 0
ShadowCameraGO: {fileID: 1742633774813192}
shadowCameraPosition: 20
_ShadowCamera: {fileID: 114148305408763646}
_PushAlpha: 1
fogMaterial: {fileID: 0}
FogVolumeShader: {fileID: 4800000, guid: 6040e6c91df9d9d47b7e5426d41a7471, type: 3}
ShadowProjector: {fileID: 0}
ShadowProjectorMesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
ShadowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.25}
_ztest: 0
_FogVolumeData: {fileID: 114022044459359166}
ExcludeFromLowRes: 0
PointLightCPUMaxDistance: 1
PointLightScreenMargin: 0
PointLightsRealTimeUpdate: 1
PointLightBoxCheck: 1
PrimitivesRealTimeUpdate: 1
IsVisible: 1
CreateSurrogate: 1
InjectCustomDepthBuffer: 0
UseConvolvedLightshafts: 0
--- !u!114 &114996526787704558
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1813471760084128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a8340c6d549ef1c4099a619f31eef29e, type: 3}
m_Name:
m_EditorClassIdentifier:

+ 0
- 8
Assets/Scenes/fog_Soup.prefab.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6cc48b09cd810f14187e04b20b7bf89c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

+ 8
- 5
Assets/Scipts/GameMode.cs View File

@ -12,7 +12,7 @@ public class GameMode : MonoBehaviour {
GameObject LocalPlayer;
public CharacterMovement charMove;
public GameObject timer;
public Timer timer;
public GameObject winCanvas;
public GameObject loseCanvas;
@ -40,11 +40,14 @@ public class GameMode : MonoBehaviour {
void Update()
{
//CheckValues();
if (charMove.CheckNearby())
{
recipe.CheckVictory();
if (recipe.CheckVictory())
{
PreGameWin();
}
}
}
@ -66,13 +69,13 @@ public class GameMode : MonoBehaviour {
public void GameWin(NetworkMessage msg)
{
winCanvas.SetActive(true);
timer.SetActive(false);
timer.enabled = false;
}
public void GameLose(NetworkMessage msg)
{
loseCanvas.SetActive(true);
timer.SetActive(false);
timer.enabled = false;
}
/*

+ 3
- 1
Assets/Scipts/Timer.cs View File

@ -20,6 +20,8 @@ public class Timer : MonoBehaviour {
float colorDif;
Image SunImage;
public GameMode mode;
void Start()
{
SunImage = Sun.gameObject.GetComponent<Image>();
@ -33,7 +35,7 @@ public class Timer : MonoBehaviour {
curTime += 1.0f * Time.deltaTime;
if (curTime >= MaxTimer)
{
//Game Lose code here
mode.PreGameLose();
}
Color newColor;

Loading…
Cancel
Save