diff --git a/AndroidData/oneshotonekill.keystore b/AndroidData/oneshotonekill.keystore new file mode 100644 index 0000000..59f2d8d Binary files /dev/null and b/AndroidData/oneshotonekill.keystore differ diff --git a/Assets/Editor/AutoBuild.cs b/Assets/Editor/AutoBuild.cs index e0343ad..019b217 100644 --- a/Assets/Editor/AutoBuild.cs +++ b/Assets/Editor/AutoBuild.cs @@ -13,10 +13,10 @@ using UnityEngine; public static class AutoBuild { - static string path_dev = "AndroidData/mysticatshop_Test_"; - static string path_dev_onestore = "AndroidData/mysticatshop_Test_OneStore_"; - static string path_live = "AndroidData/mysticatshop_Live_"; - static string path_live_onestore = "AndroidData/mysticatshop_Live_OneStore"; + static string path_dev = "AndroidData/oneshotonekill_Test_"; + static string path_dev_onestore = "AndroidData/oneshotonekill_Test_OneStore_"; + static string path_live = "AndroidData/oneshotonekill_Live_"; + static string path_live_onestore = "AndroidData/oneshotonekill_Live_OneStore"; // 툴씬 이름 목록 private static readonly string[] toolScenes = @@ -37,7 +37,7 @@ public static class AutoBuild .ToList(); EditorBuildSettings.scenes = filtered.ToArray(); - PlayerSettings.applicationIdentifier = "com.nerdnavis.mysticatshop"; + PlayerSettings.applicationIdentifier = "com.toneworker.oneshotonekill"; EditorUserBuildSettings.SwitchActiveBuildTarget(_btg, _bt); if (_bt == BuildTarget.Android) @@ -85,7 +85,7 @@ public static class AutoBuild static void Set_AndroidKeyStore() { PlayerSettings.Android.useCustomKeystore = true; - PlayerSettings.Android.keystoreName = "AndroidData/mysticatshop.keystore"; + PlayerSettings.Android.keystoreName = "AndroidData/oneshotonekill.keystore"; PlayerSettings.Android.keyaliasName = "nerdnavis"; PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "nerdnavis!!098"; } @@ -93,7 +93,7 @@ public static class AutoBuild static void Set_OneStoreKeyStore() { PlayerSettings.Android.useCustomKeystore = true; - PlayerSettings.Android.keystoreName = "AndroidData/mysticatshop_One.keystore"; + PlayerSettings.Android.keystoreName = "AndroidData/oneshotonekill_One.keystore"; PlayerSettings.Android.keyaliasName = "nerdnavis"; PlayerSettings.Android.keystorePass = PlayerSettings.Android.keyaliasPass = "nerdnavis!!098"; } diff --git a/Assets/Resources/VersionCode.txt b/Assets/Resources/VersionCode.txt index bf0d87a..56a6051 100644 --- a/Assets/Resources/VersionCode.txt +++ b/Assets/Resources/VersionCode.txt @@ -1 +1 @@ -4 \ No newline at end of file +1 \ No newline at end of file diff --git a/Assets/Script/Server/ServerClass.cs b/Assets/Script/Server/ServerClass.cs index 648b0f2..8e810c7 100644 --- a/Assets/Script/Server/ServerClass.cs +++ b/Assets/Script/Server/ServerClass.cs @@ -1,8 +1,6 @@ using CodeStage.AntiCheat.ObscuredTypes; using System; using System.Collections.Generic; -using System.Linq; -using static UnityEditor.Progress; #region 게임 최초 실행 시 서버 정보 [Serializable] diff --git a/Assets/Settings/UniversalRP.asset b/Assets/Settings/UniversalRP.asset index fccfdda..e580da1 100644 --- a/Assets/Settings/UniversalRP.asset +++ b/Assets/Settings/UniversalRP.asset @@ -78,6 +78,7 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 @@ -98,35 +99,38 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeMainLightShadows: 4 m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterReflectionProbeBlending: 1 + m_PrefilterReflectionProbeBoxProjection: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index 877b3b5..e32cd67 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -60,7 +60,17 @@ MonoBehaviour: - rid: 7163972629584150530 - rid: 7163972629584150531 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 7752762179098771456 + - rid: 7752762179098771457 + - rid: 7752762179098771459 + - rid: 7752762179098771461 + - rid: 7752762179098771462 + - rid: 7752762179098771464 + - rid: 7752762179098771466 + - rid: 7752762179098771468 + - rid: 7752762179098771472 + - rid: 7752762179098771476 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/Packages/manifest.json b/Packages/manifest.json index b7c0022..ca35895 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,8 +1,6 @@ { "dependencies": { - "net.gree.unity-webview": "https://github.com/gree/unity-webview.git?path=/dist/package", "com.lupidan.apple-signin-unity": "https://github.com/lupidan/apple-signin-unity.git?path=Source#1.5.0", - "com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.addressables": "2.7.6", "com.unity.collab-proxy": "2.11.2", "com.unity.feature.2d": "2.0.1", @@ -10,11 +8,14 @@ "com.unity.ide.visualstudio": "2.0.23", "com.unity.inputsystem": "1.14.2", "com.unity.multiplayer.center": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.recorder": "5.1.4", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.test-framework": "1.6.0", "com.unity.timeline": "1.8.9", "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.7", + "net.gree.unity-webview": "https://github.com/gree/unity-webview.git?path=/dist/package", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3780870..97eaabf 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -115,6 +115,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.bindings.openimageio": { + "version": "1.0.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "1.2.4" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.25", "depth": 2, @@ -134,7 +143,7 @@ }, "com.unity.collections": { "version": "2.5.1", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.8.17", @@ -209,7 +218,7 @@ }, "com.unity.nuget.mono-cecil": { "version": "1.11.4", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" @@ -228,6 +237,17 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.recorder": { + "version": "5.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.8.7", + "com.unity.collections": "1.2.4", + "com.unity.bindings.openimageio": "1.0.2" + }, + "url": "https://packages.unity.com" + }, "com.unity.render-pipelines.core": { "version": "17.0.4", "depth": 1, @@ -309,7 +329,7 @@ }, "com.unity.test-framework.performance": { "version": "3.2.0", - "depth": 3, + "depth": 2, "source": "registry", "dependencies": { "com.unity.test-framework": "1.1.33", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8f6a716..7b35c26 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -82,7 +82,7 @@ PlayerSettings: androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 + runInBackground: 1 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 @@ -141,8 +141,9 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.0.1 - preloadedAssets: [] + bundleVersion: 9.9.9 + preloadedAssets: + - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -266,8 +267,8 @@ PlayerSettings: AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: '{inproject}: AndroidData/oneshotonekill.keystore' + AndroidKeyaliasName: nerdnavis AndroidEnableArmv9SecurityFeatures: 0 AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 @@ -279,7 +280,7 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 + androidUseCustomKeystore: 1 m_AndroidBanners: - width: 320 height: 180 @@ -775,7 +776,8 @@ PlayerSettings: webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Android: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index bb2d97c..add5e60 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,8 @@ TagManager: tags: - Wall - Wall_HP + - Mob + - MobShield layers: - Default - TransparentFX