Merge branch 'main' of http://59.19.179.48:3300/playm/Projext

Assets/0.SCENE/MainMenuScene.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e61636bffa8fc4947981a4a6aeeee7aa
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/7.Other Code/Card_Scripts.meta

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

Assets/7.Other Code/Level_Scripts.meta

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

Assets/7.Other Code/Monster_Scripts.meta

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

Assets/7.Other Code/Scene_Scripts.meta

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

Assets/7.Other Code/Scene_Scripts/LoadScene.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class LoadScene : MonoBehaviour
+{
+    [SerializeField] private string sceneName;
+    
+    public void LoadOtherScene()
+    {
+        SceneManager.LoadScene(sceneName);
+    }
+}

Assets/7.Other Code/Scene_Scripts/LoadScene.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 328acfe5c5b2dd14489e9fe1c1be1868
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/7.Other Code/State_Scripts.meta

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

Assets/7.Other Code/System_Scripts.meta

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

Assets/7.Other Code/System_Scripts/SettingPanelController.cs

@@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SettingPanelController : MonoBehaviour
+{
+    [SerializeField] private GameObject settingPanel;
+    [SerializeField] private AudioSource audioSource;
+    [SerializeField] private AudioClip openSound;
+    [SerializeField] private AudioClip closeSound;
+
+    public void OpenSetting()
+    {
+        if (audioSource != null && openSound != null)
+        {
+            audioSource.PlayOneShot(openSound);
+        }
+        settingPanel.SetActive(true);
+    }
+
+    public void CloseSetting()
+    {
+        if (audioSource != null && closeSound != null)
+        {
+            audioSource.PlayOneShot(closeSound);
+        }
+        settingPanel.SetActive(false);
+    }
+}

Assets/7.Other Code/System_Scripts/SettingPanelController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7547954caa069744694ee91eb3bd01ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/7.Other Code/System_Scripts/SettingResolution.cs

@@ -0,0 +1,58 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class SettingResolution : MonoBehaviour
+{
+    [SerializeField] private TMP_Dropdown resDropDown;
+
+    private bool isFullScreen = true;
+    private List<Resolution> filteredResolutions = new List<Resolution>();
+
+    // 자주 쓰는 해상도 목록
+    private readonly Vector2Int[] commonResolutions =
+    {
+        new Vector2Int(1280, 720),
+        new Vector2Int(1280, 768),
+        new Vector2Int(1280, 800),
+        new Vector2Int(1360, 768),
+        new Vector2Int(1366, 768),
+        new Vector2Int(1680, 1050),
+        new Vector2Int(1920, 1080)
+    };
+
+    private void Start()
+    {
+        Resolution[] allResolutions = Screen.resolutions;
+        resDropDown.ClearOptions();
+
+        List<string> options = new List<string>();
+
+        foreach (var res in allResolutions)
+        {
+            foreach (var common in commonResolutions)
+            {
+                if (res.width == common.x && res.height == common.y)
+                {
+                    // 중복 방지
+                    if (!filteredResolutions.Exists(r => r.width == res.width && r.height == res.height))
+                    {
+                        filteredResolutions.Add(res);
+                        options.Add($"{res.width} x {res.height}");
+                    }
+                }
+            }
+        }
+
+        resDropDown.AddOptions(options);
+    }
+
+    public void ChangeResolution()
+    {
+        int index = resDropDown.value;
+        Resolution res = filteredResolutions[index];
+        Screen.SetResolution(res.width, res.height, isFullScreen);
+    }
+}

Assets/7.Other Code/System_Scripts/SettingResolution.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e61b80e2cb75b643beafecbb1d4df1c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/8.Image/Ability BGx.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -93,13 +93,26 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 

Assets/8.Image/Table1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -37,13 +37,13 @@ TextureImporter:
     filterMode: 1
     aniso: 1
     mipBias: 0
-    wrapU: 0
-    wrapV: 0
+    wrapU: 1
+    wrapV: 1
     wrapW: 0
-  nPOTScale: 1
+  nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 0
+  spriteMode: 2
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -52,9 +52,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1
@@ -93,20 +93,55 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: Table1_0
+      rect:
+        serializedVersion: 2
+        x: 73
+        y: 87
+        width: 1390
+        height: 871
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8c144cead23d2724ba5622c8931a2027
+      internalID: 666718043
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 
+    spriteID: 5e97eb03825dee720800000000000000
     internalID: 0
     vertices: []
     indices: 
     edges: []
     weights: []
     secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      Table1_0: 666718043
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 

ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,11 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/0.SCENE/MainMenuScene.unity
+    guid: e61636bffa8fc4947981a4a6aeeee7aa
+  - enabled: 1
+    path: Assets/0.SCENE/MainGame.unity
+    guid: 066fd47791fb1154481d55b1d20f1214
   m_configObjects: {}