Explorar o código

Update project

aleksey %!s(int64=3) %!d(string=hai) anos
pai
achega
2da8bcea02

+ 3 - 3
Unity3/Assets/2021/Scenes/Main.unity

@@ -27706,7 +27706,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &777064953
 RectTransform:
   m_ObjectHideFlags: 0
@@ -40444,7 +40444,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.91}
   m_AnchorMax: {x: 0.052, y: 1}
-  m_AnchoredPosition: {x: 19, y: 45.500015}
+  m_AnchoredPosition: {x: 19, y: 45.5}
   m_SizeDelta: {x: -96.10254, y: 9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1155985925
@@ -52883,7 +52883,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.28, y: 0.637}
   m_AnchorMax: {x: 0.72849417, y: 0.7447211}
-  m_AnchoredPosition: {x: -2.8089924, y: 141.81949}
+  m_AnchoredPosition: {x: -2.8089905, y: 141.81949}
   m_SizeDelta: {x: 11.399994, y: -22.55957}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1426384486

+ 1 - 1
Unity3/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" android:installLocation="preferExternal" android:versionCode="1" android:versionName="1.0">
   <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <application android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="true">
+  <application android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:icon="@drawable/app_icon" android:label="@string/app_name" android:debuggable="false">
     <activity android:name="com.unity3d.player.UnityPlayerActivity" android:label="@string/app_name">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

BIN=BIN
Unity3/Assets/Plugins/Android/com.facebook.android.facebook-common-9.1.1.aar


BIN=BIN
Unity3/Assets/Plugins/Android/com.facebook.android.facebook-core-9.1.1.aar


+ 1 - 1
Unity3/Assets/Unity Technologies/SignInWithApple/Samples/Scripts/SignInWithAppleTest_Callbacks.cs

@@ -36,7 +36,7 @@ public class SignInWithAppleTest_Callbacks : MonoBehaviour
             return;
         }
 
-        UserInfo userInfo = args.userInfo;
+        UnityEngine.SignInWithApple.UserInfo userInfo = args.userInfo;
 
         // Save the userId so we can use it later for other operations.
         userId = userInfo.userId;

+ 1 - 1
Unity3/Assets/Unity Technologies/SignInWithApple/Samples/Scripts/SignInWithAppleTest_EventSystem.cs

@@ -32,7 +32,7 @@ public class SignInWithAppleTest_EventSystem : MonoBehaviour
     {
         Debug.Log("Sign in with Apple login has completed.");
 
-        UserInfo userInfo = args.userInfo;
+        UnityEngine.SignInWithApple.UserInfo userInfo = args.userInfo;
         
         // Save the userId so we can use it later for other operations.
         userId = userInfo.userId;

+ 2 - 2
Unity3/Packages/manifest.json

@@ -6,12 +6,12 @@
     "com.unity.analytics": "3.5.3",
     "com.unity.collab-proxy": "1.3.9",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.2.3",
     "com.unity.purchasing": "2.2.2",
     "com.unity.test-framework": "1.1.22",
     "com.unity.textmeshpro": "3.0.1",
-    "com.unity.timeline": "1.2.6",
+    "com.unity.timeline": "1.4.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.modules.ai": "1.0.0",

+ 2 - 2
Unity3/ProjectSettings/AndroidResolverDependencies.xml

@@ -68,8 +68,8 @@
     <file>Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-jdk7-1.4.10.jar</file>
   </files>
   <settings>
-    <setting name="androidAbis" value="armeabi-v7a" />
-    <setting name="bundleId" value="com.TCTech.DurexSmokkaleikurinn" />
+    <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
+    <setting name="bundleId" value="gamatic.icts" />
     <setting name="explodeAars" value="True" />
     <setting name="gradleBuildEnabled" value="True" />
     <setting name="gradleTemplateEnabled" value="False" />

+ 13 - 12
Unity3/ProjectSettings/ProjectSettings.asset

@@ -17,10 +17,10 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashScreen: 0
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
-  m_SplashScreenAnimation: 1
+  m_SplashScreenAnimation: 0
   m_SplashScreenLogoStyle: 1
   m_SplashScreenDrawMode: 0
   m_SplashScreenBackgroundAnimationZoom: 1
@@ -40,7 +40,8 @@ PlayerSettings:
     width: 1
     height: 1
   m_SplashScreenLogos: []
-  m_VirtualRealitySplashScreen: {fileID: 0}
+  m_VirtualRealitySplashScreen: {fileID: 2800000, guid: a15d6aa770f6d4a6799e5a7365d2ed64,
+    type: 3}
   m_HolographicTrackingLossScreen: {fileID: 0}
   defaultScreenWidth: 1024
   defaultScreenHeight: 768
@@ -127,7 +128,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.5
+  bundleVersion: 2.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -146,19 +147,19 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.TCTech.DurexSmokkaleikurinn
+    Android: gamatic.icts
     Standalone: unity.AV_Technologies.Smokkaleikurinn
     Tizen: gamatic.icts
-    iPhone: com.TCTech.DurexSmokkaleikurinn
+    iPhone: gamatic.icts
     tvOS: gamatic.icts
   buildNumber:
     Standalone: 0
-    iPhone: 1
+    iPhone: 2
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 5
+  AndroidBundleVersionCode: 9
   AndroidMinSdkVersion: 19
-  AndroidTargetSdkVersion: 0
+  AndroidTargetSdkVersion: 29
   AndroidPreferredInstallLocation: 0
   aotOptions: 
   stripEngineCode: 1
@@ -192,7 +193,7 @@ PlayerSettings:
   tvOSTopShelfImageLayers2x: []
   tvOSTopShelfImageWideLayers: []
   tvOSTopShelfImageWideLayers2x: []
-  iOSLaunchScreenType: 3
+  iOSLaunchScreenType: 1
   iOSLaunchScreenPortrait: {fileID: 0}
   iOSLaunchScreenLandscape: {fileID: 0}
   iOSLaunchScreenBackgroundColor:
@@ -239,7 +240,7 @@ PlayerSettings:
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 3
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 2800000, guid: a15d6aa770f6d4a6799e5a7365d2ed64, type: 3}
   AndroidKeystoreName: '{inproject}: iCTSKeystore.keystore'
@@ -784,7 +785,7 @@ PlayerSettings:
   platformArchitecture:
     iPhone: 1
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 0
     WP8: 2
     WebGL: 1

+ 6 - 0
Unity3/UserSettings/EditorUserSettings.asset

@@ -15,6 +15,12 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c72111f19563f22213229
       flags: 0
     RecentlyUsedScenePath-3:
+      value: 224247031146466e0307183b50175a131e191726232f2f353e662e3ae5ee1d36d5ee22e1c62a2f303c4ddc3d092e0d3ae1453a08f3050f185e3df4091fd61e2418d110e40ad81319f42a1dc3dd11d4dcf0c0d1e4ccd8fecbcadaadbce1fee7ecec
+      flags: 0
+    RecentlyUsedScenePath-4:
+      value: 224247031146466e0307183b50175a131e191726232f2f353e662e3ae5ee1d36d5ee22e1c62a2f303c4ddc3d092e0d3ae1453a08f3050f185e3df4091fd61e2418d110e40ad81319f42a1dc3dd11d4dcf6d7d8e6daeae4d3cd91b5fcfde4f7
+      flags: 0
+    RecentlyUsedScenePath-5:
       value: 22424703114646095d5c5d6d23205a1e130457072d21287e38271427fb
       flags: 0
     vcSharedLogLevel: