Merge branch 'master' of https://github.coventry.ac.uk/managedv/206CDE

Assets/ButtonManager.cs

@@ -7,11 +7,11 @@ public class ButtonManager : MonoBehaviour
 {
     public void Newbutton(string newLevel)
     {
-        SceneManager.LoadScene(2);
+        SceneManager.LoadScene(3);
     }
     public void building(string newLevel)
     {
-        SceneManager.LoadScene(3);
+        SceneManager.LoadScene(4);
     }
     public void ExitBtn(string newLvel)
     {

Assets/LOGIN.unity

@@ -121,6 +121,135 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &376690323
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 376690324}
+  - component: {fileID: 376690327}
+  - component: {fileID: 376690326}
+  - component: {fileID: 376690325}
+  m_Layer: 5
+  m_Name: RegisterBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &376690324
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376690323}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 758178103}
+  m_Father: {fileID: 986449596}
+  m_RootOrder: 7
+  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: 9.125, y: -453.83}
+  m_SizeDelta: {x: 311.9, y: 115.1}
+  m_Pivot: {x: 0.49999988, y: 0.608597}
+--- !u!114 &376690325
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376690323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 376690326}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 963194229}
+        m_MethodName: ChangeScene
+        m_Mode: 5
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: register
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &376690326
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376690323}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &376690327
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376690323}
+  m_CullTransparentMesh: 0
 --- !u!1 &424707067
 GameObject:
   m_ObjectHideFlags: 0
@@ -194,6 +323,83 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 424707067}
   m_CullTransparentMesh: 0
+--- !u!1 &758178102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 758178103}
+  - component: {fileID: 758178105}
+  - component: {fileID: 758178104}
+  m_Layer: 5
+  m_Name: text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &758178103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 758178102}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 376690324}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &758178104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 758178102}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 60
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 6
+    m_MaxSize: 60
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: REGISTER
+--- !u!222 &758178105
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 758178102}
+  m_CullTransparentMesh: 0
 --- !u!1 &853342961
 GameObject:
   m_ObjectHideFlags: 0
@@ -539,6 +745,7 @@ RectTransform:
   - {fileID: 1945103065}
   - {fileID: 1403050478}
   - {fileID: 906537738}
+  - {fileID: 376690324}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1258,7 +1465,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1782055469}
   - component: {fileID: 1782055470}
-  - component: {fileID: 1782055471}
   m_Layer: 0
   m_Name: LoginController
   m_TagString: Untagged
@@ -1289,24 +1495,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 1782055468}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6336ce04db1321c429ac05070c24375c, type: 3}
+  m_Script: {fileID: 11500000, guid: 93d7d8c2f7a1f474e9a522f3db7f3c4f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   username: {fileID: 1945103066}
   Password: {fileID: 1704541521}
   Url: http://localhost/UnityBackEndTutorial/connect.php
---- !u!114 &1782055471
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1782055468}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ba05a9b1ea098934bbe3493322ca2dcd, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1882213151
 GameObject:
   m_ObjectHideFlags: 0

Assets/Login.cs

@@ -10,7 +10,13 @@ public class Login : MonoBehaviour
 
     public InputField username;
     public InputField Password;
-    public string Url;
+    public InputField Myname;
+    public InputField myUsername;
+    public InputField myPassword;
+    public InputField myCompass;
+
+
+    public string[] Url;
     public void PerformLogin()
     {
         StartCoroutine(login());
@@ -21,7 +27,7 @@ public class Login : MonoBehaviour
         loginForm.AddField("email", username.text);
         loginForm.AddField("pass", username.text);
 
-        UnityWebRequest www = UnityWebRequest.Post(Url, loginForm);
+        UnityWebRequest www = UnityWebRequest.Post(Url[0], loginForm);
         yield return www.SendWebRequest();
 
         if (www.isDone)
@@ -31,6 +37,51 @@ public class Login : MonoBehaviour
 
             if(result != "0")
             {
+                SceneManager.LoadScene("0");
+            }
+
+            else
+            {
+                Debug.Log("Error");
+            }
+        }
+
+    }
+
+
+
+
+    public void PerformRegister()
+    {
+        if(myPassword.text == myCompass.text)
+        {
+            StartCoroutine(register());
+
+        }
+        else
+        {
+            Debug.LogWarning("Password must be same with confirm password");
+        }
+    }
+    IEnumerator register()
+    {
+        WWWForm RegisterForm = new WWWForm();
+        RegisterForm.AddField("email", myUsername.text);
+        RegisterForm.AddField("pass", myPassword.text);
+        RegisterForm.AddField("name", Myname.text);
+
+
+        UnityWebRequest www = UnityWebRequest.Post(Url[1], RegisterForm);
+        yield return www.SendWebRequest();
+
+        if (www.isDone)
+        {
+            var result = www.downloadHandler.text;
+            Debug.Log(result);
+
+            if (result != "0")
+            {
+                Debug.Log(result); 
                 SceneManager.LoadScene("OptionMenu");
             }
 
@@ -42,4 +93,5 @@ public class Login : MonoBehaviour
 
     }
 
+
 }