Browse Source

Bild version 4.7

Unknown 6 years ago
parent
commit
1cb71af948

BIN
.vs/RR1st/v15/Server/sqlite3/storage.ide


BIN
.vs/RR1st/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/RR1st/v15/Server/sqlite3/storage.ide-wal


+ 6 - 0
.vs/VSWorkspaceState.json

@@ -0,0 +1,6 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "PreviewInSolutionExplorer": false
+}

BIN
.vs/slnx.sqlite


+ 16 - 4
Assets/Scenes/FlowerpotPhonics.unity

@@ -311,10 +311,10 @@ MonoBehaviour:
   m_TwoBoxesSprite: {fileID: 1351005463}
   m_OnwBoxSprite: {fileID: 910430224}
   m_NextItem: {fileID: 0}
-  oneBoxTransform: {fileID: 0}
-  twoBoxTransform: {fileID: 0}
-  threeBoxTransform: {fileID: 0}
-  fourBoxTransform: {fileID: 0}
+  oneBoxTransform: {fileID: 760126039}
+  twoBoxTransform: {fileID: 1649669792}
+  threeBoxTransform: {fileID: 918609270}
+  fourBoxTransform: {fileID: 1577925761}
 --- !u!61 &13069966
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -2973,6 +2973,7 @@ GameObject:
   m_Component:
   - component: {fileID: 452756399}
   - component: {fileID: 452756398}
+  - component: {fileID: 452756401}
   - component: {fileID: 452756400}
   m_Layer: 0
   m_Name: SceneCode
@@ -3070,6 +3071,17 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 640, y: 480}
   m_EdgeRadius: 0
+--- !u!114 &452756401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 452756397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 347ba81f42210cc4d8476ef3518dbbb9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &454694071
 GameObject:
   m_ObjectHideFlags: 0

+ 3 - 10
Assets/Scripts/Localizer/LocFP.cs

@@ -4,7 +4,7 @@ using System.Collections;
 using System.IO;
 
 
-public class LocFP 
+public class LocFP : MonoBehaviour
 {
     int language = 3;
     string[] listLanguages = { "Danish", "English", "Finnish", "French", "Nordic", "Spanish", "Swedish" };
@@ -13,14 +13,7 @@ public class LocFP
 
     bool languageFilled = false;
 
-    private ArrayList listOfGameImages;   
-
-    static void Init()
-    {
-        // Get existing open window or if none, make a new one:
-        LocFP window = (LocFP)EditorWindow.GetWindow(typeof(LocFP));
-        window.Show();
-    }
+    private ArrayList listOfGameImages;       
 
     void CheckLanguageCamp()
     {
@@ -152,7 +145,7 @@ public class LocFP
 
         //Configure Text Component
         Text textFont = itemNameLabelText.GetComponent<Text>();
-        textFont.font = Resources.GetBuiltinResource(typeof(Font), "Arial.ttf") as Font;
+        textFont.font = (Font)Resources.GetBuiltinResource(typeof(Font), "Arial.ttf");
         textFont.fontStyle = FontStyle.Normal;
         textFont.color = new Color(0f, 0f, 0f);
         textFont.text = nameItem;

+ 8 - 8
Assets/Scripts/SceneElement/FlowerpotPhonics/CartManager.cs

@@ -45,22 +45,22 @@ namespace ReaderRabbit
 		{
 			m_CurrentNumberOfBoxes = 3;
 
-			foreach (Transform child in oneBoxTransform){ //mycode --rafael --> fill m_OneBoxItem List.
+			foreach (Transform child in oneBoxTransform){ 
 				BoxItem boxItem = child.GetComponent<BoxItem>();
 				m_OneBoxItems.Add (boxItem);
 			}
 			
-			foreach (Transform child in twoBoxTransform){ //mycode --rafael --> fill m_TwoBoxItem List.
+			foreach (Transform child in twoBoxTransform){ 
 				BoxItem boxItem = child.GetComponent<BoxItem>();
 				m_TwoBoxesItems.Add (boxItem);
 			}
 			
-			foreach (Transform child in threeBoxTransform){ //mycode --rafael --> fill m_ThreeBoxItem List.
+			foreach (Transform child in threeBoxTransform){ 
 				BoxItem boxItem = child.GetComponent<BoxItem>();
 				m_ThreeBoxesItems.Add (boxItem);
 			}
 			
-			foreach (Transform child in fourBoxTransform){ //mycode --rafael --> fill m_FourBoxItem List.
+			foreach (Transform child in fourBoxTransform){ 
 				BoxItem boxItem = child.GetComponent<BoxItem>();
 				m_FourBoxesItems.Add (boxItem);
 			}
@@ -79,25 +79,25 @@ namespace ReaderRabbit
 			
 			foreach (BoxItem i in m_FourBoxesItems)
 			{
-				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); //mycode --rafael --> made this beause the localization process.
+				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); 
 				i.gameObject.SetActive(false);
 			}
 			
 			foreach (BoxItem i in m_ThreeBoxesItems)
 			{
-				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); //mycode --rafael --> made this beause the localization process.
+				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); 
 				i.gameObject.SetActive(false);
 			}
 			
 			foreach (BoxItem i in m_TwoBoxesItems)
 			{
-				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); //mycode --rafael --> made this beause the localization process.
+				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); 
 				i.gameObject.SetActive(false);
 			}
 			
 			foreach (BoxItem i in m_OneBoxItems)
 			{
-				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); //mycode --rafael --> made this beause the localization process.
+				i.gameObject.transform.localScale = new Vector2 (Screen.width * 0.1f, Screen.height * 0.2f); 
 				i.gameObject.SetActive(false);
 			}
 		}

+ 2 - 6
Assets/Scripts/SceneRoot/SceneFlowerpotPhonics.cs

@@ -103,12 +103,8 @@ namespace ReaderRabbit
         //FP.DeleteItemsGameObjects();
         protected override void Awake()
         {
-            isLoad = false;
-            if (!isLoad) {
-                LocFP FP = new LocFP();
-                FP.CreateItems();
-                isLoad = true;
-            }
+            LocFP FP = GetComponent<LocFP>();
+            FP.CreateItems();                           
         }
 
         protected override void Start()