Compare commits

...

2 Commits

Author SHA1 Message Date
JoansLink00 4731404294 fine
3 months ago
JoansLink00 58119f52b9 fix
3 months ago

@ -220,7 +220,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8fc662358fbf8394d804207b2a8c9868, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PositionReset
StartPos: {x: -15.5, y: 1.23, z: 5.49}
StartPos: {x: -11.65, y: 1.23, z: 19.1}
--- !u!114 &82641081
MonoBehaviour:
m_ObjectHideFlags: 0
@ -359,7 +359,7 @@ Transform:
m_GameObject: {fileID: 82641079}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -15.5, y: 1.23, z: 5.49}
m_LocalPosition: {x: -11.65, y: 1.23, z: 19.1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -592,7 +592,7 @@ Transform:
m_GameObject: {fileID: 90976996}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.60672, y: -0.354, z: 7.75}
m_LocalPosition: {x: -11.46, y: -0.354, z: 11.26}
m_LocalScale: {x: 1.74, y: 1.74, z: 1.74}
m_ConstrainProportionsScale: 1
m_Children: []
@ -721,7 +721,7 @@ Transform:
m_GameObject: {fileID: 209519236}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.63, y: 0.5, z: 31.23}
m_LocalPosition: {x: -13.63, y: 0.5, z: 23.44}
m_LocalScale: {x: 5, y: 1, z: 5}
m_ConstrainProportionsScale: 0
m_Children:
@ -1173,7 +1173,7 @@ Transform:
m_GameObject: {fileID: 319279591}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -12.4, y: 1.51404, z: 15.37}
m_LocalPosition: {x: 10, y: 1.51404, z: 15.37}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children:
@ -1205,7 +1205,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8fc662358fbf8394d804207b2a8c9868, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PositionReset
StartPos: {x: 9.2, y: 1.51404, z: 15.37}
StartPos: {x: 10, y: 1.51404, z: 15.37}
--- !u!1 &330585543
GameObject:
m_ObjectHideFlags: 0
@ -1266,7 +1266,7 @@ Camera:
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 44.2
field of view: 39
orthographic: 0
orthographic size: 5
m_Depth: -1
@ -1292,13 +1292,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: 0.44322762, y: 0, z: 0, w: 0.8964091}
m_LocalRotation: {x: 0.4687009, y: 0, z: 0, w: 0.883357}
m_LocalPosition: {x: 0, y: 30.1, z: -11.65}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 52.62, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 55.9, y: 0, z: 0}
--- !u!114 &330585547
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1778,7 +1778,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.0000033379, y: 0, z: -2.26}
m_LocalScale: {x: 29.283, y: 1, z: 6.4701}
m_LocalScale: {x: 31.8, y: 1, z: 8.6}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1262927944}
@ -2432,7 +2432,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 41, y: 119}
m_AnchoredPosition: {x: 41, y: 71.2}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &827642026
@ -2665,7 +2665,7 @@ Transform:
m_GameObject: {fileID: 955231353}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -15.5, y: 1.23, z: 12.73}
m_LocalPosition: {x: -15.5, y: 1.23, z: 19.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -2707,7 +2707,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8fc662358fbf8394d804207b2a8c9868, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PositionReset
StartPos: {x: -15.5, y: 1.23, z: 12.73}
StartPos: {x: -15.5, y: 1.23, z: 19.5}
--- !u!1001 &1002473755
PrefabInstance:
m_ObjectHideFlags: 0
@ -2947,7 +2947,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -26.59, y: -80.08}
m_AnchoredPosition: {x: -26.59, y: -139.5}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1158125514
@ -3426,6 +3426,132 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1406665472
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1406665477}
- component: {fileID: 1406665476}
- component: {fileID: 1406665475}
- component: {fileID: 1406665474}
- component: {fileID: 1406665473}
m_Layer: 0
m_Name: IceCrack (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1406665473
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406665472}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7bd60a7c0041e044b3f3b515418222e, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Noice
noice: 5
--- !u!65 &1406665474
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406665472}
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.52, y: 1.69, z: 0.49}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1406665475
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406665472}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8fa2995b55b55e842b4af898f32ef3ef, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1406665476
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406665472}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1406665477
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1406665472}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.78, y: -0.354, z: 3.12}
m_LocalScale: {x: 1.74, y: 1.74, z: 1.74}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1604116870
GameObject:
m_ObjectHideFlags: 0
@ -3845,8 +3971,8 @@ Transform:
m_GameObject: {fileID: 1940342122}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 11.45, y: 0, z: 8.58}
m_LocalScale: {x: 15.47548, y: 1, z: 6.4701}
m_LocalPosition: {x: 12.08, y: 0, z: 8.58}
m_LocalScale: {x: 15.47548, y: 1, z: 7.59}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1262927944}
@ -4116,6 +4242,132 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::SoundEffectManager
sfxSlider: {fileID: 1272165864}
--- !u!1 &2064626057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2064626062}
- component: {fileID: 2064626061}
- component: {fileID: 2064626060}
- component: {fileID: 2064626059}
- component: {fileID: 2064626058}
m_Layer: 0
m_Name: IceCrack (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2064626058
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064626057}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7bd60a7c0041e044b3f3b515418222e, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Noice
noice: 5
--- !u!65 &2064626059
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064626057}
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.52, y: 1.69, z: 0.49}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2064626060
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064626057}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 8fa2995b55b55e842b4af898f32ef3ef, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &2064626061
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064626057}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &2064626062
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2064626057}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.52, y: -0.354, z: 4.46}
m_LocalScale: {x: 1.74, y: 1.74, z: 1.74}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2083282006
GameObject:
m_ObjectHideFlags: 0
@ -4450,8 +4702,8 @@ Transform:
m_GameObject: {fileID: 2123298904}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: -11.43, y: 0, z: 15.52}
m_LocalScale: {x: 29.283, y: 1, z: 6.4701}
m_LocalPosition: {x: -11.43, y: 0, z: 12.12}
m_LocalScale: {x: 20.9, y: 1, z: 9}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1262927944}
@ -4543,7 +4795,7 @@ Transform:
m_GameObject: {fileID: 4844760018351296912}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 29.98, y: 0.4, z: -4.27}
m_LocalPosition: {x: 33.56, y: 0.4, z: -4.27}
m_LocalScale: {x: 160, y: 160, z: 160}
m_ConstrainProportionsScale: 1
m_Children: []
@ -4973,7 +5225,7 @@ Transform:
m_GameObject: {fileID: 8169620259235416217}
serializedVersion: 2
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 17.74, y: 0, z: -9.72}
m_LocalPosition: {x: 17.74, y: 0, z: -14.03}
m_LocalScale: {x: 160, y: 160, z: 160}
m_ConstrainProportionsScale: 1
m_Children: []
@ -5486,6 +5738,8 @@ SceneRoots:
- {fileID: 209519241}
- {fileID: 2083282010}
- {fileID: 90977001}
- {fileID: 1406665477}
- {fileID: 2064626062}
- {fileID: 1034880022}
- {fileID: 84958528}
- {fileID: 458232995}

@ -13,9 +13,11 @@ public class BearAwareness : MonoBehaviour
public static event Action<float> HasWokenUp;
public float timeToWakeUp = 2f;
public float timeToWakeUp = 4f;
public AudioClip Awake;
public static bool isPaused = false;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
@ -33,18 +35,17 @@ public class BearAwareness : MonoBehaviour
void IncreaseAwareness(int noice)
{
awareness += noice;
awarenessSlider.value = awareness;
//awareness += noice;
awarenessSlider.value += noice;
if (awareness >= awarenessSlider.maxValue)
if (awarenessSlider.value >= awarenessSlider.maxValue)
{
isPaused = true;
SoundEffectManager.Play("Alert");
BackgroundManager.StopBG();
BackgroundManager.PlayBG(true,Awake);
StopAllCoroutines();
Debug.Log("Bear is awake now!");
HasWokenUp.Invoke(timeToWakeUp);
StartCoroutine(Decrease(2));
}
}
@ -53,6 +54,13 @@ public class BearAwareness : MonoBehaviour
while (true)
{
Debug.Log(isPaused);
while (isPaused)
{
Debug.Log("Pause");
}
yield return new WaitForSeconds(delay);
awarenessSlider.value -= 2;
@ -64,15 +72,15 @@ public class BearAwareness : MonoBehaviour
void ChangeSliderColor()
{
if (awareness >= (awarenessSlider.maxValue - 10))
if (awarenessSlider.value >= (awarenessSlider.maxValue - 10))
{
SilderColor.color = Color.red;
}
else if (awareness >= (awarenessSlider.maxValue / 2))
else if (awarenessSlider.value >= (awarenessSlider.maxValue / 2))
{
SilderColor.color = Color.orange;
}
else if (awareness <= (awarenessSlider.maxValue / 2) )
else if (awarenessSlider.value <= (awarenessSlider.maxValue / 2) )
{
SilderColor.color = Color.darkGreen;
}

@ -95,7 +95,8 @@ public class BearIsAwake : MonoBehaviour
}
elapsed += Time.deltaTime;
}
BearAwareness.isPaused = false;
//if (Physics.Raycast(transform.position, direction, out RaycastHit hit, distance))
//{
@ -129,6 +130,7 @@ public class BearIsAwake : MonoBehaviour
private void OnTriggerEnter(Collider other)
{
BearAwareness.isPaused = true;
SoundEffectManager.Play("Alert");
BackgroundManager.StopBG();
BackgroundManager.PlayBG(true,Awake);

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

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f26b32fb1cef84d469905e5d729014ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 49380e362d3ef824ab5016f74e90dee6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 22e1c542d2344074eb0659a8d2cc3456
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Loading…
Cancel
Save