glogin fixd

2023-08-21 08:23:32 +05:30 · 2023-08-21 08:23:32 +05:30 · 3f90e12cfe
commit 3f90e12cfe
parent 431f8bee75
8 changed files with 115 additions and 73 deletions
--- a/Assets/Scripts/CheckUpdates.cs
+++ b/Assets/Scripts/CheckUpdates.cs
@ -4,7 +4,7 @@ using UnityEngine;

 public class CheckUpdates : MonoBehaviour
 {
-    public static int ClientVersion = 1;
+    public static int ClientVersion = 2;
    public static int ServerVersion;

    public float interval = 30;
@ -37,7 +37,7 @@ public class CheckUpdates : MonoBehaviour
        ServerVersion = int.Parse(req.text);
        if(ServerVersion <= 0){
            LoadingScreen.LoadLevel("maintaince");
-        }else if(ServerVersion != ClientVersion){
+        }else if(ServerVersion > ClientVersion){
            LoadingScreen.LoadLevel("update");
        }
    }
--- a/Assets/Scripts/DataManager.cs
+++ b/Assets/Scripts/DataManager.cs
@ -124,15 +124,15 @@ public static class DataManager{
                    }
                    Debug.Log("Success parsing userdata");
                    
-                    PlayerPrefs.SetString("username", username);
-                    PlayerPrefs.SetString("password", username);
+                    PlayerPrefs.SetString("username", username + "#0");
+                    PlayerPrefs.SetString("password", username+ "#0");
                    PlayerPrefs.Save();
                }catch(Exception e){
                    Debug.Log("Error parsing userdata");
                }
            }else{
                if(request.downloadHandler.text == "0"){
-                    userData = new UserData(){username = username};
+                    userData = new UserData(){username = username + "#0"};
                }else{
                    MessageBox.ShowMessage("Error logging in, Server said\n" +request.downloadHandler.text);
                    return;
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@ -139,7 +139,7 @@ public class GameManager : MonoBehaviour
        GameOverUI.SetActive(true);
        adCounter++;

-        if(adCounter > 1){
+        if(adCounter > 1 || DataManager.userData.faucetId > 0){
            adCounter=0;
            AdsManager.instance.ShowIntAd();
        }
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -1,18 +1,19 @@
 {
  "dependencies": {
-    "com.unity.2d.animation": "7.0.9",
+    "com.unity.2d.animation": "9.0.3",
    "com.unity.2d.pixel-perfect": "5.0.3",
-    "com.unity.2d.psdimporter": "6.0.7",
+    "com.unity.2d.psdimporter": "8.0.2",
    "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "7.0.6",
+    "com.unity.2d.spriteshape": "9.0.2",
    "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.collab-proxy": "2.0.0",
-    "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.18",
    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.31",
+    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.7.5",
    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4",
    "com.unity.ugui": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@ -1,36 +1,31 @@
 {
  "dependencies": {
    "com.unity.2d.animation": {
-      "version": "7.0.9",
+      "version": "9.0.3",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.common": "6.0.6",
+        "com.unity.2d.common": "8.0.1",
        "com.unity.2d.sprite": "1.0.0",
+        "com.unity.collections": "1.1.0",
        "com.unity.modules.animation": "1.0.0",
        "com.unity.modules.uielements": "1.0.0"
      },
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.common": {
-      "version": "6.0.6",
+      "version": "8.0.1",
      "depth": 1,
      "source": "registry",
      "dependencies": {
        "com.unity.2d.sprite": "1.0.0",
        "com.unity.mathematics": "1.1.0",
        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.burst": "1.5.1"
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.burst": "1.7.3"
      },
      "url": "https://packages.unity.com"
    },
-    "com.unity.2d.path": {
-      "version": "5.0.2",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
    "com.unity.2d.pixel-perfect": {
      "version": "5.0.3",
      "depth": 0,
@ -39,12 +34,12 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.2d.psdimporter": {
-      "version": "6.0.7",
+      "version": "8.0.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {
-        "com.unity.2d.animation": "7.0.9",
-        "com.unity.2d.common": "6.0.6",
+        "com.unity.2d.animation": "9.0.1",
+        "com.unity.2d.common": "8.0.1",
        "com.unity.2d.sprite": "1.0.0"
      },
      "url": "https://packages.unity.com"
@ -56,13 +51,12 @@
      "dependencies": {}
    },
    "com.unity.2d.spriteshape": {
-      "version": "7.0.6",
+      "version": "9.0.2",
      "depth": 0,
      "source": "registry",
      "dependencies": {
        "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "6.0.4",
-        "com.unity.2d.path": "5.0.2",
+        "com.unity.2d.common": "8.0.1",
        "com.unity.modules.physics2d": "1.0.0"
      },
      "url": "https://packages.unity.com"
@ -71,10 +65,22 @@
      "version": "1.0.0",
      "depth": 0,
      "source": "builtin",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.uielements": "1.0.0"
+      }
+    },
+    "com.unity.ai.navigation": {
+      "version": "1.1.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.ai": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
    },
    "com.unity.burst": {
-      "version": "1.6.6",
+      "version": "1.8.7",
      "depth": 2,
      "source": "registry",
      "dependencies": {
@ -83,12 +89,22 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "2.0.0",
+      "version": "2.0.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {},
      "url": "https://packages.unity.com"
    },
+    "com.unity.collections": {
+      "version": "1.2.4",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.burst": "1.6.6",
+        "com.unity.test-framework": "1.1.31"
+      },
+      "url": "https://packages.unity.com"
+    },
    "com.unity.ext.nunit": {
      "version": "1.0.6",
      "depth": 1,
@ -97,7 +113,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.rider": {
-      "version": "3.0.18",
+      "version": "3.0.24",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -106,7 +122,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.18",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -145,7 +161,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -165,7 +181,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.7.5",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -327,17 +343,6 @@
      "version": "1.0.0",
      "depth": 0,
      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.uielementsnative": "1.0.0"
-      }
-    },
-    "com.unity.modules.uielementsnative": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
      "dependencies": {
        "com.unity.modules.ui": "1.0.0",
        "com.unity.modules.imgui": "1.0.0",
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 23
+  serializedVersion: 26
  productGUID: 1eae434d7cd9af349812cf7f9bd1fb1b
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
@ -48,14 +48,15 @@ PlayerSettings:
  defaultScreenHeightWeb: 600
  m_StereoRenderingPath: 0
  m_ActiveColorSpace: 0
+  m_SpriteBatchVertexThreshold: 300
  m_MTRendering: 1
  mipStripping: 0
  numberOfMipsStripped: 0
+  numberOfMipsStrippedPerMipmapLimitGroup: {}
  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
  iosUseCustomAppBackgroundBehavior: 0
-  iosAllowHTTPDownload: 1
  allowedAutorotateToPortrait: 0
  allowedAutorotateToPortraitUpsideDown: 0
  allowedAutorotateToLandscapeRight: 1
@ -119,8 +120,11 @@ PlayerSettings:
  switchNVNShaderPoolsGranularity: 33554432
  switchNVNDefaultPoolsGranularity: 16777216
  switchNVNOtherPoolsGranularity: 16777216
+  switchGpuScratchPoolGranularity: 2097152
+  switchAllowGpuScratchShrinking: 0
  switchNVNMaxPublicTextureIDCount: 0
  switchNVNMaxPublicSamplerIDCount: 0
+  switchNVNGraphicsFirmwareMemory: 32
  stadiaPresentMode: 0
  stadiaTargetFramerate: 0
  vulkanNumSwapchainBuffers: 3
@ -128,13 +132,8 @@ PlayerSettings:
  vulkanEnablePreTransform: 0
  vulkanEnableLateAcquireNextImage: 0
  vulkanEnableCommandBufferRecycling: 1
-  m_SupportedAspectRatios:
-    4:3: 1
-    5:4: 1
-    16:10: 1
-    16:9: 1
-    Others: 1
-  bundleVersion: 1.5
+  loadStoreDebugModeEnabled: 0
+  bundleVersion: 1.6
  preloadedAssets: []
  metroInputSource: 0
  wsaTransparentSwapchain: 0
@ -147,7 +146,7 @@ PlayerSettings:
  enableFrameTimingStats: 0
  enableOpenGLProfilerGPURecorders: 1
  useHDRDisplay: 0
-  D3DHDRBitDepth: 0
+  hdrBitDepth: 0
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  resolutionScalingMode: 0
@ -159,10 +158,11 @@ PlayerSettings:
    Standalone: com.DefaultCompany.2DProject
  buildNumber:
    Standalone: 0
+    VisionOS: 0
    iPhone: 0
    tvOS: 0
  overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 5
+  AndroidBundleVersionCode: 6
  AndroidMinSdkVersion: 22
  AndroidTargetSdkVersion: 33
  AndroidPreferredInstallLocation: 1
@ -176,12 +176,15 @@ PlayerSettings:
  APKExpansionFiles: 0
  keepLoadedShadersAlive: 0
  StripUnusedMeshComponents: 0
+  strictShaderVariantMatching: 0
  VertexChannelCompressionMask: 4054
  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 11.0
+  iOSTargetOSVersionString: 12.0
  tvOSSdkVersion: 0
  tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 11.0
+  tvOSTargetOSVersionString: 12.0
+  VisionOSSdkVersion: 0
+  VisionOSTargetOSVersionString: 1.0
  uIPrerenderedIcon: 0
  uIRequiresPersistentWiFi: 0
  uIRequiresFullScreen: 1
@ -229,8 +232,10 @@ PlayerSettings:
  appleDeveloperTeamID: 
  iOSManualSigningProvisioningProfileID: 
  tvOSManualSigningProvisioningProfileID: 
+  VisionOSManualSigningProvisioningProfileID: 
  iOSManualSigningProvisioningProfileType: 0
  tvOSManualSigningProvisioningProfileType: 0
+  VisionOSManualSigningProvisioningProfileType: 0
  appleEnableAutomaticSigning: 0
  iOSRequireARKit: 0
  iOSAutomaticallyDetectAndAddCapabilities: 1
@ -245,13 +250,15 @@ PlayerSettings:
  useCustomLauncherGradleManifest: 0
  useCustomBaseGradleTemplate: 0
  useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
  useCustomProguardFile: 0
  AndroidTargetArchitectures: 3
  AndroidTargetDevices: 0
  AndroidSplashScreenScale: 0
  androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: H:/keys/xperience.keystore
+  AndroidKeystoreName: I:/keys/xperience.keystore
  AndroidKeyaliasName: xperience
+  AndroidEnableArmv9SecurityFeatures: 0
  AndroidBuildApkPerCpuArchitecture: 0
  AndroidTVCompatibility: 0
  AndroidIsGame: 1
@ -265,7 +272,6 @@ PlayerSettings:
    banner: {fileID: 0}
  androidGamepadSupportLevel: 0
  chromeosInputEmulation: 1
-  AndroidMinifyWithR8: 0
  AndroidMinifyRelease: 0
  AndroidMinifyDebug: 0
  AndroidValidateAppBundleSize: 1
@ -420,7 +426,9 @@ PlayerSettings:
    iPhone: 1
    tvOS: 1
  m_BuildTargetGroupLightmapEncodingQuality: []
+  m_BuildTargetGroupHDRCubemapEncodingQuality: []
  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLoadStoreDebugModeSettings: []
  m_BuildTargetNormalMapEncoding: []
  m_BuildTargetDefaultTextureCompressionFormat: []
  playModeTestRunnerEnabled: 0
@ -433,6 +441,7 @@ PlayerSettings:
  locationUsageDescription: 
  microphoneUsageDescription: 
  bluetoothUsageDescription: 
+  macOSTargetOSVersion: 10.13.0
  switchNMETAOverride: 
  switchNetLibKey: 
  switchSocketMemoryPoolSize: 6144
@ -444,6 +453,7 @@ PlayerSettings:
  switchLTOSetting: 0
  switchApplicationID: 0x01004b9000490000
  switchNSODependencies: 
+  switchCompilerFlags: 
  switchTitleNames_0: 
  switchTitleNames_1: 
  switchTitleNames_2: 
@ -517,7 +527,6 @@ PlayerSettings:
  switchReleaseVersion: 0
  switchDisplayVersion: 1.0.0
  switchStartupUserAccount: 0
-  switchTouchScreenUsage: 0
  switchSupportedLanguagesMask: 0
  switchLogoType: 0
  switchApplicationErrorCodeCategory: 
@ -559,6 +568,7 @@ PlayerSettings:
  switchNativeFsCacheSize: 32
  switchIsHoldTypeHorizontal: 0
  switchSupportedNpadCount: 8
+  switchEnableTouchScreen: 1
  switchSocketConfigEnabled: 0
  switchTcpInitialSendBufferSize: 32
  switchTcpInitialReceiveBufferSize: 64
@ -659,6 +669,7 @@ PlayerSettings:
  webGLMemorySize: 32
  webGLExceptionSupport: 1
  webGLNameFilesAsHashes: 0
+  webGLShowDiagnostics: 0
  webGLDataCaching: 1
  webGLDebugSymbols: 0
  webGLEmscriptenArgs: 
@ -671,6 +682,12 @@ PlayerSettings:
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
  webGLDecompressionFallback: 0
+  webGLInitialMemorySize: 32
+  webGLMaximumMemorySize: 2048
+  webGLMemoryGrowthMode: 2
+  webGLMemoryLinearGrowthStep: 16
+  webGLMemoryGeometricGrowthStep: 0.2
+  webGLMemoryGeometricGrowthCap: 96
  webGLPowerPreference: 2
  scriptingDefineSymbols: {}
  additionalCompilerArguments: {}
@ -678,17 +695,30 @@ PlayerSettings:
  scriptingBackend:
    Android: 1
  il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
+  il2cppCodeGeneration: {}
+  managedStrippingLevel:
+    Android: 1
+    EmbeddedLinux: 1
+    GameCoreScarlett: 1
+    GameCoreXboxOne: 1
+    Nintendo Switch: 1
+    PS4: 1
+    PS5: 1
+    QNX: 1
+    Stadia: 1
+    VisionOS: 1
+    WebGL: 1
+    Windows Store Apps: 1
+    XboxOne: 1
+    iPhone: 1
+    tvOS: 1
  incrementalIl2cppBuild: {}
  suppressCommonWarnings: 1
  allowUnsafeCode: 0
  useDeterministicCompilation: 1
-  enableRoslynAnalyzers: 1
-  selectedPlatform: 2
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
  gcIncremental: 1
-  assemblyVersionValidation: 1
  gcWBarrierValidation: 0
  apiCompatibilityLevelPerPlatform: {}
  m_RenderingPath: 1
@ -760,6 +790,11 @@ PlayerSettings:
  luminVersion:
    m_VersionCode: 1
    m_VersionName: 
+  hmiPlayerDataPath: 
+  hmiForceSRGBBlit: 1
+  embeddedLinuxEnableGamepadInput: 1
+  hmiLogStartupTiming: 0
+  hmiCpuConfiguration: 
  apiCompatibilityLevel: 6
  activeInputHandler: 0
  windowsGamepadBackendHint: 0
@ -770,6 +805,7 @@ PlayerSettings:
  organizationId: 
  cloudEnabled: 0
  legacyClampBlendShapeWeights: 0
-  playerDataPath: 
-  forceSRGBBlit: 1
+  hmiLoadingImage: {fileID: 0}
+  platformRequiresReadableAssets: 0
  virtualTexturingSupportEnabled: 0
+  insecureHttpOption: 0
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.19f1
-m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6)
+m_EditorVersion: 2022.3.7f1
+m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)
--- a/ProjectSettings/boot.config
+++ b/ProjectSettings/boot.config