Skip to content

Commit c234c9d

Browse files
author
Super-Lovers
committed
Created loading screen, updated HOP and manuals
I also made the puzzles from the diary that can be displayed replayable
1 parent 9ef137d commit c234c9d

File tree

73 files changed

+6183
-709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+6183
-709
lines changed

‎Builds/morgantravels.apk‎

228 KB
Binary file not shown.

‎Case 4/Assets/Animations/Animators/LoaderAnimator.controller‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!91 &9100000
4+
AnimatorController:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: LoaderAnimator
10+
serializedVersion: 5
11+
m_AnimatorParameters: []
12+
m_AnimatorLayers:
13+
- serializedVersion: 5
14+
m_Name: Base Layer
15+
m_StateMachine: {fileID: 2428361594033122121}
16+
m_Mask: {fileID: 0}
17+
m_Motions: []
18+
m_Behaviours: []
19+
m_BlendingMode: 0
20+
m_SyncedLayerIndex: -1
21+
m_DefaultWeight: 0
22+
m_IKPass: 0
23+
m_SyncedLayerAffectsTiming: 0
24+
m_Controller: {fileID: 9100000}
25+
--- !u!1107 &2428361594033122121
26+
AnimatorStateMachine:
27+
serializedVersion: 5
28+
m_ObjectHideFlags: 1
29+
m_CorrespondingSourceObject: {fileID: 0}
30+
m_PrefabInstance: {fileID: 0}
31+
m_PrefabAsset: {fileID: 0}
32+
m_Name: Base Layer
33+
m_ChildStates:
34+
- serializedVersion: 1
35+
m_State: {fileID: 9150941815724025080}
36+
m_Position: {x: 200, y: 0, z: 0}
37+
m_ChildStateMachines: []
38+
m_AnyStateTransitions: []
39+
m_EntryTransitions: []
40+
m_StateMachineTransitions: {}
41+
m_StateMachineBehaviours: []
42+
m_AnyStatePosition: {x: 50, y: 20, z: 0}
43+
m_EntryPosition: {x: 50, y: 120, z: 0}
44+
m_ExitPosition: {x: 800, y: 120, z: 0}
45+
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
46+
m_DefaultState: {fileID: 9150941815724025080}
47+
--- !u!1102 &9150941815724025080
48+
AnimatorState:
49+
serializedVersion: 5
50+
m_ObjectHideFlags: 1
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_Name: LoaderAnimation
55+
m_Speed: 1
56+
m_CycleOffset: 0
57+
m_Transitions: []
58+
m_StateMachineBehaviours: []
59+
m_Position: {x: 50, y: 50, z: 0}
60+
m_IKOnFeet: 0
61+
m_WriteDefaultValues: 1
62+
m_Mirror: 0
63+
m_SpeedParameterActive: 0
64+
m_MirrorParameterActive: 0
65+
m_CycleOffsetParameterActive: 0
66+
m_TimeParameterActive: 0
67+
m_Motion: {fileID: 7400000, guid: b325d165840bcb346a7cd214cf09c48f, type: 2}
68+
m_Tag:
69+
m_SpeedParameter:
70+
m_MirrorParameter:
71+
m_CycleOffsetParameter:
72+
m_TimeParameter:

‎Case 4/Assets/Animations/Animators/LoaderAnimator.controller.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Case 4/Assets/Animations/LoaderAnimation.anim‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: LoaderAnimation
10+
serializedVersion: 6
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves: []
19+
m_FloatCurves: []
20+
m_PPtrCurves:
21+
- curve:
22+
- time: 0
23+
value: {fileID: 8568571243882637337, guid: 449d3f8c10e112d4594a0026a93e2a4a,
24+
type: 3}
25+
- time: 0.125
26+
value: {fileID: -994951024777611619, guid: 449d3f8c10e112d4594a0026a93e2a4a,
27+
type: 3}
28+
- time: 0.25
29+
value: {fileID: -1168590287713072989, guid: 449d3f8c10e112d4594a0026a93e2a4a,
30+
type: 3}
31+
- time: 0.375
32+
value: {fileID: 1988385036761099804, guid: 449d3f8c10e112d4594a0026a93e2a4a,
33+
type: 3}
34+
attribute: m_Sprite
35+
path:
36+
classID: 114
37+
script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
38+
m_SampleRate: 8
39+
m_WrapMode: 0
40+
m_Bounds:
41+
m_Center: {x: 0, y: 0, z: 0}
42+
m_Extent: {x: 0, y: 0, z: 0}
43+
m_ClipBindingConstant:
44+
genericBindings:
45+
- serializedVersion: 2
46+
path: 0
47+
attribute: 2015549526
48+
script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
49+
typeID: 114
50+
customType: 0
51+
isPPtrCurve: 1
52+
pptrCurveMapping:
53+
- {fileID: 8568571243882637337, guid: 449d3f8c10e112d4594a0026a93e2a4a, type: 3}
54+
- {fileID: -994951024777611619, guid: 449d3f8c10e112d4594a0026a93e2a4a, type: 3}
55+
- {fileID: -1168590287713072989, guid: 449d3f8c10e112d4594a0026a93e2a4a, type: 3}
56+
- {fileID: 1988385036761099804, guid: 449d3f8c10e112d4594a0026a93e2a4a, type: 3}
57+
m_AnimationClipSettings:
58+
serializedVersion: 2
59+
m_AdditiveReferencePoseClip: {fileID: 0}
60+
m_AdditiveReferencePoseTime: 0
61+
m_StartTime: 0
62+
m_StopTime: 0.5
63+
m_OrientationOffsetY: 0
64+
m_Level: 0
65+
m_CycleOffset: 0
66+
m_HasAdditiveReferencePose: 0
67+
m_LoopTime: 1
68+
m_LoopBlend: 0
69+
m_LoopBlendOrientation: 0
70+
m_LoopBlendPositionY: 0
71+
m_LoopBlendPositionXZ: 0
72+
m_KeepOriginalOrientation: 0
73+
m_KeepOriginalPositionY: 1
74+
m_KeepOriginalPositionXZ: 0
75+
m_HeightFromFeet: 0
76+
m_Mirror: 0
77+
m_EditorCurves: []
78+
m_EulerEditorCurves: []
79+
m_HasGenericRootTransform: 0
80+
m_HasMotionFloatCurves: 0
81+
m_Events: []

‎Case 4/Assets/Animations/LoaderAnimation.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Case 4/Assets/ItemNotificationManager.cs‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
using System.Collections;
2+
using TMPro;
3+
using UnityEngine;
4+
using UnityEngine.UI;
5+
6+
public class ItemNotificationManager : MonoBehaviour
7+
{
8+
public static ItemNotificationManager Instance;
9+
public GameObject ItemNotificationPrefab;
10+
private Animator _itemNotificationPrefabAnimator;
11+
12+
void Start()
13+
{
14+
_itemNotificationPrefabAnimator = ItemNotificationPrefab.GetComponent<Animator>();
15+
if (Instance != null && Instance != this)
16+
{
17+
Destroy(Instance);
18+
}
19+
else
20+
{
21+
Instance = this;
22+
}
23+
}
24+
25+
public void GetItem(Item item)
26+
{
27+
string name = string.Empty;
28+
29+
switch (SettingsManager.Instance.Language)
30+
{
31+
case "English":
32+
name = item.Name;
33+
break;
34+
case "Dutch":
35+
name = item.NameDutch;
36+
break;
37+
}
38+
ItemNotificationPrefab.GetComponentInChildren<TextMeshProUGUI>().text = name;
39+
40+
ItemNotificationPrefab.GetComponentsInChildren<Image>()[1].sprite = Resources.Load<Sprite>("Items/" + item.AssetsImageName);
41+
42+
_itemNotificationPrefabAnimator.SetBool("Toggle", true);
43+
StartCoroutine(ReturnAchievement());
44+
}
45+
46+
public void GetItem(Clothing item)
47+
{
48+
string name = string.Empty;
49+
50+
switch (SettingsManager.Instance.Language)
51+
{
52+
case "English":
53+
name = item.Name;
54+
break;
55+
case "Dutch":
56+
name = item.NameDutch;
57+
break;
58+
}
59+
ItemNotificationPrefab.GetComponentInChildren<TextMeshProUGUI>().text = name;
60+
61+
ItemNotificationPrefab.GetComponentsInChildren<Image>()[1].sprite = Resources.Load<Sprite>("Items/" + item.Icon);
62+
63+
_itemNotificationPrefabAnimator.SetBool("Toggle", true);
64+
StartCoroutine(ReturnAchievement());
65+
}
66+
67+
private IEnumerator ReturnAchievement()
68+
{
69+
yield return new WaitForSeconds(2f);
70+
_itemNotificationPrefabAnimator.SetBool("Toggle", false);
71+
}
72+
}

‎Case 4/Assets/ItemNotificationManager.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Case 4/Assets/LoaderController.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class LoaderController : MonoBehaviour
6+
{
7+
// Start is called before the first frame update
8+
void Start()
9+
{
10+
11+
}
12+
13+
// Update is called once per frame
14+
void Update()
15+
{
16+
17+
}
18+
}

‎Case 4/Assets/LoaderController.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Case 4/Assets/Prefabs/Achievements.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)