Add FSImg to show Permutations Formula

TLChicken · Jul 30, 2021 · 1ed476b · 1ed476b
1 parent d6a8621
commit 1ed476b
Show file tree

Hide file tree

Showing 12 changed files with 1,752 additions and 1,097 deletions.
diff --git a/Assets/Scenes/Finished Levels/Level 5.unity b/Assets/Scenes/Finished Levels/Level 5.unity
diff --git a/Assets/Scenes/Finished Levels/Level 7.unity b/Assets/Scenes/Finished Levels/Level 7.unity
diff --git a/Assets/Scenes/Ben5.unity → Assets/Scenes/Finished Levels/Level 8.unity b/Assets/Scenes/Ben5.unity → Assets/Scenes/Finished Levels/Level 8.unity
diff --git a/Assets/Scenes/Ben5.unity.meta → ...Scenes/Finished Levels/Level 8.unity.meta b/Assets/Scenes/Ben5.unity.meta → ...Scenes/Finished Levels/Level 8.unity.meta
diff --git a/Assets/Scenes/TLC8.unity → Assets/Scenes/Finished Levels/Level 9.unity b/Assets/Scenes/TLC8.unity → Assets/Scenes/Finished Levels/Level 9.unity
diff --git a/Assets/Scenes/TLC8.unity.meta → ...Scenes/Finished Levels/Level 9.unity.meta b/Assets/Scenes/TLC8.unity.meta → ...Scenes/Finished Levels/Level 9.unity.meta
diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity
@@ -704,6 +704,8 @@ RectTransform:
   - {fileID: 890927321}
   - {fileID: 364988456}
   - {fileID: 1316594286}
+  - {fileID: 549669847}
+  - {fileID: 2065301008}
   m_Father: {fileID: 1985585189}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1833,6 +1835,116 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 543803718}
   m_CullTransparentMesh: 1
+--- !u!1001 &549669846
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 261198844}
+    m_Modifications:
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 120
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 181
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -211
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398633, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: selLvlName
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398639, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Name
+      value: LvlSelBtnContainer (8)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437774346434, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Text
+      value: Level 8
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+--- !u!224 &549669847 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+  m_PrefabInstance: {fileID: 549669846}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &578432401
 GameObject:
   m_ObjectHideFlags: 0
@@ -6792,6 +6904,116 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dcef382502bab5a42b45ae8f54f1de83, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &2065301007
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 261198844}
+    m_Modifications:
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_RootOrder
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 120
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 181
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -211
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398633, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: selLvlName
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437319398639, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Name
+      value: LvlSelBtnContainer (9)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7926898437774346434, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+      propertyPath: m_Text
+      value: Level 9
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+--- !u!224 &2065301008 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7926898437319398632, guid: 1da8698621874ec44a4c69c2fa074284, type: 3}
+  m_PrefabInstance: {fileID: 2065301007}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &2072381102
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/Main Menu/EnumSceneName.cs b/Assets/Scripts/Main Menu/EnumSceneName.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 public class EnumSceneName {
-    public static string[] levelName = { "Tutorial", "Level 1", "Level 2", "Level 3", "Level 4", "Level 5", "Level 6", "Level 7", "SampleLevel2" };
+    public static string[] levelName = { "Tutorial", "Level 1", "Level 2", "Level 3", "Level 4", "Level 5", "Level 6", "Level 7", "Level 8", "Level 9", "SampleLevel2" };
 
     public enum lvlNameEnum {
         TUTORIAL,
@@ -14,6 +14,8 @@ public enum lvlNameEnum {
         LEVEL5,
         LEVEL6,
         LEVEL7,
+        LEVEL8,
+        LEVEL9,
         SampleLevel2,
 
         //Not in levelname array

diff --git a/Assets/Scripts/Map and Tiles/InvisEventTriggers/FullSizeImgTrigger.cs b/Assets/Scripts/Map and Tiles/InvisEventTriggers/FullSizeImgTrigger.cs
@@ -4,6 +4,7 @@
 
 public class FullSizeImgTrigger : InvisEventTrigger {
     public Sprite hbEnterImg;
+    public bool displayMessageInHFPanel = false;
 
     // Start is called before the first frame update
     protected override void Start() {
@@ -20,7 +21,10 @@ public override void onHBEnter() {
         UI_OtherInHF otherUIMgr = LevelMasterSingleton.LM.getCurrOtherUIHFMgr();
         otherUIMgr.setFullScreenImg(hbEnterImg);
         otherUIMgr.showFullScreenImg();
-        LevelMasterSingleton.LM.hashFunctionMgr.changeAndShowMsgForSeconds("Congratulations!!!", "You have travelled the furthest to the right that is possible in the current game.", 20);
+        if (displayMessageInHFPanel) {
+            LevelMasterSingleton.LM.hashFunctionMgr.changeAndShowMsgForSeconds("Congratulations!!!", "You have travelled the furthest to the right that is possible in the current game.", 20);
+
+        }
 
     }
 

diff --git a/Assets/Textures/Others/FullSizeImgs/Level 5 Permutation Formula.png b/Assets/Textures/Others/FullSizeImgs/Level 5 Permutation Formula.png