diff --git a/.DS_Store b/.DS_Store index b0a72852..82b80c10 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.vscode/settings.json b/.vscode/settings.json index 5ae2a558..ee4a2501 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,5 +56,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "Archive.sln" + "dotnet.defaultSolution": "2DMMOMirror.sln" } \ No newline at end of file diff --git a/Archive.zip b/Archive.zip new file mode 100644 index 00000000..cda4e1bd Binary files /dev/null and b/Archive.zip differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store index 911ba338..427d3adf 100644 Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/.DS_Store b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/.DS_Store index 558866f5..93339bd7 100644 Binary files a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/.DS_Store and b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/.DS_Store differ diff --git a/Assets/MultiplayerPrefab/.DS_Store b/Assets/MultiplayerPrefab/.DS_Store index 3392d469..e03a552a 100644 Binary files a/Assets/MultiplayerPrefab/.DS_Store and b/Assets/MultiplayerPrefab/.DS_Store differ diff --git a/Assets/Plugins/.DS_Store b/Assets/Plugins/.DS_Store index 163050d2..fa2e9990 100644 Binary files a/Assets/Plugins/.DS_Store and b/Assets/Plugins/.DS_Store differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar index fe7e8f0d..c48cfb34 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-app-unity-11.6.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar index 71294f11..126e12cd 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-auth-unity-11.6.0.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar b/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar index c105576c..a38e7498 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-common-20.3.3.aar differ diff --git a/Assets/Plugins/Android/com.google.firebase.firebase-firestore-unity-11.6.0.aar b/Assets/Plugins/Android/com.google.firebase.firebase-firestore-unity-11.6.0.aar index d1bb6722..56e0acd8 100644 Binary files a/Assets/Plugins/Android/com.google.firebase.firebase-firestore-unity-11.6.0.aar and b/Assets/Plugins/Android/com.google.firebase.firebase-firestore-unity-11.6.0.aar differ diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8d572af0..94be1f05 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -8,11 +8,11 @@ "hash": "f8c8347af3a144069dffd6120f1c4142f8120891" }, "com.unity.2d.animation": { - "version": "9.0.3", + "version": "9.1.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.2", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", @@ -21,7 +21,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.0.0", + "version": "1.1.4", "depth": 1, "source": "registry", "dependencies": { @@ -33,7 +33,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.1", + "version": "8.0.2", "depth": 2, "source": "registry", "dependencies": { @@ -53,13 +53,13 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.2", + "version": "8.0.5", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.animation": "9.0.1" + "com.unity.2d.animation": "9.1.1" }, "url": "https://packages.unity.com" }, @@ -70,11 +70,11 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.2", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "8.0.2", "com.unity.mathematics": "1.1.0", "com.unity.modules.physics2d": "1.0.0" }, @@ -90,7 +90,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.1", + "version": "3.1.2", "depth": 1, "source": "registry", "dependencies": { @@ -102,11 +102,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.7", + "version": "1.8.15", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -139,14 +140,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.0.3", + "com.unity.2d.animation": "9.1.1", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.2", + "com.unity.2d.psdimporter": "8.0.5", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.2", + "com.unity.2d.spriteshape": "9.0.3", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.1", - "com.unity.2d.aseprite": "1.0.0" + "com.unity.2d.tilemap.extras": "3.1.2", + "com.unity.2d.aseprite": "1.1.4" } }, "com.unity.ide.rider": { diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml index 75c1c17e..a2358112 100644 --- a/ProjectSettings/GvhProjectSettings.xml +++ b/ProjectSettings/GvhProjectSettings.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1e2ac6ca..494b66c3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,7 +139,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 4.1 + bundleVersion: 4.15 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -169,9 +169,9 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 16 + AndroidBundleVersionCode: 17 AndroidMinSdkVersion: 22 - AndroidTargetSdkVersion: 33 + AndroidTargetSdkVersion: 34 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78a77889..31459c03 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.7f1 -m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0) +m_EditorVersion: 2022.3.33f1 +m_EditorVersionWithRevision: 2022.3.33f1 (b2c853adf198)