7 Commits

Author SHA1 Message Date
jlink a2563a17b0 ? 2026-02-05 09:41:51 +01:00
jlink d46baa849c now 2026-01-26 16:26:19 +01:00
jlink 21678ef37e fix 2026-01-26 16:08:24 +01:00
jlink ffdfd584ff menu (1 or 2 Player) and escape 2026-01-26 16:02:46 +01:00
jlink b1b3332b49 sleepingBear 2026-01-25 22:08:14 +01:00
jlink 4731404294 fine 2026-01-25 21:08:21 +01:00
jlink 58119f52b9 fix 2026-01-25 20:23:10 +01:00
12 changed files with 8222 additions and 51 deletions
Binary file not shown.
@@ -0,0 +1,115 @@
fileFormatVersion: 2
guid: 6d94ccefa1e04ee49b529cb5edff2a1e
ModelImporter:
serializedVersion: 24200
internalIDToNameTable: []
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Material
second: {fileID: 2100000, guid: e780ed95d4c88d842a5eed92c1761569, type: 2}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
generateMeshLods: 0
meshLodGenerationFlags: 0
maximumMeshLod: -1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
File diff suppressed because it is too large Load Diff
+14 -9
View File
@@ -13,9 +13,10 @@ public class BearAwareness : MonoBehaviour
public static event Action<float> HasWokenUp; public static event Action<float> HasWokenUp;
public float timeToWakeUp = 2f; public float timeToWakeUp = 4f;
public AudioClip Awake; public AudioClip Awake;
// Start is called once before the first execution of Update after the MonoBehaviour is created // Start is called once before the first execution of Update after the MonoBehaviour is created
void Start() void Start()
{ {
@@ -29,22 +30,25 @@ public class BearAwareness : MonoBehaviour
private void Update() private void Update()
{ {
ChangeSliderColor(); ChangeSliderColor();
if (Input.GetKeyDown(KeyCode.Escape))
{
Application.Quit();
}
} }
void IncreaseAwareness(int noice) void IncreaseAwareness(int noice)
{ {
awareness += noice; //awareness += noice;
awarenessSlider.value = awareness; awarenessSlider.value += noice;
if (awareness >= awarenessSlider.maxValue) if (awarenessSlider.value >= awarenessSlider.maxValue)
{ {
SoundEffectManager.Play("Alert"); SoundEffectManager.Play("Alert");
BackgroundManager.StopBG(); BackgroundManager.StopBG();
BackgroundManager.PlayBG(true,Awake); BackgroundManager.PlayBG(true,Awake);
StopAllCoroutines();
Debug.Log("Bear is awake now!"); Debug.Log("Bear is awake now!");
HasWokenUp.Invoke(timeToWakeUp); HasWokenUp.Invoke(timeToWakeUp);
StartCoroutine(Decrease(2));
} }
} }
@@ -64,17 +68,18 @@ public class BearAwareness : MonoBehaviour
void ChangeSliderColor() void ChangeSliderColor()
{ {
if (awareness >= (awarenessSlider.maxValue - 10)) if (awarenessSlider.value >= (awarenessSlider.maxValue - 10))
{ {
SilderColor.color = Color.red; SilderColor.color = Color.red;
} }
else if (awareness >= (awarenessSlider.maxValue / 2)) else if (awarenessSlider.value >= (awarenessSlider.maxValue / 2))
{ {
SilderColor.color = Color.orange; SilderColor.color = Color.orange;
} }
else if (awareness <= (awarenessSlider.maxValue / 2) ) else if (awarenessSlider.value <= (awarenessSlider.maxValue / 2) )
{ {
SilderColor.color = Color.darkGreen; SilderColor.color = Color.darkGreen;
} }
} }
} }
+11
View File
@@ -18,6 +18,10 @@ public class BearIsAwake : MonoBehaviour
public AudioClip BG; public AudioClip BG;
public AudioClip Awake; public AudioClip Awake;
public GameObject sleepingBear;
public GameObject awakeBear;
private void Start() private void Start()
{ {
BearAwareness.HasWokenUp += IsAwake; BearAwareness.HasWokenUp += IsAwake;
@@ -33,17 +37,22 @@ public class BearIsAwake : MonoBehaviour
{ {
timer += Time.deltaTime; timer += Time.deltaTime;
bearTimer.fillAmount = timer / bearAwareness.timeToWakeUp; bearTimer.fillAmount = timer / bearAwareness.timeToWakeUp;
bearAwareness.awarenessSlider.value = bearAwareness.awarenessSlider.maxValue;
} }
} }
public void IsAwake(float time) public void IsAwake(float time)
{ {
wakingUp = true; wakingUp = true;
StartCoroutine(SleepIsOver(time)); StartCoroutine(SleepIsOver(time));
sleepingBear.SetActive(false);
awakeBear.SetActive(true);
} }
IEnumerator SleepIsOver(float time) IEnumerator SleepIsOver(float time)
{ {
yield return new WaitForSeconds(time); yield return new WaitForSeconds(time);
//Vector3 direction = Penguin.position - transform.position; //Vector3 direction = Penguin.position - transform.position;
@@ -96,6 +105,8 @@ public class BearIsAwake : MonoBehaviour
elapsed += Time.deltaTime; elapsed += Time.deltaTime;
} }
sleepingBear.SetActive(true);
awakeBear.SetActive(false);
//if (Physics.Raycast(transform.position, direction, out RaycastHit hit, distance)) //if (Physics.Raycast(transform.position, direction, out RaycastHit hit, distance))
//{ //{
+13 -13
View File
@@ -101,16 +101,16 @@ MonoBehaviour:
m_Keys: [] m_Keys: []
m_Values: m_Values:
m_PrefilteringModeMainLightShadows: 3 m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 4 m_PrefilteringModeAdditionalLight: 0
m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilteringModeAdditionalLightShadows: 2
m_PrefilterXRKeywords: 1 m_PrefilterXRKeywords: 1
m_PrefilteringModeForwardPlus: 1 m_PrefilteringModeForwardPlus: 2
m_PrefilteringModeDeferredRendering: 0 m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 1 m_PrefilteringModeScreenSpaceOcclusion: 2
m_PrefilterDebugKeywords: 1 m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 0 m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1 m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 0 m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 0 m_PrefilterSSAODepthNormals: 0
m_PrefilterSSAOSourceDepthLow: 1 m_PrefilterSSAOSourceDepthLow: 1
m_PrefilterSSAOSourceDepthMedium: 1 m_PrefilterSSAOSourceDepthMedium: 1
@@ -122,17 +122,17 @@ MonoBehaviour:
m_PrefilterSSAOSampleCountHigh: 1 m_PrefilterSSAOSampleCountHigh: 1
m_PrefilterDBufferMRT1: 1 m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1 m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 0 m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 0 m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 0 m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 0 m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0 m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1 m_PrefilterScreenCoord: 1
m_PrefilterScreenSpaceIrradiance: 0 m_PrefilterScreenSpaceIrradiance: 1
m_PrefilterNativeRenderPass: 1 m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 0 m_PrefilterUseLegacyLightmaps: 0
m_PrefilterBicubicLightmapSampling: 0 m_PrefilterBicubicLightmapSampling: 1
m_PrefilterReflectionProbeRotation: 0 m_PrefilterReflectionProbeRotation: 1
m_PrefilterReflectionProbeBlending: 0 m_PrefilterReflectionProbeBlending: 0
m_PrefilterReflectionProbeBoxProjection: 0 m_PrefilterReflectionProbeBoxProjection: 0
m_PrefilterReflectionProbeAtlas: 0 m_PrefilterReflectionProbeAtlas: 0
@@ -66,7 +66,21 @@ MonoBehaviour:
- rid: 1270833664099090442 - rid: 1270833664099090442
- rid: 1270833664099090443 - rid: 1270833664099090443
m_RuntimeSettings: m_RuntimeSettings:
m_List: [] m_List:
- rid: 6852985685364965378
- rid: 6852985685364965379
- rid: 6852985685364965380
- rid: 6852985685364965381
- rid: 6852985685364965384
- rid: 6852985685364965385
- rid: 6852985685364965392
- rid: 6852985685364965394
- rid: 8712630790384254976
- rid: 1270833664099090433
- rid: 1270833664099090434
- rid: 1270833664099090437
- rid: 1270833664099090441
- rid: 1270833664099090443
m_AssetVersion: 9 m_AssetVersion: 9
m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames: m_RenderingLayerNames:
+8
View File
@@ -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
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 49380e362d3ef824ab5016f74e90dee6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+4 -1
View File
@@ -524,7 +524,10 @@ PlayerSettings:
m_Height: 720 m_Height: 720
m_Kind: 1 m_Kind: 1
m_SubKind: m_SubKind:
m_BuildTargetBatching: [] m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1
m_DynamicBatching: 0
m_BuildTargetShaderSettings: [] m_BuildTargetShaderSettings: []
m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobs: []
m_BuildTargetGraphicsJobMode: [] m_BuildTargetGraphicsJobMode: []
+1 -1
View File
@@ -4,7 +4,7 @@
UnityConnectSettings: UnityConnectSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 1 serializedVersion: 1
m_Enabled: 0 m_Enabled: 1
m_TestMode: 0 m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events