diff --git a/Assets/Fonts/ChosunGu SDF.asset b/Assets/Fonts/ChosunGu SDF.asset index 8367617..f20edcc 100644 --- a/Assets/Fonts/ChosunGu SDF.asset +++ b/Assets/Fonts/ChosunGu SDF.asset @@ -190,7 +190,52 @@ MonoBehaviour: m_FontFeatureTable: m_MultipleSubstitutionRecords: [] m_LigatureSubstitutionRecords: [] - m_GlyphPairAdjustmentRecords: [] + m_GlyphPairAdjustmentRecords: + - m_FirstAdjustmentRecord: + m_GlyphIndex: 64 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 8.64 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 457 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: -485368096 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 64 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -8.64 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1776 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: -485368096 + - m_FirstAdjustmentRecord: + m_GlyphIndex: 64 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: -8.64 + m_YAdvance: 0 + m_SecondAdjustmentRecord: + m_GlyphIndex: 1780 + m_GlyphValueRecord: + m_XPlacement: 0 + m_YPlacement: 0 + m_XAdvance: 0 + m_YAdvance: 0 + m_FeatureLookupFlags: -485368096 m_MarkToBaseAdjustmentRecords: [] m_MarkToMarkAdjustmentRecords: [] m_ShouldReimportFontFeatures: 0 diff --git a/Assets/Prefabs/Avatar.prefab b/Assets/Prefabs/Avatar.prefab index 65676cb..71fea87 100644 --- a/Assets/Prefabs/Avatar.prefab +++ b/Assets/Prefabs/Avatar.prefab @@ -32,11 +32,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4800397605764784706 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index 0a4b087..0000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"WebGL","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.4.5f1","Branch":"6000.4/staging","Changeset":"cc83ebd631f8","Date":1776765105},"Dependencies":["com.unity.2d.animation@14.0.4","com.unity.2d.aseprite@4.0.2","com.unity.2d.psdimporter@13.0.3","com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@14.0.1","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@7.0.1","com.unity.2d.tooling@2.0.2","com.unity.collab-proxy@2.12.4","com.unity.ide.rider@3.0.40","com.unity.ide.visualstudio@2.0.27","com.unity.inputsystem@1.19.0","com.unity.multiplayer.center@1.0.1","com.unity.render-pipelines.universal@17.4.0","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.12","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.11","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.4.0","com.unity.shadergraph@17.4.0","com.unity.render-pipelines.universal-config@17.4.0","com.unity.2d.common@13.0.2","com.unity.mathematics@1.3.3","com.unity.collections@6.4.0","com.unity.searcher@4.9.4","com.unity.burst@1.8.29","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.4.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunInfo.json.meta b/Assets/Resources/PerformanceTestRunInfo.json.meta deleted file mode 100644 index 71879ab..0000000 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0ef452a8d5162d447b4c81f0fe480dde -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae..0000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta deleted file mode 100644 index 62c7324..0000000 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 99c82e24faf4532478d0f0d71d3610ef -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 7c04258..fc688cb 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -148,6 +148,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1442973720} + - {fileID: 1060251058} - {fileID: 1760917098} m_Father: {fileID: 892761231} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -228,6 +229,7 @@ MonoBehaviour: readyPanel: {fileID: 101687420} restartButton: {fileID: 1441169809} destroyRoomButton: {fileID: 1337255164} + map: {fileID: 1760917097} --- !u!4 &472832762 Transform: m_ObjectHideFlags: 0 @@ -682,6 +684,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 962283396} m_CullTransparentMesh: 1 +--- !u!1 &1060251057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1060251058} + - component: {fileID: 1060251060} + - component: {fileID: 1060251059} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1060251058 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060251057} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 76049605} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1060251059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060251057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1060251060 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060251057} + m_CullTransparentMesh: 1 --- !u!1 &1337255164 GameObject: m_ObjectHideFlags: 0 @@ -1299,8 +1376,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 869674cfb3d61894eb996d32970d370a, type: 2} + m_sharedMaterial: {fileID: -6184892272082730352, guid: 869674cfb3d61894eb996d32970d370a, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1503,11 +1580,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -4364034832326165938, guid: 6c163a07162f2b849b50297822c92b4e, type: 3} + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 + m_FillMethod: 0 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 @@ -1616,8 +1693,8 @@ MonoBehaviour: m_Calls: [] m_text: READY! m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 869674cfb3d61894eb996d32970d370a, type: 2} + m_sharedMaterial: {fileID: -6184892272082730352, guid: 869674cfb3d61894eb996d32970d370a, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index a241a88..63d5d6d 100644 --- a/Assets/Scenes/LobbyScene.unity +++ b/Assets/Scenes/LobbyScene.unity @@ -786,9 +786,7 @@ MonoBehaviour: roomPanel: {fileID: 997293297} currentPlayerText: {fileID: 1004545065} defaultAvatarUrls: - - https://i.imgur.com/example1.png - - https://i.imgur.com/example2.png - - https://i.imgur.com/example3.png + - https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTXtqMBOq3d1ag2z9hazPZBVWAN-WBoVzuDAw&s --- !u!4 &409677160 Transform: m_ObjectHideFlags: 0 @@ -882,7 +880,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Type Room ID + m_text: Type Room ID(0~9999) m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 869674cfb3d61894eb996d32970d370a, type: 2} m_sharedMaterial: {fileID: -6184892272082730352, guid: 869674cfb3d61894eb996d32970d370a, type: 2} @@ -1319,8 +1317,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 1739718400 - m_fontColor: {r: 0, g: 1, b: 0.69457686, a: 0.40392157} + rgba: 3157000447 + m_fontColor: {r: 1, g: 0, b: 0.17251468, a: 0.7372549} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2131,7 +2129,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: New Text + m_text: 'Current Playing: 14159265' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -2197,7 +2195,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -820.7103, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3889,14 +3887,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image m_Material: {fileID: 0} - m_Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1} + m_Color: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 4229238148489223300, guid: ac8cc60a3c962c3409bee3a7377bd0eb, type: 3} + m_Sprite: {fileID: -1227564231286400416, guid: 1b3cc4f2df3d8824a95438766423d76c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4405,7 +4403,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB2F9\uC2E0\uC758 \uD504\uB85C\uD544 \uC0AC\uC9C4 URL" + m_text: "\uB2F9\uC2E0\uC758 \uD504\uB85C\uD544 \uC0AC\uC9C4 URL(\uC120\uD0DD)" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 869674cfb3d61894eb996d32970d370a, type: 2} m_sharedMaterial: {fileID: -6184892272082730352, guid: 869674cfb3d61894eb996d32970d370a, type: 2} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index fecb914..6549a95 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using TMPro; @@ -5,7 +6,9 @@ using UnityEngine; using Photon.Pun; using UnityEngine.Networking; using UnityEngine.SceneManagement; +using UnityEngine.UI; using Hashtable = ExitGames.Client.Photon.Hashtable; +using Random = UnityEngine.Random; public class GameManager : MonoBehaviourPunCallbacks { @@ -13,6 +16,10 @@ public class GameManager : MonoBehaviourPunCallbacks public GameObject readyPanel; public GameObject restartButton; public GameObject destroyRoomButton; + public GameObject map; + + private Image _image; + private float _fillAmount = 1f; public static Dictionary AvatarCache = new Dictionary(); @@ -20,6 +27,7 @@ public class GameManager : MonoBehaviourPunCallbacks { if (restartButton != null) restartButton.SetActive(false); if (destroyRoomButton != null) destroyRoomButton.SetActive(false); // [추가] + _image = map.GetComponent(); // 씬 시작 시, 모두의 아바타를 다운로드하는 코루틴 시작 StartCoroutine(DownloadAllAvatarsAndReady()); } @@ -58,7 +66,7 @@ public class GameManager : MonoBehaviourPunCallbacks if (request.result != UnityWebRequest.Result.Success) { - Debug.LogError($"[다운로드 실패] 유저 번호: {actorNumber}, 에러: {request.error}"); + Debug.LogError($"[다운로드 실패] 유저 번호: {actorNumber}, 에러: {request.error}\nwhile Downloading {url}"); } else { @@ -88,6 +96,13 @@ public class GameManager : MonoBehaviourPunCallbacks } } + private void Update() + { + if (!Gazuaa.isGameActive) return; + _fillAmount -= Time.deltaTime; + _image.fillAmount = _fillAmount / 15f; // 15초 동안 서서히 줄어들도록 설정 + } + private bool CheckAllPlayersLoaded() { // 방에 있는 모든 플레이어의 "IsLoaded"가 true인지 확인 @@ -116,6 +131,7 @@ public class GameManager : MonoBehaviourPunCallbacks private IEnumerator GameSet() { + _fillAmount = 15; // 1. 카운트다운 text.text = "3"; yield return new WaitForSeconds(1f); @@ -129,7 +145,6 @@ public class GameManager : MonoBehaviourPunCallbacks // --- 게임 시작 --- Gazuaa.isGameActive = true; // 스페이스바 입력 활성화! - // 2. 15초 동안 게임 진행 (대기) yield return new WaitForSeconds(15f); diff --git a/Assets/Scripts/Gazuaa.cs b/Assets/Scripts/Gazuaa.cs index f1422fd..89496ae 100644 --- a/Assets/Scripts/Gazuaa.cs +++ b/Assets/Scripts/Gazuaa.cs @@ -165,7 +165,7 @@ public class Gazuaa : MonoBehaviourPunCallbacks yield return new WaitForSeconds(delay); elapsedTime += delay; // 흐른 시간 누적 - + // 시간이 지날수록 속도를 살짝 늦춥니다. if (elapsedTime > spinDuration * 0.5f) delay = 0.08f; // 절반 지났을 때 if (elapsedTime > spinDuration * 0.8f) delay = 0.15f; // 거의 끝날 때쯤 diff --git a/Assets/Scripts/LobbyManager.cs b/Assets/Scripts/LobbyManager.cs index c1c8242..226035a 100644 --- a/Assets/Scripts/LobbyManager.cs +++ b/Assets/Scripts/LobbyManager.cs @@ -25,8 +25,8 @@ public class LobbyManager : MonoBehaviourPunCallbacks public string[] defaultAvatarUrls = new string[] { "https://scontent-icn2-1.cdninstagram.com/v/t51.82787-19/657402696_17932715739227818_1102219035706293785_n.jpg?stp=dst-jpg_s150x150_tt6&efg=eyJ2ZW5jb2RlX3RhZyI6InByb2ZpbGVfcGljLmRqYW5nby4yMDguYzEifQ&_nc_ht=scontent-icn2-1.cdninstagram.com&_nc_cat=110&_nc_oc=Q6cZ2gEiAmiFEpKqA0_AvOwYhu_V9dtAieTJ6EHLqVEzLZmvyXvRk0RZ7G3n6BO9gVZEKpE&_nc_ohc=X-ML0v44oVcQ7kNvwGmKPj8&_nc_gid=i-J7dc5bYegcPnPIkL9scQ&edm=AP4sbd4BAAAA&ccb=7-5&oh=00_Af7RgrBAKQfl7RpZSpdbPpPbKvVYuz5RYk93sONhI1Yrrw&oe=69F9A119&_nc_sid=7a9f4b", // 여기에 미리 쓸 URL들을 넣어주세요. - "https://i.namu.wiki/i/0uubPPIF2f9mKDb2fD19gMa77g2rUpoDnQ5Ekb9iqSNea2sfq9u9eWmRUGZFMIOy77XxnSI0HrIfTBj-U-wt4Q.webp", - "https://i.namu.wiki/i/Ob0--Jok1pkNtNu46VjPmTZWbmaql5Xf0pexZ5RBz3B5Nlj8z_xqYSyMqw70Ad5mEYa_i1GHcHda5pbilvBNOA.webp" + "https://i.pinimg.com/736x/8a/ac/0d/8aac0d13a68269655eccab58f0951f0d.jpg", + "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSUADRqIoQ68Ob7NoTHE4sIq_4RU9aKSzimmw&s" }; void Start() diff --git a/Assets/Settings/Build Profiles/Web - Desktop - Development.asset b/Assets/Settings/Build Profiles/Web - Desktop - Development.asset index 005bf01..55c7aa5 100644 --- a/Assets/Settings/Build Profiles/Web - Desktop - Development.asset +++ b/Assets/Settings/Build Profiles/Web - Desktop - Development.asset @@ -755,7 +755,7 @@ MonoBehaviour: - rid: 6490783975356497989 type: {class: WebGLPlatformSettings, ns: UnityEditor.WebGL, asm: UnityEditor.WebGL.Extensions} data: - m_Development: 1 + m_Development: 0 m_ConnectProfiler: 0 m_BuildWithDeepProfilingSupport: 0 m_AllowDebugging: 0 @@ -769,7 +769,7 @@ MonoBehaviour: m_InsightsSettingsContainer: m_BuildProfileEngineDiagnosticsState: 2 m_AdaptivePerformanceEnabled: 0 - m_CodeOptimization: 4 + m_CodeOptimization: 0 m_WebGLClientBrowserPath: m_WebGLClientBrowserType: 0 m_WebGLTextureSubtarget: 1 diff --git a/Assets/Sprites/178207f8c881360df.jpg b/Assets/Sprites/178207f8c881360df.jpg deleted file mode 100644 index 2c2643d..0000000 Binary files a/Assets/Sprites/178207f8c881360df.jpg and /dev/null differ diff --git a/Assets/Sprites/EnemyAvatar.png b/Assets/Sprites/EnemyAvatar.png deleted file mode 100644 index 346e2cb..0000000 Binary files a/Assets/Sprites/EnemyAvatar.png and /dev/null differ diff --git a/Assets/Sprites/SampleAvatar.png b/Assets/Sprites/SampleAvatar.png deleted file mode 100644 index 05b0447..0000000 Binary files a/Assets/Sprites/SampleAvatar.png and /dev/null differ diff --git a/Assets/Sprites/SampleAvatar.png.meta b/Assets/Sprites/SampleAvatar.png.meta deleted file mode 100644 index 05bf26a..0000000 --- a/Assets/Sprites/SampleAvatar.png.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: 217fd717f1d11ad45ab947f3429cc614 -TextureImporter: - internalIDToNameTable: - - first: - 213: 8957324059118975939 - second: images_0 - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 225 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - 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: - - serializedVersion: 2 - name: images_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 225 - height: 225 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 3cbb8d916cece4c70800000000000000 - internalID: 8957324059118975939 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - images_0: 8957324059118975939 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Space.aseprite b/Assets/Sprites/Space.aseprite deleted file mode 100644 index ff088a5..0000000 Binary files a/Assets/Sprites/Space.aseprite and /dev/null differ diff --git a/Assets/Sprites/Space.aseprite.meta b/Assets/Sprites/Space.aseprite.meta deleted file mode 100644 index 6acef68..0000000 --- a/Assets/Sprites/Space.aseprite.meta +++ /dev/null @@ -1,215 +0,0 @@ -fileFormatVersion: 2 -guid: a14b2716c34f198499b9275eb7ae9786 -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 62a9f0aa5b59740cfbadc7e5f9823bb0, type: 3} - importerVersion: 2 - textureImporterSettings: - alphaSource: 1 - mipMapMode: 0 - enableMipMap: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - convertToNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - swizzle: 50462976 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - nPOTScale: 1 - sRGBTexture: 1 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 0 - flipbookColumns: 0 - ignorePngGamma: 0 - cookieMode: 0 - filterMode: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - normalMap: 0 - textureFormat: 0 - maxTextureSize: 0 - lightmap: 0 - compressionQuality: 0 - linearTexture: 0 - grayScaleToAlpha: 0 - rGBM: 0 - cubemapConvolutionSteps: 0 - cubemapConvolutionExponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - applyGammaDecoding: 0 - previousAsepriteImporterSettings: - fileImportMode: 1 - importHiddenLayers: 0 - layerImportMode: 1 - defaultPivotSpace: 0 - defaultPivotAlignment: 7 - customPivotPosition: {x: 0.5, y: 0.5} - mosaicPadding: 4 - spritePadding: 0 - generateModelPrefab: 1 - generateAnimationClips: 1 - addSortingGroup: 1 - addShadowCasters: 0 - generateIndividualEvents: 1 - generateSpriteAtlas: 1 - asepriteImporterSettings: - fileImportMode: 1 - importHiddenLayers: 0 - layerImportMode: 1 - defaultPivotSpace: 0 - defaultPivotAlignment: 7 - customPivotPosition: {x: 0.5, y: 0.5} - mosaicPadding: 4 - spritePadding: 0 - generateModelPrefab: 1 - generateAnimationClips: 1 - addSortingGroup: 1 - addShadowCasters: 0 - generateIndividualEvents: 1 - generateSpriteAtlas: 1 - importFileNodeState: 1 - platformSettingsDirtyTick: 0 - textureAssetName: - singleSpriteImportData: - - name: - originalName: - pivot: {x: 0, y: 0} - alignment: 0 - border: {x: 0, y: 0, z: 0, w: 0} - customData: - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - spriteID: - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 0, y: 0} - animatedSpriteImportData: - - name: Frame_0 - originalName: - pivot: {x: 0.5, y: -0.3414634} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - customData: - rect: - serializedVersion: 2 - x: 4 - y: 4 - width: 56 - height: 41 - spriteID: 13b33cd956f3c614a937ac124379383b - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 4} - - name: Frame_1 - originalName: - pivot: {x: 0.5, y: -2} - alignment: 9 - border: {x: 0, y: 0, z: 0, w: 0} - customData: - rect: - serializedVersion: 2 - x: 4 - y: 53 - width: 52 - height: 7 - spriteID: 89f66fd8e2d071b458c08997aca0373d - spriteBone: [] - spriteOutline: [] - vertices: [] - spritePhysicsOutline: [] - indices: - edges: [] - tessellationDetail: 0 - uvTransform: {x: 4, y: 53} - spriteSheetImportData: [] - tileSetImportData: [] - asepriteLayers: - - layerIndex: 0 - uuid: - value0: 1144863360 - value1: 0 - value2: 0 - value3: 0 - guid: 0 - name: Space - layerFlags: 0 - layerType: 0 - blendMode: 0 - cells: - - name: Frame_0 - frameIndex: 0 - additiveSortOrder: 0 - cellRect: - x: 4 - y: 14 - width: 56 - height: 41 - spriteId: 13b33cd956f3c614a937ac124379383b - - name: Frame_1 - frameIndex: 1 - additiveSortOrder: 0 - cellRect: - x: 6 - y: 14 - width: 52 - height: 7 - spriteId: 89f66fd8e2d071b458c08997aca0373d - linkedCells: [] - tileCells: [] - tileSetIndex: 0 - parentIndex: -1 - tileSets: [] - platformSettings: [] - generatePhysicsShape: 0 - secondarySpriteTextures: [] - spritePackingTag: - canvasSize: {x: 64, y: 64} - previousTextureSize: {x: 64, y: 64} diff --git a/Assets/Sprites/bg.png b/Assets/Sprites/bg.png new file mode 100644 index 0000000..8c615d5 Binary files /dev/null and b/Assets/Sprites/bg.png differ diff --git a/Assets/Sprites/178207f8c881360df.jpg.meta b/Assets/Sprites/bg.png.meta similarity index 91% rename from Assets/Sprites/178207f8c881360df.jpg.meta rename to Assets/Sprites/bg.png.meta index 05f4de1..7ac3446 100644 --- a/Assets/Sprites/178207f8c881360df.jpg.meta +++ b/Assets/Sprites/bg.png.meta @@ -1,10 +1,10 @@ fileFormatVersion: 2 -guid: ac8cc60a3c962c3409bee3a7377bd0eb +guid: 6c163a07162f2b849b50297822c92b4e TextureImporter: internalIDToNameTable: - first: - 213: 4229238148489223300 - second: 178207f8c881360df_0 + 213: -4364034832326165938 + second: bg_0 externalObjects: {} serializedVersion: 13 mipmaps: @@ -113,13 +113,13 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: 178207f8c881360df_0 + name: bg_0 rect: serializedVersion: 2 x: 0 y: 0 - width: 684 - height: 434 + width: 500 + height: 500 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} @@ -128,8 +128,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: 48c1b3740b541ba30800000000000000 - internalID: 4229238148489223300 + spriteID: e4a74cf0175df63c0800000000000000 + internalID: -4364034832326165938 vertices: [] indices: edges: [] @@ -148,7 +148,7 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - 178207f8c881360df_0: 4229238148489223300 + bg_0: -4364034832326165938 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg b/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg deleted file mode 100644 index e5f947e..0000000 Binary files a/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg and /dev/null differ diff --git a/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg.meta b/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg.meta deleted file mode 100644 index e0bf0dd..0000000 --- a/Assets/Sprites/tree-branch-blossom-plant-flower-petal-1340465-pxhere.com.jpg.meta +++ /dev/null @@ -1,143 +0,0 @@ -fileFormatVersion: 2 -guid: f2d770627631e8d439c3af786bb6e45b -TextureImporter: - internalIDToNameTable: - - first: - 213: 1573197527682775870 - second: tree-branch-blossom-plant-flower-petal-1340465-pxhere.com_0 - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 2 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - 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: - - serializedVersion: 2 - name: tree-branch-blossom-plant-flower-petal-1340465-pxhere.com_0 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1620 - height: 1080 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: e3bfd07f0de15d510800000000000000 - internalID: 1573197527682775870 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - tree-branch-blossom-plant-flower-petal-1340465-pxhere.com_0: 1573197527682775870 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/제목 없음.jpg b/Assets/Sprites/제목 없음.jpg new file mode 100644 index 0000000..55fcec6 Binary files /dev/null and b/Assets/Sprites/제목 없음.jpg differ diff --git a/Assets/Sprites/EnemyAvatar.png.meta b/Assets/Sprites/제목 없음.jpg.meta similarity index 88% rename from Assets/Sprites/EnemyAvatar.png.meta rename to Assets/Sprites/제목 없음.jpg.meta index 4bd4e65..01049f6 100644 --- a/Assets/Sprites/EnemyAvatar.png.meta +++ b/Assets/Sprites/제목 없음.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b142779d51e89724d9bfd25b77d28182 +guid: 1b3cc4f2df3d8824a95438766423d76c TextureImporter: internalIDToNameTable: - first: @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + 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: @@ -105,8 +118,8 @@ TextureImporter: serializedVersion: 2 x: 0 y: 0 - width: 225 - height: 225 + width: 275 + height: 183 alignment: 0 pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Data/Plugins/lib_burst_generated.wasm b/Data/Plugins/lib_burst_generated.wasm index 82330ce..6a46130 100644 Binary files a/Data/Plugins/lib_burst_generated.wasm and b/Data/Plugins/lib_burst_generated.wasm differ