Commit 5f09c1fe authored by Pinguin's avatar Pinguin
Browse files
parents 508d3751 62007681
......@@ -3295,7 +3295,7 @@ Camera:
serializedVersion: 2
m_Bits: 0
m_RenderingPath: 1
m_TargetTexture: {fileID: 1725100041}
m_TargetTexture: {fileID: 1868922940}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
......@@ -8175,7 +8175,7 @@ PrefabInstance:
- target: {fileID: 8372047872033581404, guid: d98b592a70379a84182d88fa8d4cdac6,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8372047872033581404, guid: d98b592a70379a84182d88fa8d4cdac6,
type: 3}
......@@ -13105,7 +13105,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!81 &534669903
AudioListener:
m_ObjectHideFlags: 0
......@@ -13169,7 +13169,7 @@ Transform:
m_Children:
- {fileID: 188900935}
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &534669906
MonoBehaviour:
......@@ -13199,8 +13199,8 @@ MonoBehaviour:
sourceCamera: {fileID: 534669904}
outlineCamera: {fileID: 188900934}
outlineShaderMaterial: {fileID: 0}
renderTexture: {fileID: 1725100041}
extraRenderTexture: {fileID: 767774476}
renderTexture: {fileID: 1868922940}
extraRenderTexture: {fileID: 1491749263}
--- !u!114 &534669907
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -14581,8 +14581,9 @@ Transform:
- {fileID: 170076735}
- {fileID: 968127240}
- {fileID: 1219434717}
- {fileID: 2018500513}
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &599524865
GameObject:
......@@ -16799,38 +16800,6 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 14
m_Mesh: {fileID: 4300152, guid: 1ab37521c5737e941a4b8332014158d1, type: 3}
--- !u!84 &767774476
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 640
m_Height: 480
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 7
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &768824208
GameObject:
m_ObjectHideFlags: 0
......@@ -31415,7 +31384,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1432646260
Transform:
m_ObjectHideFlags: 0
......@@ -32357,6 +32326,38 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1484642645}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!84 &1491749263
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 640
m_Height: 480
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 7
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1494765131
GameObject:
m_ObjectHideFlags: 0
......@@ -34862,6 +34863,8 @@ MonoBehaviour:
laptop: {fileID: 1904835812}
Lemon: {fileID: 917968456}
Iron: {fileID: 782753462}
Duck: {fileID: 564235578}
Compass: {fileID: 1097362089}
twigQuest: {fileID: 282597498}
twigQuestcheckmark: {fileID: 1124916795}
dudeQuest: {fileID: 1924930315}
......@@ -49277,38 +49280,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1719957645}
m_Mesh: {fileID: 4300000, guid: 40db6ee2928788546ab813ae6807ee9a, type: 3}
--- !u!84 &1725100041
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 640
m_Height: 480
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 7
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!64 &1728216138
MeshCollider:
m_ObjectHideFlags: 0
......@@ -51540,6 +51511,149 @@ MonoBehaviour:
_DialogName: Lee
Backbone: {fileID: 0}
createMeshOnStart: 0
--- !u!1 &1842660588
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1842660592}
- component: {fileID: 1842660591}
- component: {fileID: 1842660590}
- component: {fileID: 1842660589}
m_Layer: 9
m_Name: Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1842660589
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1842660588}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
m_Name:
m_EditorClassIdentifier:
volumeTrigger: {fileID: 534669905}
volumeLayer:
serializedVersion: 2
m_Bits: 2
stopNaNPropagation: 1
finalBlitToCameraTarget: 1
antialiasingMode: 3
temporalAntialiasing:
jitterSpread: 0.75
sharpness: 0.25
stationaryBlending: 0.95
motionBlending: 0.85
subpixelMorphologicalAntialiasing:
quality: 2
fastApproximateAntialiasing:
fastMode: 0
keepAlpha: 0
fog:
enabled: 1
excludeSkybox: 1
debugLayer:
lightMeter:
width: 512
height: 256
showCurves: 1
histogram:
width: 512
height: 256
channel: 3
waveform:
exposure: 0.12
height: 256
vectorscope:
size: 256
exposure: 0.12
overlaySettings:
linearDepth: 0
motionColorIntensity: 4
motionGridSize: 64
colorBlindnessType: 0
colorBlindnessStrength: 1
m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
m_ShowToolkit: 1
m_ShowCustomSorter: 1
breakBeforeColorGrading: 0
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
--- !u!81 &1842660590
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1842660588}
m_Enabled: 1
--- !u!20 &1842660591
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1842660588}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_GateFitMode: 2
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 1
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1842660592
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1842660588}
m_LocalRotation: {x: -0, y: -0.047944624, z: -0, w: 0.99885}
m_LocalPosition: {x: 30.1, y: 18, z: -50.2}
m_LocalScale: {x: 1, y: 1.1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1846867603
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -52223,6 +52337,38 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1867790845}
m_CullTransparentMesh: 0
--- !u!84 &1868922940
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_Width: 640
m_Height: 480
m_AntiAliasing: 1
m_DepthFormat: 1
m_ColorFormat: 7
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1870954835
GameObject:
m_ObjectHideFlags: 0
......@@ -52934,7 +53080,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1921911523
GameObject:
......@@ -54999,6 +55145,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2016460935}
m_CullTransparentMesh: 0
--- !u!1 &2018500512
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2018500513}
- component: {fileID: 2018500514}
m_Layer: 0
m_Name: NEW PPS
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2018500513
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018500512}
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: 591913074}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2018500514
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2018500512}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
m_Name:
m_EditorClassIdentifier:
sharedProfile: {fileID: 11400000, guid: a7ae60198bf804447b2b5d62bec22725, type: 2}
isGlobal: 1
blendDistance: 0
weight: 1
priority: 0
--- !u!1 &2020974737
GameObject:
m_ObjectHideFlags: 0
......@@ -50,6 +50,8 @@ public static class PublicEnums
Sin_Questrecieved,
Calibration_done,
Compass_give_away,
Duck_give_away,
Sticker,
......
......@@ -17,6 +17,10 @@ public class QuestManager : MonoBehaviour
public InventoryItem Iron;
public InventoryItem Duck;
public InventoryItem Compass;
enum twigStag { find = 0, ironQ = 1, DuckQ = 2, interviewrdy = 3, done = 4 };
twigStag twig;
public InventoryItem twigQuest;
......@@ -58,6 +62,9 @@ public class QuestManager : MonoBehaviour
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.Lemon_give_away)) GiveAwayLemon();
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.LaptopFixed_get) && !fixedlaptop) Fixlaptiop();
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.LaptopFixed_give_away) && !laptopremoved) Removelaptiop();
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.Iron_give_away)) GiveAwayIron();
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.Compass_give_away)) GiveAwayDuck();
if (PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.Duck_give_away)) GiveAwayCompass();
// Keeping up with Queststatus
if ((dude == dudeStag.find && PublicEnums.GetDialogFlag(PublicEnums.DialogFlag.Lemon1_Quest_started)) ||
......@@ -150,6 +157,20 @@ public class QuestManager : MonoBehaviour
InventoryLogic.instance.TryRemoveItem(Iron.ItemName);
//if (!InventoryLogic.instance.Contains(Iron.ItemName)) PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Iron_in_inventory, false);
}
private void GiveAwayDuck()
{
Debug.Log("Gave Duck Away! ");
PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Duck_give_away, false);
InventoryLogic.instance.TryRemoveItem(Duck.ItemName);
//if (!InventoryLogic.instance.Contains(Iron.ItemName)) PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Iron_in_inventory, false);
}
private void GiveAwayCompass()
{
Debug.Log("Gave Compass Away! ");
PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Compass_give_away, false);
InventoryLogic.instance.TryRemoveItem(Compass.ItemName);
//if (!InventoryLogic.instance.Contains(Iron.ItemName)) PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Iron_in_inventory, false);
}
private void AdvanceQdude()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment