register fix

managedv · Mar 30, 2020 · 6294ad32ec20ac805deb18f39658a73421fb3b69 · 6294ad3
1 parent d0628ed
commit 6294ad32ec20ac805deb18f39658a73421fb3b69
Show file tree

Hide file tree

Showing 14 changed files with 681 additions and 925 deletions.
diff --git a/.vs/206CDE/v16/.suo b/.vs/206CDE/v16/.suo
diff --git a/.vs/206CDE/v16/Server/sqlite3/storage.ide b/.vs/206CDE/v16/Server/sqlite3/storage.ide
diff --git a/.vs/206CDE/v16/Server/sqlite3/storage.ide-shm b/.vs/206CDE/v16/Server/sqlite3/storage.ide-shm
diff --git a/.vs/206CDE/v16/Server/sqlite3/storage.ide-wal b/.vs/206CDE/v16/Server/sqlite3/storage.ide-wal
diff --git a/Assembly-CSharp-Editor-firstpass.csproj b/Assembly-CSharp-Editor-firstpass.csproj
diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/Login.cs b/Assets/Login.cs
@@ -10,13 +10,16 @@ public class Login : MonoBehaviour
 
     public InputField username;
     public InputField Password;
-    public InputField Myname;
     public InputField myUsername;
     public InputField myPassword;
     public InputField myCompass;
 
 
     public string[] Url;
+    public void login(string newLevel)
+    {
+        SceneManager.LoadScene(0);
+    }
     public void PerformLogin()
     {
         StartCoroutine(login());
@@ -68,7 +71,6 @@ public class Login : MonoBehaviour
         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);

diff --git a/Assets/register.unity b/Assets/register.unity
@@ -121,83 +121,6 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
---- !u!1 &358013543
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 358013544}
-  - component: {fileID: 358013546}
-  - component: {fileID: 358013545}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &358013544
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 358013543}
-  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: 1159698617}
-  m_RootOrder: 1
-  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.49999237}
-  m_SizeDelta: {x: -20, y: -13}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &358013545
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 358013543}
-  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: 0
-    m_BestFit: 0
-    m_MinSize: 6
-    m_MaxSize: 60
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 0
-    m_HorizontalOverflow: 1
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
---- !u!222 &358013546
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 358013543}
-  m_CullTransparentMesh: 0
 --- !u!1 &424707067
 GameObject:
   m_ObjectHideFlags: 0
@@ -833,7 +756,6 @@ RectTransform:
   - {fileID: 1403050478}
   - {fileID: 906537738}
   - {fileID: 673572617}
-  - {fileID: 1159698617}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -996,145 +918,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1105275461}
   m_CullTransparentMesh: 0
---- !u!1 &1159698616
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1159698617}
-  - component: {fileID: 1159698619}
-  - component: {fileID: 1159698618}
-  - component: {fileID: 1159698620}
-  m_Layer: 5
-  m_Name: Myname
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1159698617
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1159698616}
-  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: 1233229796}
-  - {fileID: 358013544}
-  m_Father: {fileID: 986449596}
-  m_RootOrder: 8
-  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: -6.525, y: 137.45}
-  m_SizeDelta: {x: 664.55, y: 96.8}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1159698618
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1159698616}
-  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: 10911, 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 &1159698619
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1159698616}
-  m_CullTransparentMesh: 0
---- !u!114 &1159698620
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1159698616}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, 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: 1159698618}
-  m_TextComponent: {fileID: 358013545}
-  m_Placeholder: {fileID: 1233229797}
-  m_ContentType: 0
-  m_InputType: 0
-  m_AsteriskChar: 42
-  m_KeyboardType: 0
-  m_LineType: 0
-  m_HideMobileInput: 0
-  m_CharacterValidation: 0
-  m_CharacterLimit: 0
-  m_OnEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
-  m_OnValueChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_CustomCaretColor: 0
-  m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
-  m_Text: 
-  m_CaretBlinkRate: 0.85
-  m_CaretWidth: 1
-  m_ReadOnly: 0
 --- !u!1 &1173325932
 GameObject:
   m_ObjectHideFlags: 0
@@ -1212,83 +995,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1173325932}
   m_CullTransparentMesh: 0
---- !u!1 &1233229795
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1233229796}
-  - component: {fileID: 1233229798}
-  - component: {fileID: 1233229797}
-  m_Layer: 5
-  m_Name: Placeholder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1233229796
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1233229795}
-  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: 1159698617}
-  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.49999237}
-  m_SizeDelta: {x: -20, y: -13}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1233229797
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1233229795}
-  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: 0.5}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 50
-    m_FontStyle: 2
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 60
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Name
---- !u!222 &1233229798
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1233229795}
-  m_CullTransparentMesh: 0
 --- !u!1 &1403050477
 GameObject:
   m_ObjectHideFlags: 0
@@ -1302,7 +1008,7 @@ GameObject:
   - component: {fileID: 1403050480}
   - component: {fileID: 1403050479}
   m_Layer: 5
-  m_Name: guest buttton
+  m_Name: Login
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1371,8 +1077,8 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 963194229}
-        m_MethodName: ChangeScene
+      - m_Target: {fileID: 1782055470}
+        m_MethodName: login
         m_Mode: 5
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -1881,7 +1587,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   username: {fileID: 1945103066}
   Password: {fileID: 1704541521}
-  Myname: {fileID: 1159698620}
   myUsername: {fileID: 1945103066}
   myPassword: {fileID: 1704541521}
   myCompass: {fileID: 673572616}

diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -20,9 +20,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/building list.unity
     guid: ebd9f974601c7b54b8e2a3a47bc97d48
-  - enabled: 1
-    path: Assets/building info.unity
-    guid: 2d08ff1581f56c54bac0a30c49c9766d
+  - enabled: 0
+    path: 
+    guid: 00000000000000000000000000000000
   - enabled: 1
     path: Assets/building description.unity
     guid: 1c33d87913fd476478d0c698f33d74ec

diff --git a/QCAR/somedata16 b/QCAR/somedata16
@@ -1 +1 @@
-AAABmT0NpKesRpPTdXy9tPiSgKh2TbvNOkddrivk8dHxYquqPxfJz+FR7QIlMEfTkcsjUsSwYHQMBHW8wd9nZ2k41W3zxSsbGb5NuKYj849HDv2ltm3CmvlY68/8l2Yhd+xnKzeZCEr+2ShiTvgnRSThP/6KfwqbuazI+HnAk/OEWzKZwW1aoSsfnJcUDuOHYtqNpRxXJHEE5NhhIC1P4I66btb5w6bVDIj08MQHeZ29eLmTLIdnSw6tieN2N3k+YeQ9gTv+cdRE8s4+mxBto3FeZXGKQkr11MvCyUCt+TzsolwxNVhOEEpvfz+oHAgxxFRA27+13ONl3n4EISu5X9ZGoD8=
+AAABmQ1o0BTodwvBDSSh3Q6YxFSxkjSuca8ENqC/47Jd8iDBFUPWyt2o/ZzVRVgbYIOjCPWtBDKFe7XDyePkEcPHr+Lw5lPoIlILKOfTamT/4IggddPQR6GS2aEO5reP3zW+10DSpw+bQiVvBAk+Hm9/QwSsx8EfYuL3noKZBn4R8liYX8aE9T5Xg0BdWwLh1hqlqfClWlAoyVvEUIQ2eYQYnQrENRhlLx4jPDulrAUwzIrSp5mJpYeP+X2aXH+W8nQlukRnuN6sEdOeW88OzYjYLVizCUwXqMJwIkUI7Jvf6tkTLytABM9+CsgDKy3uok9qxZWiCeK+LfIjxqFr25u7WXE=
diff --git a/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor-firstpass.csprojAssemblyReference.cache
diff --git a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache