Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021

Assets/Models/Pickup.fbx.meta

@@ -0,0 +1,97 @@
+fileFormatVersion: 2
+guid: 27f9a7a634f0ed14f89cde65cc3a7050
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Levels.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 58fc0ebddc4ce9f4e834f91dddb1132b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Menu.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 493879cb3996a3544afb0caa076a9532
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Menu/FinalMenu.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8650591ee4e3c1b41b0eb5a15430ded2
+guid: e728960f94bcba84089c530dec85aa8d
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/Menu/MainMenu.unity

@@ -1224,7 +1224,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -63.5, y: 33.1}
+  m_AnchoredPosition: {x: -63.5, y: -123}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &748254063
@@ -1837,7 +1837,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Quit
+  m_text: Back
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -2062,6 +2062,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ScoreText: {fileID: 748254063}
+  name: {fileID: 0}
 --- !u!114 &989324638
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/Testing.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5831bf2a62222643a5755cbc5d8bacd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/MainMenu.cs

@@ -3,12 +3,14 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.Networking;
+using UnityEngine.UI ;
 using System.Collections;
 using TMPro;
 
 public class MainMenu : MonoBehaviour
 {
     public TMPro.TextMeshProUGUI ScoreText;
+    public InputField name;
     // Start is called before the first frame update
     void Start()
     {
@@ -37,6 +39,16 @@ public class MainMenu : MonoBehaviour
         Application.Quit();
     }
 
+    public void ScoreSubmit()
+    {
+        WWWForm form = new WWWForm();
+        form.AddField("name", name.text);
+        form.AddField("score", 20);
+
+        StartCoroutine(PostText("dev.steelants.cz/vasek/GGJ2021/GeorgeJones/Server/api.php", form));
+        SceneManager.LoadScene(0);
+    }
+
     IEnumerator GetText(string uri) {
         UnityWebRequest www = UnityWebRequest.Get(uri);
         yield return www.SendWebRequest();
@@ -50,4 +62,13 @@ public class MainMenu : MonoBehaviour
             ScoreText.text = www.downloadHandler.text;
         }
     }
+
+    IEnumerator PostText(string uri, WWWForm data) {
+        UnityWebRequest www = UnityWebRequest.Post(uri, data);
+        yield return www.SendWebRequest();
+ 
+        if(www.isNetworkError || www.isHttpError) {
+            Debug.Log(www.error);
+        }
+    }
 }

ProjectSettings/EditorBuildSettings.asset

@@ -6,18 +6,21 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/MainMenu.unity
+    path: Assets/Scenes/Menu/MainMenu.unity
     guid: 33d54f39f74b30b4dbb8d638a1d5c9b4
   - enabled: 1
-    path: Assets/Scenes/Vasek.unity
+    path: Assets/Scenes/Testing/Filip.unity
+    guid: 326dea585e0ea574389529eaae8a0ab4
+  - enabled: 1
+    path: Assets/Scenes/Testing/Vasek.unity
     guid: 127deaeaf7712824f83ee4cba639e023
   - enabled: 1
-    path: Assets/Scenes/Level 2.unity
+    path: Assets/Scenes/Levels/Level 2.unity
     guid: 3ff2402a6d1a5b1459781b37d0f8e1c7
   - enabled: 1
-    path: Assets/Scenes/Level 3.unity
+    path: Assets/Scenes/Levels/Level 3.unity
     guid: 7d7146aedfcd48445bb0d44a485249b2
   - enabled: 1
-    path: Assets/Scenes/Filip.unity
+    path: Assets/Scenes/Menu/FinalMenu.unity
-    guid: 326dea585e0ea574389529eaae8a0ab4
+    guid: e728960f94bcba84089c530dec85aa8d
   m_configObjects: {}