diff --git a/Assets/MagnetismHeroes/Editor/PresentationAssets.cs b/Assets/MagnetismHeroes/Editor/PresentationAssets.cs new file mode 100644 index 0000000..a15cf70 --- /dev/null +++ b/Assets/MagnetismHeroes/Editor/PresentationAssets.cs @@ -0,0 +1,149 @@ +using System; +using System.IO; +using System.Linq; +using MagnetismHeroes.UnityRuntime.Bootstrap; +using MagnetismHeroes.UnityRuntime.Presentation; +using TMPro; +using UnityEditor; +using UnityEngine; +using UnityEngine.Audio; + +namespace MagnetismHeroes.Editor +{ + public static class PresentationAssets + { + private const string Root = "Assets/MagnetismHeroes/UnityRuntime/Presentation/"; + public static void Build() + { + AssetDatabase.Refresh(); + string atlasPath = Root + "Textures/FaceExpressions.png"; + var importer = (TextureImporter)AssetImporter.GetAtPath(atlasPath); + importer.textureType = TextureImporterType.Default; + importer.alphaSource = TextureImporterAlphaSource.FromInput; importer.alphaIsTransparency = true; + importer.mipmapEnabled = false; importer.maxTextureSize = 2048; + importer.textureCompression = TextureImporterCompression.Uncompressed; importer.SaveAndReimport(); + var atlas = AssetDatabase.LoadAssetAtPath(atlasPath); + Directory.CreateDirectory(Root + "Sprites"); AssetDatabase.Refresh(); + var expressions = new Sprite[6]; + for (int i = 0; i < 6; i++) + { + string path = Root + $"Sprites/Face{i}.asset"; + expressions[i] = AssetDatabase.LoadAssetAtPath(path); + var pivot = new Vector2(.5f, i < 3 ? .5f : .68f); + var sprite = Sprite.Create(atlas, new Rect(i % 3 * atlas.width / 3, (1 - i / 3) * atlas.height / 2, atlas.width / 3, atlas.height / 2), pivot, 640, 0, SpriteMeshType.FullRect); + sprite.name = new[] { "Neutral", "Interested", "Focused", "Laughing", "Encouraging", "Celebrating" }[i]; + if (expressions[i] == null) + { + expressions[i] = sprite; + AssetDatabase.CreateAsset(expressions[i], path); + } + else { EditorUtility.CopySerialized(sprite, expressions[i]); EditorUtility.SetDirty(expressions[i]); UnityEngine.Object.DestroyImmediate(sprite); } + } + var ribbonMaterial = AssetDatabase.LoadAssetAtPath(Root + "Materials/LightRibbon.mat"); + if (ribbonMaterial == null) + { + ribbonMaterial = new Material(Shader.Find("Sprites/Default")); ribbonMaterial.color = new Color(.3f, .75f, 1, .6f); + AssetDatabase.CreateAsset(ribbonMaterial, Root + "Materials/LightRibbon.mat"); + } + ribbonMaterial.color = Color.white; EditorUtility.SetDirty(ribbonMaterial); + var badge = PrefabUtility.LoadPrefabContents(Root + "Prefabs/GroupBadge.prefab"); + try + { + var face = badge.transform.Find("RepresentativeFace"); + foreach (Transform child in face.Cast().ToArray()) UnityEngine.Object.DestroyImmediate(child.gameObject); + var renderer = face.GetComponent(); if (renderer == null) renderer = face.gameObject.AddComponent(); + renderer.sprite = expressions[0]; renderer.sortingOrder = 1; + face.localScale = new Vector3(.9f, .9f, 1); + var data = new SerializedObject(badge.GetComponent()); + data.FindProperty("_expression").objectReferenceValue = renderer; + var stem = badge.transform.Find("NumberStem"); + if (stem != null) UnityEngine.Object.DestroyImmediate(stem.gameObject); + var frames = data.FindProperty("_expressions"); frames.arraySize = 6; + for (int i = 0; i < 6; i++) frames.GetArrayElementAtIndex(i).objectReferenceValue = expressions[i]; + var cape = badge.transform.Find("RibbonCape"); + var line = cape.GetComponent(); line.sharedMaterial = ribbonMaterial; + line.useWorldSpace = false; line.positionCount = 10; line.widthMultiplier = .065f; + line.startColor = new Color(.1f, .35f, .8f, .9f); line.endColor = new Color(.9f, .15f, .12f, .45f); + data.ApplyModifiedPropertiesWithoutUndo(); + var number = badge.GetComponentInChildren(); number.fontSize = 3.5f; number.rectTransform.sizeDelta = new Vector2(1, .6f); + var numberMaterial = AssetDatabase.LoadAssetAtPath(Root + "Materials/NumberOutline.mat"); + if (numberMaterial == null) + { + numberMaterial = new Material(number.font.material); + numberMaterial.SetFloat("_OutlineWidth", .12f); numberMaterial.SetColor("_OutlineColor", Color.white); + AssetDatabase.CreateAsset(numberMaterial, Root + "Materials/NumberOutline.mat"); + } + number.fontSharedMaterial = numberMaterial; + PrefabUtility.SaveAsPrefabAsset(badge, Root + "Prefabs/GroupBadge.prefab"); + } + finally { PrefabUtility.UnloadPrefabContents(badge); } + var ball = PrefabUtility.LoadPrefabContents(Root + "Prefabs/MagnetFriend.prefab"); + try + { + var rim = ball.transform.Find("LightOutline"); + if (rim == null) { rim = new GameObject("LightOutline", typeof(LineRenderer)).transform; rim.SetParent(ball.transform, false); } + var line = rim.GetComponent(); line.sharedMaterial = ribbonMaterial; + line.useWorldSpace = false; line.loop = true; line.positionCount = 40; line.widthMultiplier = .035f; line.enabled = false; + for (int i = 0; i < 40; i++) { float angle = i * Mathf.PI * 2 / 40; line.SetPosition(i, new Vector3(Mathf.Cos(angle) * .51f, Mathf.Sin(angle) * .51f, -.08f)); } + Set(ball.GetComponent(), "_outline", line); + var contact = ball.transform.Find("ContactLight"); + if (contact == null) { contact = new GameObject("ContactLight", typeof(LineRenderer)).transform; contact.SetParent(ball.transform, false); } + var ring = contact.GetComponent(); ring.sharedMaterial = ribbonMaterial; + ring.useWorldSpace = false; ring.loop = true; ring.positionCount = 32; ring.widthMultiplier = .035f; ring.enabled = false; + for (int i = 0; i < 32; i++) { float angle = i * Mathf.PI * 2 / 32; ring.SetPosition(i, new Vector3(Mathf.Cos(angle) * .19f, Mathf.Sin(angle) * .19f, 0)); } + Set(ball.GetComponent(), "_contactRing", ring); + PrefabUtility.SaveAsPrefabAsset(ball, Root + "Prefabs/MagnetFriend.prefab"); + } + finally { PrefabUtility.UnloadPrefabContents(ball); } + var app = PrefabUtility.LoadPrefabContents(FirstSliceAssets.AppPrefabPath); + try + { + var voice = app.GetComponent(); Set(app.GetComponentInChildren(true), "_voice", voice); + app.transform.Find("GameCamera").GetComponent().fieldOfView = 62; + var sound = app.GetComponent(); if (sound == null) sound = app.AddComponent(); + var mixer = AssetDatabase.LoadAssetAtPath(Root + "Audio/GameAudio.mixer"); + Set(sound, "_voice", voice); + foreach (var spec in new[] { ("SFX", "_sfx", false), ("Music", "_music", true) }) + { + var child = app.transform.Find(spec.Item1); + if (child == null) { child = new GameObject(spec.Item1, typeof(AudioSource)).transform; child.SetParent(app.transform, false); } + var source = child.GetComponent(); source.playOnAwake = false; source.loop = spec.Item3; source.spatialBlend = 0; + source.outputAudioMixerGroup = mixer.FindMatchingGroups(spec.Item1).Single(); Set(sound, spec.Item2, source); + } + Set(app.GetComponent(), "_sound", sound); + var play = app.transform.Find("Interface/SafeArea/Play"); + var spoken = play.Find("SpokenNumber"); + if (spoken == null) { spoken = new GameObject("SpokenNumber", typeof(RectTransform), typeof(TextMeshProUGUI)).transform; spoken.SetParent(play, false); } + var spokenText = spoken.GetComponent(); spokenText.font = play.Find("Counter").GetComponent().font; + spokenText.fontSize = 23; spokenText.color = new Color(.12f, .2f, .31f); spokenText.alignment = TextAlignmentOptions.Center; + spokenText.raycastTarget = false; spokenText.enableAutoSizing = false; spokenText.text = ""; + Rect(spoken, new Vector2(.76f, .83f), new Vector2(.98f, .83f), new Vector2(-8, 36)); Set(voice, "_spokenNumber", spokenText); + Rect(play.Find("HomeButton"), new Vector2(.02f, .9f), new Vector2(.18f, .9f), new Vector2(-8, 62)); + Rect(play.Find("StageTitle"), new Vector2(.21f, .92f), new Vector2(.73f, .92f), new Vector2(-8, 60)); + Rect(play.Find("Counter"), new Vector2(.76f, .9f), new Vector2(.98f, .9f), new Vector2(-8, 62)); + foreach (var text in play.GetComponentsInChildren(true)) + { text.enableAutoSizing = false; if (text.transform.name == "Counter" || text.transform.name == "StageTitle") text.fontSize = 27; } + foreach (var button in app.GetComponentsInChildren(true)) + { + var image = button.GetComponent(); + image.sprite = AssetDatabase.GetBuiltinExtraResource("UI/Skin/UISprite.psd"); image.type = UnityEngine.UI.Image.Type.Sliced; + } + var selection = app.transform.Find("Interface/SafeArea/StageSelection"); + for (int i = 0; i < 30; i++) + Rect(selection.Find($"Stage{i + 1:D2}Button"), new Vector2(.045f + i % 6 * .153f, .76f - i / 6 * .123f), + new Vector2(.18f + i % 6 * .153f, .76f - i / 6 * .123f), new Vector2(0, 62)); + PrefabUtility.SaveAsPrefabAsset(app, FirstSliceAssets.AppPrefabPath); + } + finally { PrefabUtility.UnloadPrefabContents(app); } + AssetDatabase.SaveAssets(); Debug.Log("[Presentation] Six face decals, light ribbons/outlines, responsive controls and existing mixer routing built without scene edits."); + } + private static void Rect(Transform target, Vector2 min, Vector2 max, Vector2 size) + { + var rect = (RectTransform)target; rect.anchorMin = min; rect.anchorMax = max; rect.anchoredPosition = Vector2.zero; rect.sizeDelta = size; + foreach (var text in target.GetComponentsInChildren()) + if (text.transform != target) { text.rectTransform.anchorMin = Vector2.zero; text.rectTransform.anchorMax = Vector2.one; text.rectTransform.offsetMin = text.rectTransform.offsetMax = Vector2.zero; } + } + private static void Set(UnityEngine.Object target, string field, UnityEngine.Object value) + { var data = new SerializedObject(target); data.FindProperty(field).objectReferenceValue = value; data.ApplyModifiedPropertiesWithoutUndo(); } + } +} diff --git a/Assets/MagnetismHeroes/Editor/PresentationAssets.cs.meta b/Assets/MagnetismHeroes/Editor/PresentationAssets.cs.meta new file mode 100644 index 0000000..4314bcd --- /dev/null +++ b/Assets/MagnetismHeroes/Editor/PresentationAssets.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e4a866a5fd5323444b0aa424910818ad \ No newline at end of file diff --git a/Assets/MagnetismHeroes/Editor/PresentationProof.cs b/Assets/MagnetismHeroes/Editor/PresentationProof.cs new file mode 100644 index 0000000..e9830a6 --- /dev/null +++ b/Assets/MagnetismHeroes/Editor/PresentationProof.cs @@ -0,0 +1,120 @@ +using System; +using System.IO; +using System.Linq; +using MagnetismHeroes.Core; +using MagnetismHeroes.UnityRuntime.Bootstrap; +using MagnetismHeroes.UnityRuntime.Presentation; +using TMPro; +using UnityEditor; +using UnityEngine; +using UnityEngine.Profiling; + +namespace MagnetismHeroes.Editor +{ + public static class PresentationProof + { + private sealed class ProofStore : IProgressStore + { + public bool TryLoad(out ProgressSave save, out string error) + { save = new ProgressSave { completedStageIds = Enumerable.Range(1, 30).ToArray(), seenTutorialIds = new[] { "merge", "split" } }; error = null; return true; } + public bool TrySave(ProgressSave save, out string error) { error = null; return true; } + } + public static GameApp App => UnityEngine.Object.FindFirstObjectByType(); + public static void Initialize() { App.Initialize(new ProofStore()); App.StartStage(20); App.Voice.Clear(); } + public static void Supply(int stage) + { + Stage(stage); + for (int step = 0; App.Session.Screen == SessionScreen.Puzzle && step < 40; step++) + { + var hint = App.Session.Hint; + if (hint.Kind == HintKind.Collect) App.CommitMove(hint.FirstGroupId, new Position3(.1f, 0, 0)); + else if (hint.Kind == HintKind.Merge) App.CommitMove(hint.FirstGroupId, new Position3(.1f, 0, 0), hint.SecondGroupId); + else if (hint.Kind == HintKind.Count) App.CountBall(hint.BallIds[0]); + else App.CommitSplit(hint.FirstGroupId, hint.BallIds, new Position3(1, 0, 0)); + } + if (App.Session.Screen != SessionScreen.FreePlay) throw new InvalidOperationException("Proof stage did not solve."); + foreach (var group in App.Session.Board.Groups) App.Session.ReturnGroup(group.id); + App.ContinueFreePlay(); + App.Orbit.Apply(new CameraState { target = new Position3(0, .6f, 0), distance = 11, rotation = new Rotation4(0, 0, 0, 1) }); + for (int i = 0; i < 10; i++) App.SpawnFriend(); + if (App.Session.Board.BallCount != 10) throw new InvalidOperationException("Ten initial supply friends are not reachable."); + App.Voice.Clear(); + } + public static void Fixture(string layout, int count = 10) + { + App.StartStage(layout == "Garden" ? 9 : layout == "Cloud" ? 20 : 28); App.Voice.Clear(); + var balls = Enumerable.Range(0, count).Select(i => new BallState { id = "proof-" + i, + position = layout == "Line" ? new Position3(i - (count - 1) * .5f, .8f, 0) + : layout == "Volume" ? new Position3(i % 2 - .5f, .8f + i / 4, (i / 2) % 2 - .5f) + : new Position3(i % 5 - 2, .8f + i / 5 * (layout == "Garden" || layout == "Cloud" || layout == "Workshop" ? 1.8f : 1), 0) }).ToArray(); + var groups = layout == "FivePairs" ? new[] { new GroupState { id = "first", ballIds = balls.Take(5).Select(ball => ball.id).ToArray() }, + new GroupState { id = "second", ballIds = balls.Skip(5).Select(ball => ball.id).ToArray() } } + : new[] { new GroupState { id = "proof", ballIds = balls.Select(ball => ball.id).ToArray() } }; + if (layout == "Garden" || layout == "Cloud" || layout == "Workshop") + groups = balls.Select(ball => new GroupState { id = ball.id, ballIds = new[] { ball.id } }).ToArray(); + BoundBoard = BoardRules.CreateFreePlay(new FreePlayState { sourceStageId = 28, balls = balls, groups = groups }); + App.Presenter.Render(BoundBoard); + } + private static BoardRules BoundBoard; + [Serializable] private sealed class CaptureRecord + { + public string sourceCommit, name, mode, utc, board; + public bool sourceDirty; + public int width, height, groups, balls, faces, numbers, capes, liveGameViewDrawCalls, expressionOverride; + public long allocatedMemory, textureMemory, voiceMemory; + public float cameraRenderMilliseconds; + public Vector3 cameraPosition, fixedVisualPivot = Vector3.up * .65f; public Quaternion cameraRotation; public float fieldOfView; + public CameraState rawCameraState; + public Rect safeArea; + public Rect actualCameraPixelRect; + public Vector2 liveScreenSize, canvasRectSize; + } + public static void Capture(string name, int width = 1280, int height = 720, float inset = 0, int expression = -1) + { + string folder = "artifacts/verification/T7/Implementation/editor-play"; Directory.CreateDirectory(folder); + var app = App; var camera = app.Presenter.Camera; var canvas = app.GetComponentInChildren(true); + var safe = app.GetComponentInChildren(true); var safeRect = (RectTransform)safe.transform; + var oldMin = safeRect.anchorMin; var oldMax = safeRect.anchorMax; bool oldEnabled = safe.enabled; + var oldMode = canvas.renderMode; var oldCamera = canvas.worldCamera; float oldPlane = canvas.planeDistance; + var oldTarget = camera.targetTexture; var oldActive = RenderTexture.active; float oldAspect = camera.aspect; + var target = new RenderTexture(width, height, 24); var image = new Texture2D(width, height, TextureFormat.RGB24, false); + try + { + camera.targetTexture = target; camera.aspect = (float)width / height; + canvas.renderMode = RenderMode.ScreenSpaceCamera; canvas.worldCamera = camera; canvas.planeDistance = .5f; + safe.enabled = false; safeRect.anchorMin = new Vector2(inset / width, 0); safeRect.anchorMax = new Vector2(1 - inset / width, 1); + app.Presenter.SendMessage("LateUpdate"); Canvas.ForceUpdateCanvases(); + if (expression >= 0) + foreach (var face in app.GetComponentsInChildren()) face.sprite = AssetDatabase.LoadAssetAtPath($"Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face{expression}.asset"); + var timer = System.Diagnostics.Stopwatch.StartNew(); camera.Render(); timer.Stop(); + RenderTexture.active = target; image.ReadPixels(new Rect(0, 0, width, height), 0, 0); image.Apply(); + File.WriteAllBytes(folder + "/" + name + ".png", image.EncodeToPNG()); + var board = BoundBoard ?? app.Session.Board; + var record = new CaptureRecord { name = name, sourceCommit = Environment.GetEnvironmentVariable("MAGNETISM_PROOF_COMMIT"), mode = "Editor Camera.Render RT with temporary ScreenSpaceCamera canvas; simulated viewport/safe area, not Android device capture", + sourceDirty = Environment.GetEnvironmentVariable("MAGNETISM_PROOF_DIRTY") == "true", + utc = DateTime.UtcNow.ToString("o"), width = width, height = height, expressionOverride = expression, safeArea = new Rect(inset, 0, width - inset * 2, height), + balls = app.Presenter.Balls.Count, groups = app.GetComponentsInChildren().Length, + faces = app.GetComponentsInChildren().Length, numbers = app.GetComponentsInChildren().Length, + capes = app.GetComponentsInChildren().Count(badge => badge.transform.Find("RibbonCape") != null), + cameraPosition = camera.transform.position, cameraRotation = camera.transform.rotation, fieldOfView = camera.fieldOfView, + rawCameraState = app.Orbit.Snapshot(), + liveScreenSize = new Vector2(Screen.width, Screen.height), actualCameraPixelRect = camera.pixelRect, + canvasRectSize = ((RectTransform)canvas.transform).rect.size, + board = JsonUtility.ToJson(board.Mode == BoardMode.FreePlay ? (object)board.ToFreePlayState(app.Orbit.Snapshot()) : board.ToPuzzleState(app.Orbit.Snapshot())), + allocatedMemory = Profiler.GetTotalAllocatedMemoryLong(), textureMemory = UnityEngine.Object.FindObjectsByType(FindObjectsSortMode.None).Sum(texture => Profiler.GetRuntimeMemorySizeLong(texture)), + voiceMemory = Resources.FindObjectsOfTypeAll().Sum(clip => Profiler.GetRuntimeMemorySizeLong(clip)), + liveGameViewDrawCalls = UnityEditor.UnityStats.drawCalls, cameraRenderMilliseconds = (float)timer.Elapsed.TotalMilliseconds }; + File.WriteAllText(folder + "/" + name + ".json", JsonUtility.ToJson(record, true)); + } + finally + { + camera.targetTexture = oldTarget; camera.aspect = oldAspect; RenderTexture.active = oldActive; + canvas.renderMode = oldMode; canvas.worldCamera = oldCamera; canvas.planeDistance = oldPlane; + safeRect.anchorMin = oldMin; safeRect.anchorMax = oldMax; safe.enabled = oldEnabled; + UnityEngine.Object.DestroyImmediate(image); target.Release(); UnityEngine.Object.DestroyImmediate(target); + app.Presenter.SendMessage("LateUpdate"); Canvas.ForceUpdateCanvases(); + } + } + public static void Stage(int id) { BoundBoard = null; App.StartStage(id); App.Voice.Clear(); } + } +} diff --git a/Assets/MagnetismHeroes/Editor/PresentationProof.cs.meta b/Assets/MagnetismHeroes/Editor/PresentationProof.cs.meta new file mode 100644 index 0000000..c57aeec --- /dev/null +++ b/Assets/MagnetismHeroes/Editor/PresentationProof.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 4ab6b61155a1d5a41b63cf3bdc580b0b \ No newline at end of file diff --git a/Assets/MagnetismHeroes/Tests/EditMode/ContentVoiceTests.cs b/Assets/MagnetismHeroes/Tests/EditMode/ContentVoiceTests.cs index 99456a5..5e1e080 100644 --- a/Assets/MagnetismHeroes/Tests/EditMode/ContentVoiceTests.cs +++ b/Assets/MagnetismHeroes/Tests/EditMode/ContentVoiceTests.cs @@ -31,6 +31,7 @@ namespace MagnetismHeroes.Tests [TestCase("count_01","13A882CE1620140D447635E14F2D4758045D5E348960C17386DF1C720050C100")] [TestCase("guide_collect","62E15C9E38C36F4094A6C7E9C5148510141290B5F41DB5AAD9DC1D8F1A158594")] [TestCase("guide_count","DEBE29B89F3E2856F2BF4C5E01707A5F0A0657E5768C03BE385EC88FA2328B40")] + [TestCase("count_08","FA8034948F6AC3E289E8E7E9FB447943760D4ED5AC577C8AB0C961C608FE49C2")] public void UserApprovedVoiceBytesRemainExact(string id,string hash) { using (var sha=SHA256.Create()) Assert.That(System.BitConverter.ToString(sha.ComputeHash(File.ReadAllBytes($"Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/{id}.wav"))).Replace("-",""), Is.EqualTo(hash)); diff --git a/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs b/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs new file mode 100644 index 0000000..61b3626 --- /dev/null +++ b/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs @@ -0,0 +1,47 @@ +using System.IO; +using System.Linq; +using MagnetismHeroes.UnityRuntime.Presentation; +using NUnit.Framework; +using UnityEditor; +using UnityEngine; + +namespace MagnetismHeroes.Tests +{ + public sealed class PresentationAssetTests + { + private const string Root = "Assets/MagnetismHeroes/UnityRuntime/Presentation/"; + [Test] public void FaceAtlasHasSixDistinctOfflineExpressionsAndDecorationsCannotReceiveInput() + { + var badge = AssetDatabase.LoadAssetAtPath(Root + "Prefabs/GroupBadge.prefab"); + var data = new SerializedObject(badge.GetComponent()); var frames = data.FindProperty("_expressions"); + Assert.That(frames.arraySize, Is.EqualTo(6)); + var sprites = Enumerable.Range(0, 6).Select(i => (Sprite)frames.GetArrayElementAtIndex(i).objectReferenceValue).ToArray(); + Assert.That(sprites.All(sprite => sprite != null && sprite.texture != null), Is.True); + Assert.That(sprites.Select(sprite => sprite.rect).Distinct().Count(), Is.EqualTo(6)); + Assert.That(sprites.Select(sprite => sprite.texture).Distinct().Count(), Is.EqualTo(1)); + Assert.That(badge.GetComponentsInChildren(true), Is.Empty); + Assert.That(badge.GetComponentsInChildren(true).Length, Is.EqualTo(1)); + Assert.That(badge.GetComponentsInChildren(true).Length, Is.EqualTo(1)); + Assert.That(badge.transform.Find("RibbonCape"), Is.Not.Null); + var ball = AssetDatabase.LoadAssetAtPath(Root + "Prefabs/MagnetFriend.prefab"); + Assert.That(ball.GetComponentsInChildren(true).Length, Is.EqualTo(1)); + Assert.That(ball.GetComponent().radius, Is.EqualTo(.5f)); + Assert.That(ball.transform.localScale, Is.EqualTo(Vector3.one)); + } + [Test] public void AudioRoutesToExistingMixerAndRequiredNoticesAreStagedForBuild() + { + var app = AssetDatabase.LoadAssetAtPath(Root + "Prefabs/GameApp.prefab"); + Assert.That(AssetDatabase.AssetPathToGUID(Root + "Prefabs/GameApp.prefab"), Is.EqualTo("73c3215bc432df740b907a1edefa9ea1")); + Assert.That(app.GetComponent(), Is.Not.Null); + foreach (string group in new[] { "SFX", "Music" }) + { + var source = app.transform.Find(group).GetComponent(); + Assert.That(source.outputAudioMixerGroup.name, Is.EqualTo(group)); + Assert.That(source.playOnAwake, Is.False); Assert.That(source.spatialBlend, Is.Zero); + Assert.That(source.clip, Is.Null, "User has deferred supplying music/SFX; no substitute is selected."); + } + foreach (string path in new[] { "NotoSansCJK-OFL.txt", "Qwen3-TTS-Apache-2.0.txt", "Qwen3-TTS-model-card.txt" }) + Assert.That(File.ReadAllText("Assets/StreamingAssets/Notices/" + path).Length, Is.GreaterThan(100)); + } + } +} diff --git a/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs.meta b/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs.meta new file mode 100644 index 0000000..618c45a --- /dev/null +++ b/Assets/MagnetismHeroes/Tests/EditMode/PresentationAssetTests.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 415c49a50d8d790469cd272156da0448 \ No newline at end of file diff --git a/Assets/MagnetismHeroes/Tests/PlayMode/CompositionPlayTests.cs b/Assets/MagnetismHeroes/Tests/PlayMode/CompositionPlayTests.cs index 5989464..8cc7c9e 100644 --- a/Assets/MagnetismHeroes/Tests/PlayMode/CompositionPlayTests.cs +++ b/Assets/MagnetismHeroes/Tests/PlayMode/CompositionPlayTests.cs @@ -49,6 +49,92 @@ namespace MagnetismHeroes.Tests _app.StartStage(10); Physics.SyncTransforms(); var id = _app.Session.Board.Balls[0].id; Tap(id); _app.Input.BeginSplit(); Tap(id); Assert.That(_app.Input.SelectedCount, Is.EqualTo(1)); return id; } + [UnityTest] public IEnumerator FacePreviewCancelAndNavigationFollowOnlyCommittedGroups() + { + _app.StartStage(6); _app.Voice.Clear(); yield return null; + var board = JsonUtility.ToJson(_app.Session.Board.ToPuzzleState(_app.Session.Camera)); + var badges = _app.GetComponentsInChildren(); + var face = badges[0].GetComponentInChildren(); + Assert.That(face, Is.Not.Null, "The representative face must support expressions."); + var neutral = face.sprite; + var states = _app.Session.Board.Balls; + var delta = BoardPresenter.ToVector(states[1].position) - BoardPresenter.ToVector(states[0].position) - Vector3.right; + _app.Presenter.PreviewGroup(_app.Session.Board.Groups[0].id, delta); yield return null; + Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(2)); + Assert.That(face.sprite, Is.Not.EqualTo(neutral)); + Assert.That(JsonUtility.ToJson(_app.Session.Board.ToPuzzleState(_app.Session.Camera)), Is.EqualTo(board)); + _app.Presenter.CancelPreview(); yield return null; + Assert.That(face.sprite, Is.EqualTo(neutral)); + _app.Voice.Guide("guide_merge"); yield return null; + var speaking = face.sprite; Assert.That(speaking, Is.Not.EqualTo(neutral)); + _app.Presenter.CancelPreview(); yield return null; + Assert.That(face.sprite, Is.EqualTo(speaking), "Canceling visual drag does not cancel an active guide."); + _app.ShowHome(); yield return null; + Assert.That(_app.Voice.IsSpeaking, Is.False); Assert.That(_app.Voice.CurrentClipId, Is.Null); + Assert.That(_app.GetComponentsInChildren().Length, Is.Zero); + _app.StartStage(6); yield return null; + Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(2)); + Assert.That(_app.Voice.IsSpeaking, Is.False, "Restoring an unfinished board is silent."); + Assert.That(_app.GetComponentsInChildren().All(badge => badge.GetComponentInChildren().sprite == neutral), Is.True); + _app.Voice.Guide("guide_merge"); yield return null; + Assert.That(_app.GetComponentsInChildren().All(badge => badge.GetComponentInChildren().sprite == speaking), Is.True); + yield return new WaitForSecondsRealtime(_app.GetComponent().clip.length + .1f); + Assert.That(_app.Voice.IsSpeaking, Is.False); + Assert.That(_app.GetComponentsInChildren().All(badge => badge.GetComponentInChildren().sprite == neutral), Is.True); + } + [UnityTest] public IEnumerator OneThroughTenKeepExactSphereCountSizeAndCommittedLayoutWithOneDecorationSetPerGroup() + { + _app.StartStage(6); _app.Voice.Clear(); + for (int count = 1; count <= 10; count++) + { + var states = Enumerable.Range(0, count).Select(i => new BallState { id = "art-" + i, position = new Position3(i % 5 - 2, .8f + i / 5, 0) }).ToArray(); + var board = BoardRules.CreateFreePlay(new FreePlayState { sourceStageId = 6, balls = states, + groups = new[] { new GroupState { id = "art", ballIds = states.Select(ball => ball.id).ToArray() } } }); + _app.Presenter.Render(board); yield return null; + Assert.That(_app.Presenter.Balls.Count, Is.EqualTo(count)); + Assert.That(_app.Presenter.Balls.Values.All(ball => ball.transform.localScale == Vector3.one), Is.True); + foreach (var state in states) Assert.That(_app.Presenter.Balls[state.id].transform.position, Is.EqualTo(BoardPresenter.ToVector(state.position))); + Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(1)); + Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(1)); + Assert.That(_app.GetComponentsInChildren().Single().text, Is.EqualTo(count.ToString())); + _app.Presenter.ShowSelection(new[] { states[0].id }); _app.Orbit.Orbit(new Vector2(45, 20)); yield return null; + Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(1)); + foreach (var state in states) Assert.That(_app.Presenter.Balls[state.id].transform.position, Is.EqualTo(BoardPresenter.ToVector(state.position))); + _app.Presenter.CancelPreview(); _app.Presenter.ShowSelection(System.Array.Empty()); + } + } + [UnityTest] public IEnumerator SpokenNumberAndDuckingFollowSpeechQueueAndClearImmediatelyOnNavigation() + { + _app.StartStage(6); _app.Voice.Clear(); + var cue = _app.transform.Find("Interface/SafeArea/Play/SpokenNumber").GetComponent(); + _app.Voice.EnqueueCount(1); _app.Voice.EnqueueCount(2); yield return null; + Assert.That(cue.text, Is.EqualTo("숫자 1")); + Assert.That(_app.transform.Find("SFX").GetComponent().volume, Is.EqualTo(.12f).Within(.001)); + Assert.That(_app.transform.Find("Music").GetComponent().volume, Is.EqualTo(.06f).Within(.001)); + float deadline = Time.realtimeSinceStartup + 5; + while (_app.Voice.CurrentClipId != "count_02" && Time.realtimeSinceStartup < deadline) yield return null; + Assert.That(cue.text, Is.EqualTo("숫자 2")); + _app.ShowHome(); Assert.That(cue.text, Is.Empty); Assert.That(_app.Voice.IsSpeaking, Is.False); + yield return null; + Assert.That(_app.transform.Find("SFX").GetComponent().volume, Is.EqualTo(.5f)); + Assert.That(_app.transform.Find("Music").GetComponent().volume, Is.EqualTo(.25f)); + } + [UnityTest] public IEnumerator MusicResumesCurrentThemeAfterPauseWithoutReplayingSfx() + { + var clip = AudioClip.Create("test-only-loop", 44100, 1, 44100, false); + var settings = new SerializedObject(_app.Sound); + settings.FindProperty("_garden").objectReferenceValue = clip; settings.ApplyModifiedPropertiesWithoutUndo(); + _app.Sound.Theme("Garden"); yield return null; + var music = _app.transform.Find("Music").GetComponent(); + var sfx = _app.transform.Find("SFX").GetComponent(); + sfx.PlayOneShot(clip); Assert.That(music.isPlaying, Is.True); + _app.Sound.SendMessage("OnApplicationPause", true); yield return null; + Assert.That(music.isPlaying, Is.False); Assert.That(sfx.isPlaying, Is.False); + _app.Sound.SendMessage("OnApplicationPause", false); yield return null; + Assert.That(music.clip, Is.SameAs(clip)); Assert.That(music.isPlaying, Is.True); + Assert.That(sfx.isPlaying, Is.False); + _app.Sound.Clear(); Object.Destroy(clip); + } [UnityTest] public IEnumerator NativeCanceledSplitRestoresCommittedBoardAndClearsUnconfirmedSelection() { var id = PrepareSplit(); yield return null; var point = Point(id); var saved = JsonUtility.ToJson(_store.Save); var writes = _store.Writes; @@ -90,9 +176,12 @@ namespace MagnetismHeroes.Tests Assert.That(_app.Session.Board.Balls.Select(ball => ball.id), Is.EquivalentTo(states.Select(ball => ball.id))); Assert.That(Vector3.Distance(_app.Presenter.Balls[states[0].id].transform.position, _app.Presenter.Balls[states[1].id].transform.position), Is.EqualTo(1).Within(.001f)); Assert.That(_app.Presenter.Balls.Values.All(ball => !ball.ContactCandidate), Is.True); + Assert.That(_app.Presenter.Balls.Values.All(ball => ball.transform.Find("ContactLight").GetComponent().enabled), Is.True); Assert.That(_app.GetComponentsInChildren().Length, Is.EqualTo(1)); Tap(states[0].id); _app.Input.BeginSplit(); Tap(states[0].id); _app.Input.CancelSplit(); Assert.That(_app.Instruction, Is.EqualTo("해냈어! 친구와 자유롭게 놀아 보자.")); + yield return new WaitForSecondsRealtime(.4f); + Assert.That(_app.Presenter.Balls.Values.All(ball => !ball.transform.Find("ContactLight").GetComponent().enabled), Is.True); } [UnityTest] public IEnumerator FourteenDisconnectedSelectionThenMergeIsAcceptedByFinalNumbers() { diff --git a/Assets/MagnetismHeroes/UnityRuntime/Bootstrap/GameApp.cs b/Assets/MagnetismHeroes/UnityRuntime/Bootstrap/GameApp.cs index 7cbc259..9f9a376 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Bootstrap/GameApp.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Bootstrap/GameApp.cs @@ -37,6 +37,7 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap [SerializeField] private OrbitCamera _orbit; [SerializeField] private BoardInput _input; [SerializeField] private VoicePlayer _voice; + [SerializeField] private GameSound _sound; [SerializeField] private UnityEngine.UI.Button[] _stageButtons = Array.Empty(); [SerializeField] private UnityEngine.UI.Button _helpButton; [SerializeField] private UnityEngine.UI.Button _nextButton; @@ -47,6 +48,7 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap public BoardInput Input => _input; public OrbitCamera Orbit => _orbit; public VoicePlayer Voice => _voice; + public GameSound Sound => _sound; public BoardEnvironment Environment => _environment; public GhostDemonstration Demonstration => _demonstration; public string Instruction => _instruction.text; @@ -73,6 +75,7 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap { int stageId = _stages.Where(stage => stage.ToDefinition().Kind == StageKind.Composition).ElementAt(index).StageId; _compositionButtons[index].onClick.AddListener(() => StartStage(stageId)); } if (_splitButton != null) _splitButton.onClick.AddListener(() => { _input.BeginSplit(); if (_input.IsSplitting) _voice.Guide("guide_split"); }); if (_cancelSplitButton != null) _cancelSplitButton.onClick.AddListener(() => { _input.CancelSplit(); _voice.CancelGuide(); }); + if (_sound != null) foreach (var button in GetComponentsInChildren(true)) button.onClick.AddListener(_sound.UI); } private void Start() { @@ -98,13 +101,13 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap if (Session.Screen != SessionScreen.FreePlay || Session.Board.BallCount >= 10) return; _input.CancelSplit(); if (!_presenter.TryFindSpawnPosition(out var position)) { _instruction.text = "빈 곳이 보이도록 화면을 움직여 볼까?"; return; } - if (Session.Spawn(position).Accepted) Refresh(false); + if (Session.Spawn(position).Accepted) { Refresh(false); _sound?.Supply(); } } public void ReturnSelectedFriend() { if (Session.Screen != SessionScreen.FreePlay || _input.SelectedGroup == null) return; string groupId = _input.SelectedGroup; _input.CancelSplit(); - if (Session.ReturnGroup(groupId).Accepted) Refresh(false); + if (Session.ReturnGroup(groupId).Accepted) { Refresh(false); _sound?.Supply(); } } public void ShowSelection() { _input.CancelSplit(); _voice.Clear(); _demonstration?.Hide(); Session.ShowSelection(); Refresh(true); } @@ -134,33 +137,41 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap : hint.Kind == HintKind.Count ? "아직 세지 않은 이 구를 눌러 볼까?" : hint.Kind == HintKind.Merge ? "빛나는 두 친구를 가까이 끌어와 붙여 볼까?" : $"빛나는 {hint.GroupSize} 친구에서 나누기를 누르고 {hint.SelectionCount}개를 골라 끌어내 보자."; - _presenter.ShowHint(hint.BallIds); _voice.Guide(hint.VoiceId); + _presenter.ShowHint(hint.BallIds); _voice.Guide(hint.VoiceId); _sound?.Hint(); } public void CommitMove(string groupId, Position3 delta, string mergeTarget = null) { + bool wasPuzzle = Session.Screen == SessionScreen.Puzzle; var result = mergeTarget == null ? Session.MoveGroup(groupId, delta) : Session.MoveAndMerge(groupId, delta, mergeTarget); if (result.Accepted) _voice.CancelGuide(); Refresh(false); + if (result.Accepted && mergeTarget != null) _sound?.Merge(); + if (result.Accepted && wasPuzzle && Session.Screen == SessionScreen.FreePlay) _sound?.Success(); if (result.Accepted && Session.Screen == SessionScreen.Puzzle && Session.Board.CanCount) _voice.Guide("guide_count"); } public bool CommitSplit(string groupId, string[] selected, Position3 delta) { + bool wasPuzzle = Session.Screen == SessionScreen.Puzzle; string newId = groupId + "-split"; while (Session.Board.Groups.Any(group => group.id == newId)) newId += "-split"; var result = Session.SplitAndMove(groupId, selected, newId, delta); - if (result.Accepted) { _voice.CancelGuide(); Refresh(false); } + if (result.Accepted) { _voice.CancelGuide(); Refresh(false); _sound?.Split(); } + if (result.Accepted && wasPuzzle && Session.Screen == SessionScreen.FreePlay) _sound?.Success(); return result.Accepted; } public void CountBall(string ballId) { if (Session.Board.Mode != BoardMode.Counting) return; + bool wasPuzzle = Session.Screen == SessionScreen.Puzzle; var result = Session.Count(ballId); if (result.Accepted) _voice.EnqueueCount(result.Count); - if (result.Accepted) Refresh(false); + if (result.Accepted) { Refresh(false); _sound?.Count(); } + if (result.Accepted && wasPuzzle && Session.Screen == SessionScreen.FreePlay) _sound?.Success(); if (!result.Accepted && result.Reason == RejectionReason.NotCollected) { _instruction.text = "친구를 먼저 끌어와 볼까?"; if (_presenter.Balls.TryGetValue(ballId, out var friend)) friend.Encourage(); + _sound?.Encourage(); } } private void Refresh(bool applyCamera) @@ -186,8 +197,9 @@ namespace MagnetismHeroes.UnityRuntime.Bootstrap if (_nextButton != null) _nextButton.gameObject.SetActive(Session.HasNextStage); if (applyCamera) _orbit.Apply(Session.Camera); _presenter.Render(Session.Board); - if (!playing) return; + if (!playing) { _sound?.Clear(); _sound?.Theme("Menu"); return; } _environment?.Apply(_stages.First(stage => stage.StageId == Session.Board.StageId)); + _sound?.Theme(_stages.First(stage => stage.StageId == Session.Board.StageId).Theme); _stageTitle.text = screen == SessionScreen.FreePlay ? "자유 놀이터" : $"숫자 {Session.Board.BallCount} 친구 찾기"; _counter.text = screen == SessionScreen.FreePlay ? $"친구 {Session.Board.BallCount}" : $"센 친구 {Session.Board.CountedCount} / {Session.Board.BallCount}"; _instruction.text = screen == SessionScreen.FreePlay ? "해냈어! 친구와 자유롭게 놀아 보자." diff --git a/Assets/MagnetismHeroes/UnityRuntime/Interaction/BoardInput.cs b/Assets/MagnetismHeroes/UnityRuntime/Interaction/BoardInput.cs index 8bc1a73..e5c0f2a 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Interaction/BoardInput.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Interaction/BoardInput.cs @@ -61,6 +61,7 @@ namespace MagnetismHeroes.UnityRuntime.Interaction { Cancel(); if (!AcceptInput) return; + _presenter.CancelPreview(); _start = _last = point; if (uiBlocked) { _gesture = Gesture.Blocked; return; } Physics.SyncTransforms(); @@ -68,6 +69,7 @@ namespace MagnetismHeroes.UnityRuntime.Interaction if (Physics.Raycast(ray, out var hit, 100) && hit.collider.TryGetComponent(out var ball)) { _gesture = Gesture.Friend; _ballId = ball.BallId; _groupId = ball.GroupId; + _app.Sound?.Pickup(); if (_splitting && _selectedGroup != _groupId) { _selected.Clear(); _selectedGroup = _groupId; _app.RefreshSelection(); } _splitDrag = _splitting && _selected.Contains(_ballId); _dragPlane = new Plane(_orbit.Camera.transform.forward, hit.point); @@ -114,6 +116,7 @@ namespace MagnetismHeroes.UnityRuntime.Interaction else if (_splitting) { if (!_selected.Add(_ballId)) _selected.Remove(_ballId); + _app.Sound?.Selection(); _app.RefreshSelection(); } else { _selectedGroup = _groupId; _app.CountBall(_ballId); _app.RefreshSelection(); } diff --git a/Assets/MagnetismHeroes/UnityRuntime/Interaction/OrbitCamera.cs b/Assets/MagnetismHeroes/UnityRuntime/Interaction/OrbitCamera.cs index 60a7eca..4b499c4 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Interaction/OrbitCamera.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Interaction/OrbitCamera.cs @@ -31,6 +31,6 @@ namespace MagnetismHeroes.UnityRuntime.Interaction public CameraState Snapshot() => new CameraState { target = new Position3(_target.x, _target.y, _target.z), rotation = new Rotation4(_rotation.x, _rotation.y, _rotation.z, _rotation.w), distance = _distance }; private void UpdateCamera() - { _camera.transform.SetPositionAndRotation(_target + _rotation * new Vector3(0, 0, -_distance), _rotation); } + { _camera.transform.SetPositionAndRotation(_target + Vector3.up * .65f + _rotation * new Vector3(0, 0, -_distance), _rotation); } } } diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav index 45b3daf..4c3c4f7 100644 Binary files a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav and b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav differ diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/BallView.cs b/Assets/MagnetismHeroes/UnityRuntime/Presentation/BallView.cs index b1a38ef..57626a6 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/BallView.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/BallView.cs @@ -6,9 +6,18 @@ namespace MagnetismHeroes.UnityRuntime.Presentation { [SerializeField] private Renderer _body; [SerializeField] private GameObject _countMarker; + [SerializeField] private LineRenderer _outline; + [SerializeField] private LineRenderer _contactRing; private MaterialPropertyBlock _colors; private Color _normalColor; private float _encourageUntil; + private float _pulseAt = -1; + private Vector3 _contactDirection; + private float _contactUntil; + public void ShowContact(Vector3 otherPosition, bool confirmed = false) + { ContactCandidate = !confirmed; _contactDirection = (otherPosition - transform.position).normalized; _contactUntil = confirmed ? Time.unscaledTime + .3f : 0; } + public void Pulse(float delay) => _pulseAt = Time.unscaledTime + delay; + public void ClearPulse() { _pulseAt = -1; _encourageUntil = 0; _contactUntil = 0; } public bool Selected { get; set; } public bool ContactCandidate { get; set; } public bool Hinted { get; set; } @@ -21,8 +30,24 @@ namespace MagnetismHeroes.UnityRuntime.Presentation private void Update() { float glow = Mathf.Clamp01((_encourageUntil - Time.unscaledTime) / 0.35f); + float pulse = _pulseAt < 0 ? 0 : Mathf.Clamp01(1 - (Time.unscaledTime - _pulseAt) / .3f); + if (Time.unscaledTime < _pulseAt) pulse = 0; var color = Selected ? new Color(1, 0.78f, 0.2f) : ContactCandidate ? new Color(0.5f, 1, 0.7f) : Hinted ? Color.Lerp(_normalColor, Color.white, .5f + .3f * Mathf.Sin(Time.unscaledTime * 4)) : _normalColor; - _colors.SetColor("_BaseColor", Color.Lerp(color, Color.white, glow * 0.7f)); _body.SetPropertyBlock(_colors); + _colors.SetColor("_BaseColor", Color.Lerp(color, Color.white, Mathf.Max(glow, pulse) * 0.7f)); _body.SetPropertyBlock(_colors); + if (_outline != null) + { + _outline.enabled = Selected; + _outline.startColor = _outline.endColor = new Color(1, .8f, .15f); + var camera = Camera.main; + if (camera != null) _outline.transform.rotation = camera.transform.rotation; + } + if (_contactRing != null) + { + _contactRing.enabled = ContactCandidate || Time.unscaledTime < _contactUntil; + _contactRing.transform.localPosition = _contactDirection * .48f; + if (_contactDirection.sqrMagnitude > 0) _contactRing.transform.rotation = Quaternion.LookRotation(_contactDirection); + _contactRing.startColor = _contactRing.endColor = new Color(.65f, 1, .85f, ContactCandidate ? .8f : Mathf.Clamp01((_contactUntil - Time.unscaledTime) / .3f)); + } } } } diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/BoardPresenter.cs b/Assets/MagnetismHeroes/UnityRuntime/Presentation/BoardPresenter.cs index abd8c18..aaa6be4 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/BoardPresenter.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/BoardPresenter.cs @@ -10,6 +10,7 @@ namespace MagnetismHeroes.UnityRuntime.Presentation [SerializeField] private BallView _ballPrefab; [SerializeField] private GroupBadge _badgePrefab; [SerializeField] private Camera _camera; + [SerializeField] private VoicePlayer _voice; private readonly Dictionary _balls = new Dictionary(); private readonly List _badges = new List(); private BoardRules _board; @@ -20,6 +21,10 @@ namespace MagnetismHeroes.UnityRuntime.Presentation public void Render(BoardRules board) { + bool transformed = board != null && _balls.Count == board.BallCount && _badges.Count != board.Groups.Length + && board.Balls.All(ball => _balls.ContainsKey(ball.id)); + var previous = _balls.Values.GroupBy(ball => ball.GroupId).ToDictionary(group => group.Key, group => group.Select(ball => ball.BallId).OrderBy(id => id).ToArray()); + var contacts = _balls.Values.Where(ball => ball.ContactCandidate).Select(ball => ball.BallId).ToArray(); _board = board; foreach (var view in _balls.Values) { view.gameObject.SetActive(false); Destroy(view.gameObject); } foreach (var badge in _badges) { badge.gameObject.SetActive(false); Destroy(badge.gameObject); } @@ -34,7 +39,19 @@ namespace MagnetismHeroes.UnityRuntime.Presentation var ball = Instantiate(_ballPrefab, ToVector(state.position), Quaternion.identity, transform); ball.Bind(ballId, group.id, board.CountedBallIds.Contains(ballId)); _balls.Add(ballId, ball); } - _badges.Add(Instantiate(_badgePrefab, transform)); + var badge = Instantiate(_badgePrefab, transform); _badges.Add(badge); + if (transformed && (!previous.TryGetValue(group.id, out var oldIds) || !oldIds.SequenceEqual(group.ballIds.OrderBy(id => id)))) + { + badge.React(); + var start = group.ballIds.FirstOrDefault(id => contacts.Contains(id)) ?? group.ballIds[0]; + var origin = _balls[start].transform.position; + foreach (var id in group.ballIds) _balls[id].Pulse(Mathf.Min(.2f, Vector3.Distance(origin, _balls[id].transform.position) * .035f)); + } + } + if (transformed && contacts.Length == 2) + { + _balls[contacts[0]].ShowContact(_balls[contacts[1]].transform.position, true); + _balls[contacts[1]].ShowContact(_balls[contacts[0]].transform.position, true); } PositionBadges(); } @@ -72,7 +89,7 @@ namespace MagnetismHeroes.UnityRuntime.Presentation if (distance < closest) { closest = distance; source = ball; target = other; } } MergeCandidate = target.GroupId; - source.ContactCandidate = target.ContactCandidate = true; + source.ShowContact(target.transform.position); target.ShowContact(source.transform.position); } PositionBadges(); } @@ -95,7 +112,8 @@ namespace MagnetismHeroes.UnityRuntime.Presentation { if (_board == null) return; MergeCandidate = null; DropDelta = Vector3.zero; - foreach (var state in _board.Balls) { _balls[state.id].transform.position = ToVector(state.position); _balls[state.id].ContactCandidate = false; } + foreach (var state in _board.Balls) { _balls[state.id].transform.position = ToVector(state.position); _balls[state.id].ContactCandidate = false; _balls[state.id].ClearPulse(); } + foreach (var badge in _badges) badge.ClearReaction(); PositionBadges(); } @@ -126,7 +144,7 @@ namespace MagnetismHeroes.UnityRuntime.Presentation for (int row = 0; row < 5; row++) for (int column = 0; column < 7; column++) { - var point = new Vector3((column - 3) * 1.2f, .8f + row * 1.2f, 0); + var point = new Vector3((column - 3) * 1.2f, .8f + row * 1.8f, 0); var viewport = _camera.WorldToViewportPoint(point); if (viewport.z <= 0 || viewport.x < .08f || viewport.x > .92f || viewport.y < .3f || viewport.y > .78f) continue; if (_board.Balls.Any(ball => Vector3.Distance(ToVector(ball.position), point) < 1.1f)) continue; @@ -140,6 +158,13 @@ namespace MagnetismHeroes.UnityRuntime.Presentation { if (_board == null) return; var groups = _board.Groups; + var labels = new List(); + var sphereRects = _balls.Values.Select(ball => + { + var point = _camera.WorldToViewportPoint(ball.transform.position); + var radius = _camera.WorldToViewportPoint(ball.transform.position + _camera.transform.up * .55f) - point; + return new Rect(point.x - Mathf.Abs(radius.y) / _camera.aspect, point.y - Mathf.Abs(radius.y), Mathf.Abs(radius.y) * 2 / _camera.aspect, Mathf.Abs(radius.y) * 2); + }).ToArray(); for (int index = 0; index < groups.Length; index++) { var group = groups[index]; @@ -148,7 +173,46 @@ namespace MagnetismHeroes.UnityRuntime.Presentation .OrderBy(point => Vector3.Dot(point - _camera.transform.position, _camera.transform.forward)).First(); // Place the number above the entire group's projected sphere bounds, including tilted views. float highest = group.ballIds.Max(id => Vector3.Dot(_balls[id].transform.position - center, _camera.transform.up)); - _badges[index].Bind(group.ballIds.Length, center + _camera.transform.up * (highest + 0.95f), + var number = _camera.WorldToViewportPoint(center + _camera.transform.up * (highest + .95f)); + var extent = _camera.WorldToViewportPoint(center + _camera.transform.up * (highest + .95f) + _camera.transform.right * .45f + _camera.transform.up * .3f) - number; + float width = Mathf.Abs(extent.x), height = Mathf.Abs(extent.y); + number.x = Mathf.Clamp(number.x, width + .02f, .98f - width); + number.y = Mathf.Clamp(number.y, height + .25f, .84f - height); + var original = number; + for (int attempt = 0; attempt < 25; attempt++) + { + if (attempt > 0) + { + int column = (attempt - 1) % 5; + float side = column == 0 ? 0 : column % 2 == 0 ? -column / 2 : (column + 1) / 2; + number.x = Mathf.Clamp(original.x + side * width * 2.1f, width + .02f, .98f - width); + number.y = Mathf.Clamp(original.y + (attempt - 1) / 5 * height * 2.1f, height + .25f, .84f - height); + } + var rect = new Rect(number.x - width, number.y - height, width * 2, height * 2); + bool occupied = labels.Any(label => label.Overlaps(rect)) || sphereRects.Any(sphere => sphere.Overlaps(rect)); + if (!occupied || attempt == 24) { labels.Add(rect); break; } + } + var members = group.ballIds.Select(id => _balls[id]).ToArray(); + int mood = members.Any(ball => ball.ContactCandidate) ? 1 : members.Any(ball => ball.Selected) ? 2 + : members.Any(ball => ball.Hinted) ? 4 : _voice != null && _voice.IsSpeaking ? (_voice.CurrentClipId?.StartsWith("count_") == true ? 3 : 4) : 0; + float look = 0; + if (mood == 1) + { + var friend = _balls.Values.FirstOrDefault(ball => ball.ContactCandidate && ball.GroupId != group.id); + if (friend != null) look = Mathf.Sign(Vector3.Dot(friend.transform.position - center, _camera.transform.right)); + } + else if (mood == 2) + { + var selectedCenter = members.Where(ball => ball.Selected).Select(ball => ball.transform.position).Aggregate(Vector3.zero, (sum, position) => sum + position) / members.Count(ball => ball.Selected); + look = Mathf.Sign(Vector3.Dot(selectedCenter - center, _camera.transform.right)); + } + else if (_badges[index].IsReacting && groups.Length > 1) + { + var friend = _balls.Values.Where(ball => ball.GroupId != group.id).OrderBy(ball => (ball.transform.position - center).sqrMagnitude).First(); + look = Mathf.Sign(Vector3.Dot(friend.transform.position - center, _camera.transform.right)); + } + _badges[index].Mood(mood, look); + _badges[index].Bind(group.ballIds.Length, _camera.ViewportToWorldPoint(number), representative - _camera.transform.forward * 0.49f); _badges[index].FaceCamera(_camera); } diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs new file mode 100644 index 0000000..2c8925d --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs @@ -0,0 +1,42 @@ +using UnityEngine; + +namespace MagnetismHeroes.UnityRuntime.Presentation +{ + public sealed class GameSound : MonoBehaviour + { + [SerializeField] private VoicePlayer _voice; + [SerializeField] private AudioSource _sfx; + [SerializeField] private AudioSource _music; + [SerializeField] private AudioClip _merge, _split, _count, _success; + [SerializeField] private AudioClip _pickup, _ui, _selection, _encourage, _supply, _hint; + [SerializeField] private AudioClip _garden, _cloud, _workshop, _menu; + private string _theme; + public void Merge() => Play(_merge); + public void Split() => Play(_split); + public void Count() => Play(_count); + public void Success() => Play(_success); + public void Pickup() => Play(_pickup); + public void UI() => Play(_ui); + public void Selection() => Play(_selection); + public void Encourage() => Play(_encourage); + public void Supply() => Play(_supply); + public void Hint() => Play(_hint); + private void Play(AudioClip clip) { if (clip != null) { Update(); _sfx.PlayOneShot(clip); } } + public void Theme(string theme) + { + _theme = theme; + var clip = theme == "Garden" ? _garden : theme == "Cloud" ? _cloud : theme == "Workshop" ? _workshop : theme == "Menu" ? _menu : null; + if (_music.clip == clip) return; + _music.Stop(); _music.clip = clip; + if (clip != null) _music.Play(); + } + public void Clear() { _sfx.Stop(); _music.Stop(); _music.clip = null; } + private void Update() + { + bool speech = _voice.IsSpeaking; + _sfx.volume = speech ? .12f : .5f; + _music.volume = speech ? .06f : .25f; + } + private void OnApplicationPause(bool paused) { if (paused) Clear(); else Theme(_theme); } + } +} diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs.meta new file mode 100644 index 0000000..ab31907 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GameSound.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bc5542de376f7a049a6f7d95a963cbe3 \ No newline at end of file diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/GroupBadge.cs b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GroupBadge.cs index a4ba685..5261250 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/GroupBadge.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/GroupBadge.cs @@ -8,9 +8,35 @@ namespace MagnetismHeroes.UnityRuntime.Presentation [SerializeField] private TMP_Text _number; [SerializeField] private Transform _face; [SerializeField] private Transform _cape; + [SerializeField] private SpriteRenderer _expression; + [SerializeField] private Sprite[] _expressions; + private float _celebrateUntil; + private Vector3 _facePosition; + private int _mood; + private float _look; + public bool IsReacting => _celebrateUntil > Time.unscaledTime; + public void React() => _celebrateUntil = Time.unscaledTime + .45f; + public void Mood(int expression, float look = 0) { _mood = expression; _look = look; } + public void ClearReaction() { _celebrateUntil = 0; _mood = 0; _look = 0; } public void Bind(int count, Vector3 numberPosition, Vector3 facePosition) - { _number.text = count.ToString(); _number.transform.position = numberPosition; _face.position = facePosition; if (_cape != null) _cape.position = facePosition; } + { + _number.text = count.ToString(); _number.transform.position = numberPosition; _facePosition = facePosition; + } public void FaceCamera(Camera camera) - { _number.transform.rotation = camera.transform.rotation; _face.rotation = camera.transform.rotation; if (_cape != null) _cape.rotation = camera.transform.rotation; } + { + float remaining = Mathf.Max(0, _celebrateUntil - Time.unscaledTime); + _number.transform.rotation = camera.transform.rotation; + _face.SetPositionAndRotation(_facePosition + camera.transform.up * (Mathf.Sin(remaining / .45f * Mathf.PI) * .025f), + camera.transform.rotation * Quaternion.Euler(0, 0, _look * 6 + Mathf.Sin(remaining * 18) * 3)); + if (_expression != null && _expressions != null && _expressions.Length == 6) + _expression.sprite = _expressions[remaining > 0 ? 5 : _mood]; + if (_cape != null) + { + _cape.SetPositionAndRotation(_facePosition + camera.transform.forward * .7f, camera.transform.rotation); + var ribbon = _cape.GetComponent(); + if (ribbon != null) for (int i = 0; i < ribbon.positionCount; i++) + ribbon.SetPosition(i, new Vector3((_look == 0 ? -1 : _look) * (.12f + i * .075f), .03f + i * .012f + Mathf.Sin(Time.unscaledTime * 4 - i * .4f) * .025f, .02f)); + } + } } } diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat new file mode 100644 index 0000000..3046d58 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LightRibbon + m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _EnableExternalAlpha: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat.meta new file mode 100644 index 0000000..9b14f65 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/LightRibbon.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf133a78ad4ad554d99dcacf7773fe92 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat new file mode 100644 index 0000000..4d868a0 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat @@ -0,0 +1,69 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NumberOutline + m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 5182643517425281782, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _FaceDilate: 0 + - _GradientScale: 6 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineWidth: 0.12 + - _PerspectiveFilter: 0.875 + - _ScaleRatioA: 0.8333333 + - _ScaleRatioB: 1 + - _ScaleRatioC: 0.6770833 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 1024 + - _TextureWidth: 1024 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat.meta new file mode 100644 index 0000000..6f43521 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Materials/NumberOutline.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbdd6fd98c127f64ab3fcf3aa7ea0d4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GameApp.prefab b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GameApp.prefab index 16f0e1b..920e531 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GameApp.prefab +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GameApp.prefab @@ -34,10 +34,10 @@ RectTransform: - {fileID: 4861987307563403518} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.27199998, y: 0.63699996} - m_AnchorMax: {x: 0.27199998, y: 0.63699996} + m_AnchorMin: {x: 0.198, y: 0.63699996} + m_AnchorMax: {x: 0.333, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2284867010239372280 CanvasRenderer: @@ -67,8 +67,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -161,6 +161,7 @@ RectTransform: - {fileID: 6752069098303160447} - {fileID: 482174253898310693} - {fileID: 5641995908256004067} + - {fileID: 8167077588137711273} m_Father: {fileID: 3999613752604275916} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -371,7 +372,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 46 + field of view: 62 orthographic: 0 orthographic size: 5 m_Depth: 0 @@ -429,10 +430,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4972173564979365133} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6200086042362978827 CanvasRenderer: @@ -566,10 +567,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8018088545351313719} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7869106297423009563 CanvasRenderer: @@ -738,8 +739,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -826,10 +827,10 @@ RectTransform: - {fileID: 3082603265635189929} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.88, y: 0.63699996} - m_AnchorMax: {x: 0.88, y: 0.63699996} + m_AnchorMin: {x: 0.81, y: 0.63699996} + m_AnchorMax: {x: 0.945, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4869350330851963300 CanvasRenderer: @@ -859,8 +860,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -947,10 +948,10 @@ RectTransform: - {fileID: 2052635450212887568} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.12, y: 0.76} - m_AnchorMax: {x: 0.12, y: 0.76} + m_AnchorMin: {x: 0.045, y: 0.76} + m_AnchorMax: {x: 0.18, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2598757375532357040 CanvasRenderer: @@ -980,8 +981,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1272,10 +1273,10 @@ RectTransform: - {fileID: 3937446583881611491} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.27199998, y: 0.26799998} - m_AnchorMax: {x: 0.27199998, y: 0.26799998} + m_AnchorMin: {x: 0.198, y: 0.26799998} + m_AnchorMax: {x: 0.333, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9192264677677800307 CanvasRenderer: @@ -1305,8 +1306,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1393,10 +1394,10 @@ RectTransform: - {fileID: 3056935839112680325} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.728, y: 0.39099997} - m_AnchorMax: {x: 0.728, y: 0.39099997} + m_AnchorMin: {x: 0.657, y: 0.39099997} + m_AnchorMax: {x: 0.792, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4325525268947939968 CanvasRenderer: @@ -1426,8 +1427,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1514,10 +1515,10 @@ RectTransform: - {fileID: 806870072021105225} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.88, y: 0.76} - m_AnchorMax: {x: 0.88, y: 0.76} + m_AnchorMin: {x: 0.81, y: 0.76} + m_AnchorMax: {x: 0.945, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8779039035966003753 CanvasRenderer: @@ -1547,8 +1548,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1772,10 +1773,10 @@ RectTransform: - {fileID: 5272245659247222639} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.88, y: 0.39099997} - m_AnchorMax: {x: 0.88, y: 0.39099997} + m_AnchorMin: {x: 0.81, y: 0.39099997} + m_AnchorMax: {x: 0.945, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1647986631343288635 CanvasRenderer: @@ -1805,8 +1806,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2167,10 +2168,10 @@ RectTransform: - {fileID: 5651594774981243508} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.27199998, y: 0.76} - m_AnchorMax: {x: 0.27199998, y: 0.76} + m_AnchorMin: {x: 0.198, y: 0.76} + m_AnchorMax: {x: 0.333, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1467687443961635546 CanvasRenderer: @@ -2200,8 +2201,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2380,10 +2381,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2650272815419196348} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6040077154455259841 CanvasRenderer: @@ -2519,10 +2520,10 @@ RectTransform: - {fileID: 3884292149611631230} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.728, y: 0.63699996} - m_AnchorMax: {x: 0.728, y: 0.63699996} + m_AnchorMin: {x: 0.657, y: 0.63699996} + m_AnchorMax: {x: 0.792, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2745278976557929422 CanvasRenderer: @@ -2552,8 +2553,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2681,6 +2682,143 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1693719044324196500 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8167077588137711273} + - component: {fileID: 288181597435012585} + - component: {fileID: 1925630848956518190} + m_Layer: 0 + m_Name: SpokenNumber + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8167077588137711273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693719044324196500} + 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: 2530971626885568150} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.76, y: 0.83} + m_AnchorMax: {x: 0.98, y: 0.83} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -8, y: 36} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &288181597435012585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693719044324196500} + m_CullTransparentMesh: 1 +--- !u!114 &1925630848956518190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1693719044324196500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} + m_sharedMaterial: {fileID: 8207275579423446409, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 0.12, g: 0.2, b: 0.31, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 23 + m_fontSizeBase: 23 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_characterHorizontalScale: 1 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656bu + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &1734378736986617752 GameObject: m_ObjectHideFlags: 0 @@ -2885,8 +3023,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2971,10 +3109,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5554941483290748880} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &121752679401465888 CanvasRenderer: @@ -3108,10 +3246,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3748556248004240337} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5235706665317938760 CanvasRenderer: @@ -3245,10 +3383,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4318053541809543516} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7309246323273382275 CanvasRenderer: @@ -3384,10 +3522,10 @@ RectTransform: - {fileID: 6888821532096274297} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.576, y: 0.514} - m_AnchorMax: {x: 0.576, y: 0.514} + m_AnchorMin: {x: 0.504, y: 0.514} + m_AnchorMax: {x: 0.639, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8646345486430033538 CanvasRenderer: @@ -3417,8 +3555,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3503,10 +3641,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1644050259989424895} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5230921641981557527 CanvasRenderer: @@ -3754,10 +3892,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 99580855532203736} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2476677823302005293 CanvasRenderer: @@ -3926,8 +4064,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4014,10 +4152,10 @@ RectTransform: - {fileID: 2677012166918854304} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.576, y: 0.39099997} - m_AnchorMax: {x: 0.576, y: 0.39099997} + m_AnchorMin: {x: 0.504, y: 0.39099997} + m_AnchorMax: {x: 0.639, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7695127445620955740 CanvasRenderer: @@ -4047,8 +4185,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4133,10 +4271,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7261942639449908891} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3265473052058850542 CanvasRenderer: @@ -4238,6 +4376,135 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2668269424094824679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5073791483586259823} + - component: {fileID: 8815470098496801412} + m_Layer: 0 + m_Name: Music + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5073791483586259823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668269424094824679} + serializedVersion: 2 + 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: 6696913924934804788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8815470098496801412 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2668269424094824679} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 7202041017813097757, guid: 65ecf35a597af1f4681307a83e447216, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &2845791329808327291 GameObject: m_ObjectHideFlags: 0 @@ -4270,10 +4537,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6275433672372650354} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7971849342611737192 CanvasRenderer: @@ -4409,6 +4676,135 @@ Transform: - {fileID: 5228686559394575828} m_Father: {fileID: 6696913924934804788} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2984760686804232918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2292538706069491479} + - component: {fileID: 4665247678321609232} + m_Layer: 0 + m_Name: SFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2292538706069491479 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2984760686804232918} + serializedVersion: 2 + 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: 6696913924934804788} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &4665247678321609232 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2984760686804232918} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3873177042007149833, guid: 65ecf35a597af1f4681307a83e447216, type: 2} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &3130945442339227461 GameObject: m_ObjectHideFlags: 0 @@ -4476,8 +4872,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4701,10 +5097,10 @@ RectTransform: - {fileID: 4183776194250623640} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.424, y: 0.63699996} - m_AnchorMax: {x: 0.424, y: 0.63699996} + m_AnchorMin: {x: 0.351, y: 0.63699996} + m_AnchorMax: {x: 0.486, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7987210566439415358 CanvasRenderer: @@ -4734,8 +5130,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4992,8 +5388,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5215,10 +5611,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 9092058175747983362} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8718261976109158229 CanvasRenderer: @@ -5354,10 +5750,10 @@ RectTransform: - {fileID: 4741893407617309367} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.88, y: 0.514} - m_AnchorMax: {x: 0.88, y: 0.514} + m_AnchorMin: {x: 0.81, y: 0.514} + m_AnchorMax: {x: 0.945, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8414747203156280658 CanvasRenderer: @@ -5387,8 +5783,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5473,10 +5869,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3721190786044460091} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &317394302030011888 CanvasRenderer: @@ -5610,10 +6006,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3317121214636871933} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8862093861367952199 CanvasRenderer: @@ -5749,10 +6145,10 @@ RectTransform: - {fileID: 4028243483738838528} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.576, y: 0.76} - m_AnchorMax: {x: 0.576, y: 0.76} + m_AnchorMin: {x: 0.504, y: 0.76} + m_AnchorMax: {x: 0.639, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8121664944672944380 CanvasRenderer: @@ -5782,8 +6178,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5870,10 +6266,10 @@ RectTransform: - {fileID: 3665870414206871344} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.576, y: 0.63699996} - m_AnchorMax: {x: 0.576, y: 0.63699996} + m_AnchorMin: {x: 0.504, y: 0.63699996} + m_AnchorMax: {x: 0.639, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4183137469589715249 CanvasRenderer: @@ -5903,8 +6299,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5989,10 +6385,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6801798374945474417} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2805102782635806544 CanvasRenderer: @@ -6126,10 +6522,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3047254456156033621} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1926011976995232548 CanvasRenderer: @@ -6263,10 +6659,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2530971626885568150} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.92} - m_AnchorMax: {x: 0.5, y: 0.92} + m_AnchorMin: {x: 0.21, y: 0.92} + m_AnchorMax: {x: 0.73, y: 0.92} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 580, y: 60} + m_SizeDelta: {x: -8, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6714095057695203204 CanvasRenderer: @@ -6323,8 +6719,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 - m_fontSizeBase: 34 + m_fontSize: 27 + m_fontSizeBase: 27 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6400,10 +6796,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 120332929247696903} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2622016489232974492 CanvasRenderer: @@ -6537,10 +6933,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7584964173604190614} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6032384133526668067 CanvasRenderer: @@ -6676,10 +7072,10 @@ RectTransform: - {fileID: 3776339595418115700} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.12, y: 0.39099997} - m_AnchorMax: {x: 0.12, y: 0.39099997} + m_AnchorMin: {x: 0.045, y: 0.39099997} + m_AnchorMax: {x: 0.18, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3990243081170480174 CanvasRenderer: @@ -6709,8 +7105,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6830,8 +7226,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -6951,8 +7347,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7039,10 +7435,10 @@ RectTransform: - {fileID: 6199407834004268792} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.27199998, y: 0.39099997} - m_AnchorMax: {x: 0.27199998, y: 0.39099997} + m_AnchorMin: {x: 0.198, y: 0.39099997} + m_AnchorMax: {x: 0.333, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4480135732519702010 CanvasRenderer: @@ -7072,8 +7468,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7158,10 +7554,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7868283166943063582} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7852319168900029567 CanvasRenderer: @@ -7297,10 +7693,10 @@ RectTransform: - {fileID: 5406268813008803579} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.12, y: 0.26799998} - m_AnchorMax: {x: 0.12, y: 0.26799998} + m_AnchorMin: {x: 0.045, y: 0.26799998} + m_AnchorMax: {x: 0.18, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6616767067548934940 CanvasRenderer: @@ -7330,8 +7726,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -7416,10 +7812,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5599384283595451030} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4160064883406464518 CanvasRenderer: @@ -7553,10 +7949,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2530971626885568150} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.83, y: 0.9} - m_AnchorMax: {x: 0.83, y: 0.9} + m_AnchorMin: {x: 0.76, y: 0.9} + m_AnchorMax: {x: 0.98, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 330, y: 70} + m_SizeDelta: {x: -8, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5264003365397956840 CanvasRenderer: @@ -7613,8 +8009,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 28 - m_fontSizeBase: 28 + m_fontSize: 27 + m_fontSizeBase: 27 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -7690,10 +8086,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3175831588793669166} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3114722601654218238 CanvasRenderer: @@ -7827,10 +8223,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2170829161204877356} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3821328226767185057 CanvasRenderer: @@ -8518,10 +8914,10 @@ RectTransform: - {fileID: 2525996182015148988} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.12, y: 0.514} - m_AnchorMax: {x: 0.12, y: 0.514} + m_AnchorMin: {x: 0.045, y: 0.514} + m_AnchorMax: {x: 0.18, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &480210366784634349 CanvasRenderer: @@ -8551,8 +8947,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -8637,10 +9033,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 4774970796337304695} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6106949052013768327 CanvasRenderer: @@ -8965,10 +9361,10 @@ RectTransform: - {fileID: 6606098022788254633} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.27199998, y: 0.514} - m_AnchorMax: {x: 0.27199998, y: 0.514} + m_AnchorMin: {x: 0.198, y: 0.514} + m_AnchorMax: {x: 0.333, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7194710245287410350 CanvasRenderer: @@ -8998,8 +9394,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9084,10 +9480,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 338084967022690499} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6762105503608367080 CanvasRenderer: @@ -9223,10 +9619,10 @@ RectTransform: - {fileID: 7070688164017043082} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.424, y: 0.39099997} - m_AnchorMax: {x: 0.424, y: 0.39099997} + m_AnchorMin: {x: 0.351, y: 0.39099997} + m_AnchorMax: {x: 0.486, y: 0.39099997} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5700028437621247569 CanvasRenderer: @@ -9256,8 +9652,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9357,6 +9753,7 @@ MonoBehaviour: _ballPrefab: {fileID: 1331864523212970899, guid: 91ae23d420859244686c2c654ab58bf3, type: 3} _badgePrefab: {fileID: 8586535435441923330, guid: f6475c2f7cafe4441a6f4706a3b2b6a4, type: 3} _camera: {fileID: 8434818049982702152} + _voice: {fileID: 2088648278553152470} --- !u!1 &6604949488282887358 GameObject: m_ObjectHideFlags: 0 @@ -9424,8 +9821,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9512,10 +9909,10 @@ RectTransform: - {fileID: 4021112491018537668} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.12, y: 0.63699996} - m_AnchorMax: {x: 0.12, y: 0.63699996} + m_AnchorMin: {x: 0.045, y: 0.63699996} + m_AnchorMax: {x: 0.18, y: 0.63699996} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9128390221467372908 CanvasRenderer: @@ -9545,8 +9942,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -9631,10 +10028,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1021559827210999060} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3155530795749616904 CanvasRenderer: @@ -9768,10 +10165,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6315301680679570723} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2292460924640125621 CanvasRenderer: @@ -9907,10 +10304,10 @@ RectTransform: - {fileID: 744825417964063961} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.424, y: 0.514} - m_AnchorMax: {x: 0.424, y: 0.514} + m_AnchorMin: {x: 0.351, y: 0.514} + m_AnchorMax: {x: 0.486, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4141776709643393490 CanvasRenderer: @@ -9940,8 +10337,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10198,8 +10595,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -10284,10 +10681,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6783351224580236927} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8812833345582172444 CanvasRenderer: @@ -10403,6 +10800,7 @@ GameObject: - component: {fileID: 4917121841105511015} - component: {fileID: 2088648278553152470} - component: {fileID: 2519286053323974898} + - component: {fileID: 881005500715213513} m_Layer: 0 m_Name: GameApp m_TagString: Untagged @@ -10428,6 +10826,8 @@ Transform: - {fileID: 2394383928275401077} - {fileID: 6026630794677494272} - {fileID: 4274269384354727046} + - {fileID: 2292538706069491479} + - {fileID: 5073791483586259823} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8606926694264994712 @@ -10499,6 +10899,7 @@ MonoBehaviour: _orbit: {fileID: 5074812012251702751} _input: {fileID: 4917121841105511015} _voice: {fileID: 2088648278553152470} + _sound: {fileID: 881005500715213513} _stageButtons: - {fileID: 227025040056778259} - {fileID: 4131456494785851528} @@ -10579,6 +10980,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: MagnetismHeroes.UnityRuntime::MagnetismHeroes.UnityRuntime.Presentation.VoicePlayer _source: {fileID: 2519286053323974898} + _spokenNumber: {fileID: 1925630848956518190} _clips: - id: count_01 clip: {fileID: 8300000, guid: 2a76c0490e02b424d9aedcf995d86978, type: 3} @@ -10765,6 +11167,35 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &881005500715213513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7158186905691569963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc5542de376f7a049a6f7d95a963cbe3, type: 3} + m_Name: + m_EditorClassIdentifier: MagnetismHeroes.UnityRuntime::MagnetismHeroes.UnityRuntime.Presentation.GameSound + _voice: {fileID: 2088648278553152470} + _sfx: {fileID: 4665247678321609232} + _music: {fileID: 8815470098496801412} + _merge: {fileID: 0} + _split: {fileID: 0} + _count: {fileID: 0} + _success: {fileID: 0} + _pickup: {fileID: 0} + _ui: {fileID: 0} + _selection: {fileID: 0} + _encourage: {fileID: 0} + _supply: {fileID: 0} + _hint: {fileID: 0} + _garden: {fileID: 0} + _cloud: {fileID: 0} + _workshop: {fileID: 0} + _menu: {fileID: 0} --- !u!1 &7296413544870818785 GameObject: m_ObjectHideFlags: 0 @@ -10797,10 +11228,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7844920969535547164} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &270765782763872041 CanvasRenderer: @@ -11071,10 +11502,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8743528872235970901} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5314129951817817128 CanvasRenderer: @@ -11210,10 +11641,10 @@ RectTransform: - {fileID: 6441825665327598314} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.728, y: 0.26799998} - m_AnchorMax: {x: 0.728, y: 0.26799998} + m_AnchorMin: {x: 0.657, y: 0.26799998} + m_AnchorMax: {x: 0.792, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7264423266629949228 CanvasRenderer: @@ -11243,8 +11674,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11329,10 +11760,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1654535146081430295} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1993125402981042389 CanvasRenderer: @@ -11468,10 +11899,10 @@ RectTransform: - {fileID: 2817714317890145631} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.424, y: 0.76} - m_AnchorMax: {x: 0.424, y: 0.76} + m_AnchorMin: {x: 0.351, y: 0.76} + m_AnchorMax: {x: 0.486, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3156921044368028644 CanvasRenderer: @@ -11501,8 +11932,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11589,10 +12020,10 @@ RectTransform: - {fileID: 7289926754438692250} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.576, y: 0.26799998} - m_AnchorMax: {x: 0.576, y: 0.26799998} + m_AnchorMin: {x: 0.504, y: 0.26799998} + m_AnchorMax: {x: 0.639, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5661872956316661220 CanvasRenderer: @@ -11622,8 +12053,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11710,10 +12141,10 @@ RectTransform: - {fileID: 1730980259476280386} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.728, y: 0.514} - m_AnchorMax: {x: 0.728, y: 0.514} + m_AnchorMin: {x: 0.657, y: 0.514} + m_AnchorMax: {x: 0.792, y: 0.514} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6742141392417712545 CanvasRenderer: @@ -11743,8 +12174,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -11829,10 +12260,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 521332221714108766} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3561614452703439067 CanvasRenderer: @@ -12081,10 +12512,10 @@ RectTransform: - {fileID: 7341694032355305135} m_Father: {fileID: 2530971626885568150} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.13, y: 0.9} - m_AnchorMax: {x: 0.13, y: 0.9} + m_AnchorMin: {x: 0.02, y: 0.9} + m_AnchorMax: {x: 0.18, y: 0.9} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 230, y: 72} + m_SizeDelta: {x: -8, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3643564687988233160 CanvasRenderer: @@ -12114,8 +12545,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -12200,10 +12631,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2782735119482303561} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 230, y: 72} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &726756523700695355 CanvasRenderer: @@ -12339,10 +12770,10 @@ RectTransform: - {fileID: 483726360220916135} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.728, y: 0.76} - m_AnchorMax: {x: 0.728, y: 0.76} + m_AnchorMin: {x: 0.657, y: 0.76} + m_AnchorMax: {x: 0.792, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &482061089485619428 CanvasRenderer: @@ -12372,8 +12803,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -12460,10 +12891,10 @@ RectTransform: - {fileID: 5068980044651401731} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.424, y: 0.26799998} - m_AnchorMax: {x: 0.424, y: 0.26799998} + m_AnchorMin: {x: 0.351, y: 0.26799998} + m_AnchorMax: {x: 0.486, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6179688322298926992 CanvasRenderer: @@ -12493,8 +12924,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -12684,10 +13115,10 @@ RectTransform: - {fileID: 9184769965713608864} m_Father: {fileID: 2361705476825752074} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.88, y: 0.26799998} - m_AnchorMax: {x: 0.88, y: 0.26799998} + m_AnchorMin: {x: 0.81, y: 0.26799998} + m_AnchorMax: {x: 0.945, y: 0.26799998} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 165, y: 66} + m_SizeDelta: {x: 0, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1229465679636427628 CanvasRenderer: @@ -12717,8 +13148,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GroupBadge.prefab b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GroupBadge.prefab index d055648..d014f22 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GroupBadge.prefab +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/GroupBadge.prefab @@ -58,7 +58,7 @@ LineRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: e6eb301d5baaa3b4dba3ce2228f17fa3, type: 2} + - {fileID: 2100000, guid: cf133a78ad4ad554d99dcacf7773fe92, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -86,9 +86,15 @@ LineRenderer: - {x: -0.55, y: -0.48, z: 0.6} - {x: -0.28, y: -0.7, z: 0.6} - {x: 0.1, y: -0.45, z: 0.6} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 0} m_Parameters: serializedVersion: 3 - widthMultiplier: 0.09 + widthMultiplier: 0.065 widthCurve: serializedVersion: 2 m_Curve: @@ -106,247 +112,8 @@ LineRenderer: m_RotationOrder: 4 colorGradient: serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 - numCornerVertices: 0 - numCapVertices: 0 - alignment: 0 - textureMode: 0 - textureScale: {x: 1, y: 1} - shadowBias: 0.5 - generateLightingData: 0 - m_UseWorldSpace: 0 - m_Loop: 0 - m_ApplyActiveColorSpace: 1 ---- !u!1 &249671451578993778 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 782296095116550680} - - component: {fileID: 7044309821208163747} - - component: {fileID: 1500535848956285383} - m_Layer: 0 - m_Name: LeftEye - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &782296095116550680 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249671451578993778} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.15, y: 0.05, z: 0} - m_LocalScale: {x: 0.08, y: 0.11, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1885524188671059666} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7044309821208163747 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249671451578993778} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1500535848956285383 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249671451578993778} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f625349e1f7edf249bc2f0006bde7ccf, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &3900389932875835401 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8665407476105022746} - - component: {fileID: 2229194056938340699} - m_Layer: 0 - m_Name: Smile - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8665407476105022746 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3900389932875835401} - serializedVersion: 2 - 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: 1885524188671059666} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!120 &2229194056938340699 -LineRenderer: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3900389932875835401} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 0 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f625349e1f7edf249bc2f0006bde7ccf, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Positions: - - {x: -0.14, y: -0.0812, z: 0} - - {x: -0.105000004, y: -0.106924996, z: 0} - - {x: -0.07, y: -0.1253, z: 0} - - {x: -0.035, y: -0.136325, z: 0} - - {x: 0, y: -0.14, z: 0} - - {x: 0.035, y: -0.136325, z: 0} - - {x: 0.07, y: -0.1253, z: 0} - - {x: 0.105000004, y: -0.106924996, z: 0} - - {x: 0.14, y: -0.0812, z: 0} - m_Parameters: - serializedVersion: 3 - widthMultiplier: 0.035 - widthCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - colorGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} + key0: {r: 0.101960786, g: 0.34901962, b: 0.8, a: 0.9019608} + key1: {r: 0.9019608, g: 0.14901961, b: 0.12156863, a: 0.4509804} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} @@ -392,6 +159,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1885524188671059666} + - component: {fileID: 1925119214726397857} m_Layer: 0 m_Name: RepresentativeFace m_TagString: Untagged @@ -409,14 +177,71 @@ Transform: serializedVersion: 2 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_LocalScale: {x: 0.9, y: 0.9, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 782296095116550680} - - {fileID: 9186485450251357337} - - {fileID: 8665407476105022746} + m_Children: [] m_Father: {fileID: 3444733339480260935} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1925119214726397857 +SpriteRenderer: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122023196935183107} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_MaskInteraction: 0 + m_Sprite: {fileID: 21300000, guid: 21f93be0d1b291341a50b8c34ab20ee6, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.065625, y: 0.8} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_SpriteSortPoint: 0 + m_BlendShapeWeights: [] --- !u!1 &7707652147950496847 GameObject: m_ObjectHideFlags: 0 @@ -467,6 +292,14 @@ MonoBehaviour: _number: {fileID: 7156837666543227830} _face: {fileID: 1885524188671059666} _cape: {fileID: 1940951101562305691} + _expression: {fileID: 1925119214726397857} + _expressions: + - {fileID: 21300000, guid: 21f93be0d1b291341a50b8c34ab20ee6, type: 2} + - {fileID: 21300000, guid: ed65f91c2b84d1b48af3b9b649be534b, type: 2} + - {fileID: 21300000, guid: 5d99a76c6c506bf47865ebbdd7ec4aec, type: 2} + - {fileID: 21300000, guid: 2f112b9fcdf5bbd459f0294c30ed4d7a, type: 2} + - {fileID: 21300000, guid: 3f90d96df36808c469e4a8c1b321e69d, type: 2} + - {fileID: 21300000, guid: b0c9d6c614b149a4598c2de453784ae9, type: 2} --- !u!1 &7995294815621610086 GameObject: m_ObjectHideFlags: 0 @@ -502,7 +335,7 @@ RectTransform: 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: 2, y: 0.7} + m_SizeDelta: {x: 1, y: 0.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &5962027146007004898 MeshRenderer: @@ -529,7 +362,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 8207275579423446409, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} + - {fileID: 2100000, guid: cbdd6fd98c127f64ab3fcf3aa7ea0d4d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -576,7 +409,7 @@ MonoBehaviour: m_text: 1 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} - m_sharedMaterial: {fileID: 8207275579423446409, guid: a5bc77ef7ce7c7e4d85ac578cfcd6646, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: cbdd6fd98c127f64ab3fcf3aa7ea0d4d, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -600,8 +433,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 5 - m_fontSizeBase: 5 + m_fontSize: 3.5 + m_fontSizeBase: 3.5 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -648,93 +481,3 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 5962027146007004898} m_maskType: 0 ---- !u!1 &8873238367880750306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9186485450251357337} - - component: {fileID: 1721263544024944440} - - component: {fileID: 4797747157284027217} - m_Layer: 0 - m_Name: RightEye - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &9186485450251357337 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873238367880750306} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.15, y: 0.05, z: 0} - m_LocalScale: {x: 0.08, y: 0.11, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1885524188671059666} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1721263544024944440 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873238367880750306} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4797747157284027217 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8873238367880750306} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: f625349e1f7edf249bc2f0006bde7ccf, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/MagnetFriend.prefab b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/MagnetFriend.prefab index aee96f6..1cdaed6 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/MagnetFriend.prefab +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Prefabs/MagnetFriend.prefab @@ -1,5 +1,357 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1093702104222138991 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3606440252080871530} + - component: {fileID: 6007570510072384754} + m_Layer: 0 + m_Name: LightOutline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3606440252080871530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093702104222138991} + serializedVersion: 2 + 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: 3913606793712318518} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &6007570510072384754 +LineRenderer: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093702104222138991} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cf133a78ad4ad554d99dcacf7773fe92, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Positions: + - {x: 0.51, y: 0, z: -0.08} + - {x: 0.50372106, y: 0.079781584, z: -0.08} + - {x: 0.48503882, y: 0.15759867, z: -0.08} + - {x: 0.45441332, y: 0.23153517, z: -0.08} + - {x: 0.41259867, y: 0.29977047, z: -0.08} + - {x: 0.36062443, y: 0.36062443, z: -0.08} + - {x: 0.29977047, y: 0.41259867, z: -0.08} + - {x: 0.23153517, y: 0.45441332, z: -0.08} + - {x: 0.15759866, y: 0.48503882, z: -0.08} + - {x: 0.079781525, y: 0.50372106, z: -0.08} + - {x: -0.000000022292808, y: 0.51, z: -0.08} + - {x: -0.07978157, y: 0.50372106, z: -0.08} + - {x: -0.15759869, y: 0.4850388, z: -0.08} + - {x: -0.23153521, y: 0.4544133, z: -0.08} + - {x: -0.29977044, y: 0.41259867, z: -0.08} + - {x: -0.36062443, y: 0.36062443, z: -0.08} + - {x: -0.4125987, y: 0.29977044, z: -0.08} + - {x: -0.45441335, y: 0.23153508, z: -0.08} + - {x: -0.48503885, y: 0.15759856, z: -0.08} + - {x: -0.50372106, y: 0.07978157, z: -0.08} + - {x: -0.51, y: -0.000000044585615, z: -0.08} + - {x: -0.503721, y: -0.07978165, z: -0.08} + - {x: -0.48503882, y: -0.15759866, z: -0.08} + - {x: -0.45441332, y: -0.23153518, z: -0.08} + - {x: -0.41259864, y: -0.29977053, z: -0.08} + - {x: -0.36062437, y: -0.3606245, z: -0.08} + - {x: -0.29977039, y: -0.41259873, z: -0.08} + - {x: -0.231535, y: -0.45441338, z: -0.08} + - {x: -0.15759872, y: -0.4850388, z: -0.08} + - {x: -0.07978161, y: -0.503721, z: -0.08} + - {x: 0.000000006081689, y: -0.51, z: -0.08} + - {x: 0.079781614, y: -0.503721, z: -0.08} + - {x: 0.15759873, y: -0.4850388, z: -0.08} + - {x: 0.23153524, y: -0.45441326, z: -0.08} + - {x: 0.2997706, y: -0.41259858, z: -0.08} + - {x: 0.36062458, y: -0.3606243, z: -0.08} + - {x: 0.4125988, y: -0.29977033, z: -0.08} + - {x: 0.45441332, y: -0.23153517, z: -0.08} + - {x: 0.48503882, y: -0.15759864, z: -0.08} + - {x: 0.50372106, y: -0.07978152, z: -0.08} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.035 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 0 + m_Loop: 1 + m_ApplyActiveColorSpace: 1 +--- !u!1 &3248910372933676750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5996117382726550629} + - component: {fileID: 4208836385555168953} + m_Layer: 0 + m_Name: ContactLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5996117382726550629 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248910372933676750} + serializedVersion: 2 + 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: 3913606793712318518} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &4208836385555168953 +LineRenderer: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3248910372933676750} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cf133a78ad4ad554d99dcacf7773fe92, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_Positions: + - {x: 0.19, y: 0, z: 0} + - {x: 0.1863492, y: 0.03706716, z: 0} + - {x: 0.17553711, y: 0.07270986, z: 0} + - {x: 0.15797922, y: 0.10555834, z: 0} + - {x: 0.13435028, y: 0.13435028, z: 0} + - {x: 0.105558336, y: 0.15797924, z: 0} + - {x: 0.07270985, y: 0.17553711, z: 0} + - {x: 0.037067145, y: 0.18634921, z: 0} + - {x: -0.000000008305164, y: 0.19, z: 0} + - {x: -0.03706716, y: 0.1863492, z: 0} + - {x: -0.072709866, y: 0.17553711, z: 0} + - {x: -0.105558366, y: 0.1579792, z: 0} + - {x: -0.13435028, y: 0.13435028, z: 0} + - {x: -0.15797924, y: 0.105558336, z: 0} + - {x: -0.17553712, y: 0.07270982, z: 0} + - {x: -0.18634921, y: 0.03706716, z: 0} + - {x: -0.19, y: -0.000000016610327, z: 0} + - {x: -0.1863492, y: -0.037067194, z: 0} + - {x: -0.17553711, y: -0.07270985, z: 0} + - {x: -0.1579792, y: -0.10555836, z: 0} + - {x: -0.13435026, y: -0.1343503, z: 0} + - {x: -0.1055583, y: -0.15797925, z: 0} + - {x: -0.07270979, y: -0.17553714, z: 0} + - {x: -0.03706717, y: -0.1863492, z: 0} + - {x: 0.0000000022657274, y: -0.19, z: 0} + - {x: 0.03706718, y: -0.1863492, z: 0} + - {x: 0.07270988, y: -0.1755371, z: 0} + - {x: 0.10555838, y: -0.1579792, z: 0} + - {x: 0.13435033, y: -0.13435024, z: 0} + - {x: 0.15797922, y: -0.10555836, z: 0} + - {x: 0.17553711, y: -0.07270985, z: 0} + - {x: 0.18634921, y: -0.037067145, z: 0} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.035 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + textureScale: {x: 1, y: 1} + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 0 + m_Loop: 1 + m_ApplyActiveColorSpace: 1 --- !u!1 &3730473297310058759 GameObject: m_ObjectHideFlags: 0 @@ -124,6 +476,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4419960402240753643} + - {fileID: 3606440252080871530} + - {fileID: 5996117382726550629} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3708566260475808937 @@ -218,3 +572,5 @@ MonoBehaviour: m_EditorClassIdentifier: MagnetismHeroes.UnityRuntime::MagnetismHeroes.UnityRuntime.Presentation.BallView _body: {fileID: 4902335425252088244} _countMarker: {fileID: 3730473297310058759} + _outline: {fileID: 6007570510072384754} + _contactRing: {fileID: 4208836385555168953} diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites.meta new file mode 100644 index 0000000..441f203 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 288740df6e234394ca99df00d8ce899b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset new file mode 100644 index 0000000..293b6a1 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Neutral + m_Rect: + serializedVersion: 2 + x: 0 + y: 512 + width: 682 + height: 512 + m_Offset: {x: 0, y: 0} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.5} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + 21f93be0d1b291341a50b8c34ab20ee6: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 0 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 341, z: 640, w: 768} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 0 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 341, z: 640, w: 768} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset.meta new file mode 100644 index 0000000..e9fccc1 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face0.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21f93be0d1b291341a50b8c34ab20ee6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset new file mode 100644 index 0000000..d9ecf8b --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Interested + m_Rect: + serializedVersion: 2 + x: 682 + y: 512 + width: 682 + height: 512 + m_Offset: {x: 0, y: 0} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.5} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + ed65f91c2b84d1b48af3b9b649be534b: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 682 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1023, z: 640, w: 768} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 682 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1023, z: 640, w: 768} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset.meta new file mode 100644 index 0000000..cb19910 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed65f91c2b84d1b48af3b9b649be534b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset new file mode 100644 index 0000000..0abfa79 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Focused + m_Rect: + serializedVersion: 2 + x: 1365 + y: 512 + width: 682 + height: 512 + m_Offset: {x: 0, y: 0} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.5} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + 5d99a76c6c506bf47865ebbdd7ec4aec: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 1365 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1706, z: 640, w: 768} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bfcdcccc3e000000006666083fcdcccc3e00000000666608bfcdccccbe000000006666083fcdccccbe000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 1365 + y: 512 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1706, z: 640, w: 768} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset.meta new file mode 100644 index 0000000..1097625 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d99a76c6c506bf47865ebbdd7ec4aec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset new file mode 100644 index 0000000..5bfe489 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Laughing + m_Rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 682 + height: 512 + m_Offset: {x: 0, y: 92.16} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.68} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + 2f112b9fcdf5bbd459f0294c30ed4d7a: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 341, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 341, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset.meta new file mode 100644 index 0000000..ab216f9 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f112b9fcdf5bbd459f0294c30ed4d7a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset new file mode 100644 index 0000000..edd1d67 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Encouraging + m_Rect: + serializedVersion: 2 + x: 682 + y: 0 + width: 682 + height: 512 + m_Offset: {x: 0, y: 92.16} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.68} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + 3f90d96df36808c469e4a8c1b321e69d: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 682 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1023, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 682 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1023, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset.meta new file mode 100644 index 0000000..1639942 --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f90d96df36808c469e4a8c1b321e69d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset new file mode 100644 index 0000000..392bb3b --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset @@ -0,0 +1,222 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!213 &21300000 +Sprite: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Celebrating + m_Rect: + serializedVersion: 2 + x: 1365 + y: 0 + width: 682 + height: 512 + m_Offset: {x: 0, y: 92.16} + m_Border: {x: 0, y: 0, z: 0, w: 0} + m_PixelsToUnits: 640 + m_Pivot: {x: 0.5, y: 0.68} + m_Extrude: 0 + m_PackingTag: + m_RenderDataKey: + b0c9d6c614b149a4598c2de453784ae9: 21300000 + m_AtlasTags: [] + m_SpriteAtlas: {fileID: 0} + m_RD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 1365 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1706, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_AtlasRD: + serializedVersion: 4 + texture: {fileID: 2800000, guid: a591055d8ec53524980d17d8ae176d14, type: 3} + alphaTexture: {fileID: 0} + secondaryTextures: [] + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 6 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 4 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_IndexBuffer: 000001000200020001000300y + m_VertexData: + serializedVersion: 3 + m_VertexCount: 4 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 1 + offset: 0 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 80 + _typelessdata: 666608bf6e12833e000000006666083f6e12833e00000000666608bf96430bbf000000006666083f96430bbf000000000000000000000000000000000000000000000000000000000000000000000000 + m_Bindpose: [] + m_BlendShapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + textureRect: + serializedVersion: 2 + x: 1365 + y: 0 + width: 682 + height: 512 + textureRectOffset: {x: 0, y: 0} + atlasRectOffset: {x: -1, y: -1} + settingsRaw: 3072 + uvTransform: {x: 640, y: 1706, z: 640, w: 348.16} + downscaleMultiplier: 1 + m_PhysicsShape: [] + m_Bones: [] + m_ScriptableObjects: [] + m_SpriteID: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset.meta new file mode 100644 index 0000000..fbc9bcd --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Sprites/Face5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0c9d6c614b149a4598c2de453784ae9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 21300000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures.meta new file mode 100644 index 0000000..77381ad --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ac65616eddf5cb4f8a701297e6ba336 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png new file mode 100644 index 0000000..af77cd0 Binary files /dev/null and b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png differ diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png.meta b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png.meta new file mode 100644 index 0000000..fbc4d1f --- /dev/null +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png.meta @@ -0,0 +1,158 @@ +fileFormatVersion: 2 +guid: a591055d8ec53524980d17d8ae176d14 +TextureImporter: + internalIDToNameTable: [] + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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 + spriteTessellationMethod: 0 + spriteTessellationDetail: -1 + spriteGeometrySubdivision: -1 + textureType: 0 + 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: 0 + 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 + - serializedVersion: 4 + 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 + - 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 + - serializedVersion: 4 + buildTarget: iOS + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MagnetismHeroes/UnityRuntime/Presentation/VoicePlayer.cs b/Assets/MagnetismHeroes/UnityRuntime/Presentation/VoicePlayer.cs index a339fa2..338b0ff 100644 --- a/Assets/MagnetismHeroes/UnityRuntime/Presentation/VoicePlayer.cs +++ b/Assets/MagnetismHeroes/UnityRuntime/Presentation/VoicePlayer.cs @@ -9,11 +9,13 @@ namespace MagnetismHeroes.UnityRuntime.Presentation public sealed class VoicePlayer : MonoBehaviour { [SerializeField] private AudioSource _source; + [SerializeField] private TMPro.TMP_Text _spokenNumber; [SerializeField] private VoiceClip[] _clips = Array.Empty(); private readonly Queue _counts = new Queue(); private AudioClip _guide; private bool _playingCount; public int PendingCount => _counts.Count + (_playingCount ? 1 : 0); + public bool IsSpeaking => _source.isPlaying || PendingCount > 0; public string CurrentClipId => _source.clip == null ? null : _source.clip.name; public void EnqueueCount(int count) @@ -28,16 +30,23 @@ namespace MagnetismHeroes.UnityRuntime.Presentation public void Guide(string id) { _guide = Find(id); if (!_playingCount) { _source.Stop(); Advance(); } } public void Clear() - { _counts.Clear(); _guide = null; _playingCount = false; _source.Stop(); _source.clip = null; } + { _counts.Clear(); _guide = null; _playingCount = false; _source.Stop(); _source.clip = null; SyncSpokenNumber(); } public void CancelGuide() - { _guide = null; if (!_playingCount) { _source.Stop(); _source.clip = null; } } + { _guide = null; if (!_playingCount) { _source.Stop(); _source.clip = null; } SyncSpokenNumber(); } private AudioClip Find(string id) { foreach (var voice in _clips) if (voice.id == id) return voice.clip; return null; } private void Advance() { - if (_source.isPlaying) return; + if (_source.isPlaying) { SyncSpokenNumber(); return; } _playingCount = false; if (_counts.Count > 0) { _source.clip = _counts.Dequeue(); _playingCount = true; _source.Play(); } else if (_guide != null) { _source.clip = _guide; _guide = null; _source.Play(); } + SyncSpokenNumber(); + } + private void SyncSpokenNumber() + { + if (_spokenNumber == null) return; + _spokenNumber.text = _source.isPlaying && _source.clip != null && _source.clip.name.StartsWith("count_") + && int.TryParse(_source.clip.name.Substring(6), out int number) ? $"숫자 {number}" : ""; } private void Update() => Advance(); private void OnApplicationPause(bool paused) { if (paused) Clear(); } diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta new file mode 100644 index 0000000..aafbe68 --- /dev/null +++ b/Assets/StreamingAssets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 564f7607c47f6c04584b74ec47cccf68 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Notices.meta b/Assets/StreamingAssets/Notices.meta new file mode 100644 index 0000000..96eae30 --- /dev/null +++ b/Assets/StreamingAssets/Notices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cfcaaa7df335af345a2184888788ecf7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt b/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt new file mode 100644 index 0000000..d952d62 --- /dev/null +++ b/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt.meta b/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt.meta new file mode 100644 index 0000000..8c24ae2 --- /dev/null +++ b/Assets/StreamingAssets/Notices/NotoSansCJK-OFL.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff6708bd19804a740950631caa66d9d4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt b/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt new file mode 100644 index 0000000..c347eb5 --- /dev/null +++ b/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2026 Alibaba Cloud + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt.meta b/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt.meta new file mode 100644 index 0000000..f7bb035 --- /dev/null +++ b/Assets/StreamingAssets/Notices/Qwen3-TTS-Apache-2.0.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dc79d129840db2341a685cc4bc179cf4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt b/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt new file mode 100644 index 0000000..7fbce7d --- /dev/null +++ b/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt @@ -0,0 +1,1316 @@ +--- +license: apache-2.0 +pipeline_tag: text-to-speech +--- + +# Qwen3-TTS + +## Overview +### Introduction + +

+ +

+ +Qwen3-TTS covers 10 major languages (Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, and Italian) as well as multiple dialectal voice profiles to meet global application needs. In addition, the models feature strong contextual understanding, enabling adaptive control of tone, speaking rate, and emotional expression based on instructions and text semantics, and they show markedly improved robustness to noisy input text. Key features: + +* **Powerful Speech Representation**: Powered by the self-developed Qwen3-TTS-Tokenizer-12Hz, it achieves efficient acoustic compression and high-dimensional semantic modeling of speech signals. It fully preserves paralinguistic information and acoustic environmental features, enabling high-speed, high-fidelity speech reconstruction through a lightweight non-DiT architecture. +* **Universal End-to-End Architecture**: Utilizing a discrete multi-codebook LM architecture, it realizes full-information end-to-end speech modeling. This completely bypasses the information bottlenecks and cascading errors inherent in traditional LM+DiT schemes, significantly enhancing the model’s versatility, generation efficiency, and performance ceiling. +* **Extreme Low-Latency Streaming Generation**: Based on the innovative Dual-Track hybrid streaming generation architecture, a single model supports both streaming and non-streaming generation. It can output the first audio packet immediately after a single character is input, with end-to-end synthesis latency as low as 97ms, meeting the rigorous demands of real-time interactive scenarios. +* **Intelligent Text Understanding and Voice Control**: Supports speech generation driven by natural language instructions, allowing for flexible control over multi-dimensional acoustic attributes such as timbre, emotion, and prosody. By deeply integrating text semantic understanding, the model adaptively adjusts tone, rhythm, and emotional expression, achieving lifelike “what you imagine is what you hear” output. + + +### Model Architecture + +

+ +

+ +### Released Models Description and Download + +Below is an introduction and download information for the Qwen3-TTS models that have already been released. Other models mentioned in the technical report will be released in the near future. Please select and download the model that fits your needs. + +| Tokenizer Name | Description | +|---------------------------------|-------------| +| Qwen3-TTS-Tokenizer-12Hz | The Qwen3-TTS-Tokenizer-12Hz model which can encode the input speech into codes and decode them back into speech. | + + +| Model | Features | Language Support | Streaming | Instruction Control | +|---|---|---|---|---| +| Qwen3-TTS-12Hz-1.7B-VoiceDesign | Performs voice design based on user-provided descriptions. | Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, Italian | ✅ | ✅ | +| Qwen3-TTS-12Hz-1.7B-CustomVoice | Provides style control over target timbres via user instructions; supports 9 premium timbres covering various combinations of gender, age, language, and dialect. | Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, Italian | ✅ | ✅ | +| Qwen3-TTS-12Hz-1.7B-Base | Base model capable of 3-second rapid voice clone from user audio input; can be used for fine-tuning (FT) other models. | Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, Italian | ✅ | | +| Qwen3-TTS-12Hz-0.6B-CustomVoice | Supports 9 premium timbres covering various combinations of gender, age, language, and dialect. | Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, Italian | ✅ | | +| Qwen3-TTS-12Hz-0.6B-Base | Base model capable of 3-second rapid voice clone from user audio input; can be used for fine-tuning (FT) other models. | Chinese, English, Japanese, Korean, German, French, Russian, Portuguese, Spanish, Italian | ✅ | | + +During model loading in the qwen-tts package or vLLM, model weights will be automatically downloaded based on the model name. However, if your runtime environment is not conducive to downloading weights during execution, you can refer to the following commands to manually download the model weights to a local directory: + +```bash +# Download through ModelScope (recommended for users in Mainland China) +pip install -U modelscope +modelscope download --model Qwen/Qwen3-TTS-Tokenizer-12Hz --local_dir ./Qwen3-TTS-Tokenizer-12Hz +modelscope download --model Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice --local_dir ./Qwen3-TTS-12Hz-1.7B-CustomVoice +modelscope download --model Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign --local_dir ./Qwen3-TTS-12Hz-1.7B-VoiceDesign +modelscope download --model Qwen/Qwen3-TTS-12Hz-1.7B-Base --local_dir ./Qwen3-TTS-12Hz-1.7B-Base +modelscope download --model Qwen/Qwen3-TTS-12Hz-0.6B-CustomVoice --local_dir ./Qwen3-TTS-12Hz-0.6B-CustomVoice +modelscope download --model Qwen/Qwen3-TTS-12Hz-0.6B-Base --local_dir ./Qwen3-TTS-12Hz-0.6B-Base + +# Download through Hugging Face +pip install -U "huggingface_hub[cli]" +huggingface-cli download Qwen/Qwen3-TTS-Tokenizer-12Hz --local-dir ./Qwen3-TTS-Tokenizer-12Hz +huggingface-cli download Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice --local-dir ./Qwen3-TTS-12Hz-1.7B-CustomVoice +huggingface-cli download Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign --local-dir ./Qwen3-TTS-12Hz-1.7B-VoiceDesign +huggingface-cli download Qwen/Qwen3-TTS-12Hz-1.7B-Base --local-dir ./Qwen3-TTS-12Hz-1.7B-Base +huggingface-cli download Qwen/Qwen3-TTS-12Hz-0.6B-CustomVoice --local-dir ./Qwen3-TTS-12Hz-0.6B-CustomVoice +huggingface-cli download Qwen/Qwen3-TTS-12Hz-0.6B-Base --local-dir ./Qwen3-TTS-12Hz-0.6B-Base +``` + + +## Quickstart + +### Environment Setup + +The easiest way to quickly use Qwen3-TTS is to install the `qwen-tts` Python package from PyPI. This will pull in the required runtime dependencies and allow you to load any released Qwen3-TTS model. We recommend using a **fresh, isolated environment** to avoid dependency conflicts with existing packages. You can create a clean Python 3.12 environment like this: + +```bash +conda create -n qwen3-tts python=3.12 -y +conda activate qwen3-tts +``` + +then run: + +```bash +pip install -U qwen-tts +``` + +If you want to develop or modify the code locally, install from source in editable mode. + +```bash +git clone https://github.com/QwenLM/Qwen3-TTS.git +cd Qwen3-TTS +pip install -e . +``` + +Additionally, we recommend using FlashAttention 2 to reduce GPU memory usage. + +```bash +pip install -U flash-attn --no-build-isolation +``` + +If your machine has less than 96GB of RAM and lots of CPU cores, run: + +```bash +MAX_JOBS=4 pip install -U flash-attn --no-build-isolation +``` + +Also, you should have hardware that is compatible with FlashAttention 2. Read more about it in the official documentation of the [FlashAttention repository](https://github.com/Dao-AILab/flash-attention). FlashAttention 2 can only be used when a model is loaded in `torch.float16` or `torch.bfloat16`. + + +### Python Package Usage + +After installation, you can import `Qwen3TTSModel` to run custom voice TTS, voice design, and voice clone. The model weights can be specified either as a Hugging Face model id (recommended) or as a local directory path you downloaded. For all the `generate_*` functions below, besides the parameters shown and explicitly documented, you can also pass generation kwargs supported by Hugging Face Transformers `model.generate`, e.g., `max_new_tokens`, `top_p`, etc. + +#### Custom Voice Generate + +For custom voice models (`Qwen3-TTS-12Hz-1.7B/0.6B-CustomVoice`), you just need to call `generate_custom_voice`, passing a single string or a batch list, along with `language`, `speaker`, and optional `instruct`. You can also call `model.get_supported_speakers()` and `model.get_supported_languages()` to see which speakers and languages the current model supports. + +```python +import torch +import soundfile as sf +from qwen_tts import Qwen3TTSModel + +model = Qwen3TTSModel.from_pretrained( + "Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice", + device_map="cuda:0", + dtype=torch.bfloat16, + attn_implementation="flash_attention_2", +) + +# single inference +wavs, sr = model.generate_custom_voice( + text="其实我真的有发现，我是一个特别善于观察别人情绪的人。", + language="Chinese", # Pass `Auto` (or omit) for auto language adaptive; if the target language is known, set it explicitly. + speaker="Vivian", + instruct="用特别愤怒的语气说", # Omit if not needed. +) +sf.write("output_custom_voice.wav", wavs[0], sr) + +# batch inference +wavs, sr = model.generate_custom_voice( + text=[ + "其实我真的有发现，我是一个特别善于观察别人情绪的人。", + "She said she would be here by noon." + ], + language=["Chinese", "English"], + speaker=["Vivian", "Ryan"], + instruct=["", "Very happy."] +) +sf.write("output_custom_voice_1.wav", wavs[0], sr) +sf.write("output_custom_voice_2.wav", wavs[1], sr) +``` + +For `Qwen3-TTS-12Hz-1.7B/0.6B-CustomVoice` models, the supported speaker list and speaker descriptions are provided below. We recommend using each speaker’s native language for the best quality. Of course, each speaker can speak any language supported by the model. + +| Speaker | Voice Description | Native language | +| --- | --- | --- | +| Vivian | Bright, slightly edgy young female voice. | Chinese | +| Serena | Warm, gentle young female voice. | Chinese | +| Uncle_Fu | Seasoned male voice with a low, mellow timbre. | Chinese | +| Dylan | Youthful Beijing male voice with a clear, natural timbre. | Chinese (Beijing Dialect) | +| Eric | Lively Chengdu male voice with a slightly husky brightness. | Chinese (Sichuan Dialect) | +| Ryan | Dynamic male voice with strong rhythmic drive. | English | +| Aiden | Sunny American male voice with a clear midrange. | English | +| Ono_Anna | Playful Japanese female voice with a light, nimble timbre. | Japanese | +| Sohee | Warm Korean female voice with rich emotion. | Korean | + +#### Voice Design + +For the voice design model (`Qwen3-TTS-12Hz-1.7B-VoiceDesign`), you can use `generate_voice_design` to provide the target text and a natural-language `instruct` description. + +```python +import torch +import soundfile as sf +from qwen_tts import Qwen3TTSModel + +model = Qwen3TTSModel.from_pretrained( + "Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign", + device_map="cuda:0", + dtype=torch.bfloat16, + attn_implementation="flash_attention_2", +) + +# single inference +wavs, sr = model.generate_voice_design( + text="哥哥，你回来啦，人家等了你好久好久了，要抱抱！", + language="Chinese", + instruct="体现撒娇稚嫩的萝莉女声，音调偏高且起伏明显，营造出黏人、做作又刻意卖萌的听觉效果。", +) +sf.write("output_voice_design.wav", wavs[0], sr) + +# batch inference +wavs, sr = model.generate_voice_design( + text=[ + "哥哥，你回来啦，人家等了你好久好久了，要抱抱！", + "It's in the top drawer... wait, it's empty? No way, that's impossible! I'm sure I put it there!" + ], + language=["Chinese", "English"], + instruct=[ + "体现撒娇稚嫩的萝莉女声，音调偏高且起伏明显，营造出黏人、做作又刻意卖萌的听觉效果。", + "Speak in an incredulous tone, but with a hint of panic beginning to creep into your voice." + ] +) +sf.write("output_voice_design_1.wav", wavs[0], sr) +sf.write("output_voice_design_2.wav", wavs[1], sr) +``` + +#### Voice Clone + +For the voice clone model (`Qwen3-TTS-12Hz-1.7B/0.6B-Base`), to clone a voice and synthesize new content, you just need to provide a reference audio clip (`ref_audio`) along with its transcript (`ref_text`). `ref_audio` can be a local file path, a URL, a base64 string, or a `(numpy_array, sample_rate)` tuple. If you set `x_vector_only_mode=True`, only the speaker embedding is used so `ref_text` is not required, but cloning quality may be reduced. + +```python +import torch +import soundfile as sf +from qwen_tts import Qwen3TTSModel + +model = Qwen3TTSModel.from_pretrained( + "Qwen/Qwen3-TTS-12Hz-1.7B-Base", + device_map="cuda:0", + dtype=torch.bfloat16, + attn_implementation="flash_attention_2", +) + +ref_audio = "https://qianwen-res.oss-cn-beijing.aliyuncs.com/Qwen3-TTS-Repo/clone.wav" +ref_text = "Okay. Yeah. I resent you. I love you. I respect you. But you know what? You blew it! And thanks to you." + +wavs, sr = model.generate_voice_clone( + text="I am solving the equation: x = [-b ± √(b²-4ac)] / 2a? Nobody can — it's a disaster (◍•͈⌔•͈◍), very sad!", + language="English", + ref_audio=ref_audio, + ref_text=ref_text, +) +sf.write("output_voice_clone.wav", wavs[0], sr) +``` + +If you need to reuse the same reference prompt across multiple generations (to avoid recomputing prompt features), build it once with `create_voice_clone_prompt` and pass it via `voice_clone_prompt`. + +```python +prompt_items = model.create_voice_clone_prompt( + ref_audio=ref_audio, + ref_text=ref_text, + x_vector_only_mode=False, +) +wavs, sr = model.generate_voice_clone( + text=["Sentence A.", "Sentence B."], + language=["English", "English"], + voice_clone_prompt=prompt_items, +) +sf.write("output_voice_clone_1.wav", wavs[0], sr) +sf.write("output_voice_clone_2.wav", wavs[1], sr) +``` + +For more examples of reusable voice clone prompts, batch cloning, and batch inference, please refer to the [example codes](https://github.com/QwenLM/Qwen3-TTS/blob/main/examples/test_model_12hz_base.py). With those examples and the `generate_voice_clone` function description, you can explore more advanced usage patterns. + +#### Voice Design then Clone + +If you want a designed voice that you can reuse like a cloned speaker, a practical workflow is: (1) use the **VoiceDesign** model to synthesize a short reference clip that matches your target persona, (2) feed that clip into `create_voice_clone_prompt` to build a reusable prompt, and then (3) call `generate_voice_clone` with `voice_clone_prompt` to generate new content without re-extracting features every time. This is especially useful when you want a consistent character voice across many lines. + +```python +import torch +import soundfile as sf +from qwen_tts import Qwen3TTSModel + +# create a reference audio in the target style using the VoiceDesign model +design_model = Qwen3TTSModel.from_pretrained( + "Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign", + device_map="cuda:0", + dtype=torch.bfloat16, + attn_implementation="flash_attention_2", +) + +ref_text = "H-hey! You dropped your... uh... calculus notebook? I mean, I think it's yours? Maybe?" +ref_instruct = "Male, 17 years old, tenor range, gaining confidence - deeper breath support now, though vowels still tighten when nervous" +ref_wavs, sr = design_model.generate_voice_design( + text=ref_text, + language="English", + instruct=ref_instruct +) +sf.write("voice_design_reference.wav", ref_wavs[0], sr) + +# build a reusable clone prompt from the voice design reference +clone_model = Qwen3TTSModel.from_pretrained( + "Qwen/Qwen3-TTS-12Hz-1.7B-Base", + device_map="cuda:0", + dtype=torch.bfloat16, + attn_implementation="flash_attention_2", +) + +voice_clone_prompt = clone_model.create_voice_clone_prompt( + ref_audio=(ref_wavs[0], sr), # or "voice_design_reference.wav" + ref_text=ref_text, +) + +sentences = [ + "No problem! I actually... kinda finished those already? If you want to compare answers or something...", + "What? No! I mean yes but not like... I just think you're... your titration technique is really precise!", +] + +# reuse it for multiple single calls +wavs, sr = clone_model.generate_voice_clone( + text=sentences[0], + language="English", + voice_clone_prompt=voice_clone_prompt, +) +sf.write("clone_single_1.wav", wavs[0], sr) + +wavs, sr = clone_model.generate_voice_clone( + text=sentences[1], + language="English", + voice_clone_prompt=voice_clone_prompt, +) +sf.write("clone_single_2.wav", wavs[0], sr) + +# or batch generate in one call +wavs, sr = clone_model.generate_voice_clone( + text=sentences, + language=["English", "English"], + voice_clone_prompt=voice_clone_prompt, +) +for i, w in enumerate(wavs): + sf.write(f"clone_batch_{i}.wav", w, sr) +``` + +#### Tokenizer Encode and Decode + +If you only want to encode and decode audio for transport or training and so on, `Qwen3TTSTokenizer` supports encode/decode with paths, URLs, numpy waveforms, and dict/list payloads, for example: + +```python +import soundfile as sf +from qwen_tts import Qwen3TTSTokenizer + +tokenizer = Qwen3TTSTokenizer.from_pretrained( + "Qwen/Qwen3-TTS-Tokenizer-12Hz", + device_map="cuda:0", +) + +enc = tokenizer.encode("https://qianwen-res.oss-cn-beijing.aliyuncs.com/Qwen3-TTS-Repo/tokenizer_demo_1.wav") +wavs, sr = tokenizer.decode(enc) +sf.write("decode_output.wav", wavs[0], sr) +``` + +For more tokenizer examples (including different input formats and batch usage), please refer to the [example codes](https://github.com/QwenLM/Qwen3-TTS/blob/main/examples/test_tokenizer_12hz.py). With those examples and the description for `Qwen3TTSTokenizer`, you can explore more advanced usage patterns. + +### Launch Local Web UI Demo + +To launch the Qwen3-TTS web ui demo, simply install the `qwen-tts` package and run `qwen-tts-demo`. Use the command below for help: + +```bash +qwen-tts-demo --help +``` + +To launch the demo, you can use the following commands: + +```bash +# CustomVoice model +qwen-tts-demo Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice --ip 0.0.0.0 --port 8000 +# VoiceDesign model +qwen-tts-demo Qwen/Qwen3-TTS-12Hz-1.7B-VoiceDesign --ip 0.0.0.0 --port 8000 +# Base model +qwen-tts-demo Qwen/Qwen3-TTS-12Hz-1.7B-Base --ip 0.0.0.0 --port 8000 +``` + +And then open `http://:8000`, or access it via port forwarding in tools like VS Code. + +#### Base Model HTTPS Notes + +To avoid browser microphone permission issues after deploying the server, for Base model deployments, it is recommended/required to run the gradio service over **HTTPS** (especially when accessed remotely or behind modern browsers/gateways). Use `--ssl-certfile` and `--ssl-keyfile` to enable HTTPS. First we need to generate a private key and a self-signed cert (valid for 365 days): + +```bash +openssl req -x509 -newkey rsa:2048 \ + -keyout key.pem -out cert.pem \ + -days 365 -nodes \ + -subj "/CN=localhost" +``` + +Then run the demo with HTTPS: + +```bash +qwen-tts-demo Qwen/Qwen3-TTS-12Hz-1.7B-Base \ + --ip 0.0.0.0 --port 8000 \ + --ssl-certfile cert.pem \ + --ssl-keyfile key.pem \ + --no-ssl-verify +``` + +And open `https://:8000` to experience it. If your browser shows a warning, it’s expected for self-signed certificates. For production, use a real certificate. + +### DashScope API Usage + +To further explore Qwen3-TTS, we encourage you to try our DashScope API for a faster and more efficient experience. For detailed API information and documentation, please refer to the following: + +| API Description | API Documentation (Mainland China) | API Documentation (International) | +|------------------|-----------------------------------|------------------------------------| +| Real-time API for Qwen3-TTS of custom voice model. | [https://help.aliyun.com/zh/model-studio/qwen-tts-realtime](https://help.aliyun.com/zh/model-studio/qwen-tts-realtime) | [https://www.alibabacloud.com/help/en/model-studio/qwen-tts-realtime](https://www.alibabacloud.com/help/en/model-studio/qwen-tts-realtime) | +| Real-time API for Qwen3-TTS of voice clone model. | [https://help.aliyun.com/zh/model-studio/qwen-tts-voice-cloning](https://help.aliyun.com/zh/model-studio/qwen-tts-voice-cloning) | [https://www.alibabacloud.com/help/en/model-studio/qwen-tts-voice-cloning](https://www.alibabacloud.com/help/en/model-studio/qwen-tts-voice-cloning) | +| Real-time API for Qwen3-TTS of voice design model. | [https://help.aliyun.com/zh/model-studio/qwen-tts-voice-design](https://help.aliyun.com/zh/model-studio/qwen-tts-voice-design) | [https://www.alibabacloud.com/help/en/model-studio/qwen-tts-voice-design](https://www.alibabacloud.com/help/en/model-studio/qwen-tts-voice-design) | + + +## vLLM Usage + +vLLM officially provides day-0 support for Qwen3-TTS! Welcome to use vLLM-Omni for Qwen3-TTS deployment and inference. For installation and more details, please check [vLLM-Omni official documentation](https://docs.vllm.ai/projects/vllm-omni/en/latest/getting_started/quickstart/#installation). Now only offline inference is supported. Online serving will be supported later, and vLLM-Omni will continue to offer support and optimization for Qwen3-TTS in areas such as inference speed and streaming capabilities. + +### Offline Inference +You can use vLLM-Omni to inference Qwen3-TTS locally, we provide examples in [vLLM-Omni repo](https://github.com/vllm-project/vllm-omni/tree/main/examples/offline_inference/qwen3_tts) which can generate audio output: +```bash +# git clone https://github.com/vllm-project/vllm-omni.git + +# cd vllm-omni/examples/offline_inference/qwen3_tts + +# Run a single sample with CustomVoice task +python end2end.py --query-type CustomVoice + +# Batch sample (multiple prompts in one run) with CustomVoice task: +python end2end.py --query-type CustomVoice --use-batch-sample + +# Run a single sample with VoiceDesign task +python end2end.py --query-type VoiceDesign + +# Batch sample (multiple prompts in one run) with VoiceDesign task: +python end2end.py --query-type VoiceDesign --use-batch-sample + +# Run a single sample with Base task in icl mode-tag +python end2end.py --query-type Base --mode-tag icl +``` + +## Evaluation + +During evaluation, we ran inference for all models with `dtype=torch.bfloat16` and set `max_new_tokens=2048`. All other sampling parameters used the defaults from the checkpoint’s `generate_config.json`. For the Seed-Test and InstructTTS-Eval test sets, we set `language="auto"`, while for all other test sets we explicitly passed the corresponding `language`. The detailed results are shown below. + + +

+Speech Generation Benchmarks + +*Zero-shot speech generation on the Seed-TTS test set. Performance is measured by Word Error Rate (WER, ↓), where lower is better.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DatasetsModelPerformance
Content Consistency
SEED
test-zh | test-en		Seed-TTS (Anastassiou et al., 2024)1.122.25
MaskGCT (Wang et al., 2024)2.272.62
E2 TTS (Eskimez et al., 2024)1.972.19
F5-TTS (Chen et al., 2024)1.561.83
Spark TTS (Wang et al., 2025)1.201.98
Llasa-8B (Ye et al., 2025b)1.592.97
KALL-E (Xia et al., 2024)0.961.94
FireRedTTS 2 (Xie et al., 2025)1.141.95
CosyVoice 3 (Du et al., 2025)0.711.45
MiniMax-Speech (Zhang et al., 2025a)0.831.65
Qwen3-TTS-25Hz-0.6B-Base1.181.64
Qwen3-TTS-25Hz-1.7B-Base1.101.49
Qwen3-TTS-12Hz-0.6B-Base0.921.32
Qwen3-TTS-12Hz-1.7B-Base0.771.24
+ +
+ +*Multilingual speech generation on the TTS multilingual test set. Performance is measured by Word Error Rate (WER, ↓) for content consistency and Cosine Similarity (SIM, ↑) for speaker similarity.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LanguageQwen3-TTS-25HzQwen3-TTS-12HzMiniMaxElevenLabs
0.6B-Base1.7B-Base0.6B-Base1.7B-Base
Content Consistency
Chinese1.1080.7771.1450.9282.25216.026
English1.0481.0140.8360.9342.1642.339
German1.5010.9601.0891.2351.9060.572
Italian1.1691.1051.5340.9481.5431.743
Portuguese2.0461.7782.2541.5261.8771.331
Spanish2.0311.4911.4911.1261.0291.084
Japanese4.1895.1216.4043.8233.51910.646
Korean2.8522.6311.7411.7551.7471.865
French2.8522.6312.9312.8584.0995.216
Russian5.9574.5354.4583.2124.2813.878
Speaker Similarity
Chinese0.7970.7960.8110.7990.7800.677
English0.8110.8150.8290.7750.7560.613
German0.7490.7370.7690.7750.7330.614
Italian0.7220.7180.7920.8170.6990.579
Portuguese0.7900.7830.7940.8170.8050.711
Spanish0.7320.7310.8120.8140.7620.615
Japanese0.8100.8070.7980.7880.7760.738
Korean0.8240.8140.8120.7990.7790.700
French0.6980.7030.7000.7140.6280.535
Russian0.7340.7440.7810.7920.7610.676
+ +
+ +*Cross-lingual speech generation on the Cross-Lingual benchmark. Performance is measured by Mixed Error Rate (WER for English, CER for others, ↓).* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TaskQwen3-TTS-25Hz-1.7B-BaseQwen3-TTS-12Hz-1.7B-BaseCosyVoice3CosyVoice2
en-to-zh5.664.775.0913.5
ja-to-zh3.923.433.0548.1
ko-to-zh1.141.081.067.70
zh-to-en2.912.772.986.47
ja-to-en3.953.044.2017.1
ko-to-en3.483.094.1911.2
zh-to-ja9.298.407.0813.1
en-to-ja7.747.216.8014.9
ko-to-ja4.173.673.935.86
zh-to-ko8.124.8214.424.8
en-to-ko6.835.145.8721.9
ja-to-ko6.865.597.9221.5
+ +
+ +*Controllable speech generation on InstructTTSEval. Performance is measured by Attribute Perception and Synthesis accuracy (APS), Description-Speech Consistency (DSD), and Response Precision (RP).* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeModelInstructTTSEval-ZHInstructTTSEval-EN
APS (↑)DSD (↑)RP (↑)APS (↑)DSD (↑)RP (↑)
Target
Speaker		Gemini-flash88.290.977.392.393.880.1
Gemini-pro89.090.175.587.686.067.2
Qwen3TTS-25Hz-1.7B-CustomVoice83.175.063.079.082.869.3
Qwen3TTS-12Hz-1.7B-CustomVoice83.077.861.277.377.163.7
GPT-4o-mini-tts54.952.346.076.474.354.8
Voice
Design		Qwen3TTS-12Hz-1.7B-VD85.281.165.182.982.468.4
Mimo-Audio-7B-Instruct (Zhang et al., 2025b)75.774.361.580.677.659.5
VoiceSculptor (Hu et al., 2026)75.764.761.5---
Hume---83.075.354.3
VoxInstruct (Zhou et al., 2024)47.552.342.654.957.039.3
Parler-tts-mini (Lyth & King, 2024)---63.448.728.6
Parler-tts-large (Lyth & King, 2024)---60.045.931.2
PromptTTS (Guo et al., 2023)---64.347.231.4
PromptStyle (Liu et al., 2023)---57.446.430.9
+ +
+ +*Target-Speaker Multilingual Speech Generation on the TTS multilingual test set. Performance is measured by Word Error Rate (WER, ↓).* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
LanguageQwen3-TTS-25HzQwen3-TTS-12HzGPT-4o-Audio
Preview
0.6B-CustomVoice1.7B-CustomVoice0.6B-CustomVoice1.7B-CustomVoice
Chinese0.8740.7080.9440.9033.519
English1.3320.9361.1880.8992.197
German0.9900.6342.7221.0571.161
Italian1.8611.2712.5451.3621.194
Portuguese1.7281.8543.2192.6811.504
Spanish1.3091.2841.1541.3304.000
Japanese3.8754.5186.8774.9245.001
Korean2.2022.2743.0531.7412.763
French3.8653.0803.8413.7813.605
Russian6.5294.4445.8094.7345.250
+ +
+ +*Long speech generation results. Performance is measured by Word Error Rate (WER, ↓).* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DatasetsModelPerformance
Content Consistency
long-zh | long-enHiggs-Audio-v2 (chunk) (Boson AI, 2025)5.5056.917
VibeVoice (Peng et al., 2025)22.6191.780
VoxCPM (Zhou et al., 2025)4.8357.474
Qwen3-TTS-25Hz-1.7B-CustomVoice1.5171.225
Qwen3-TTS-12Hz-1.7B-CustomVoice2.3562.812
+
+ + +
+Speech Tokenizer Benchmarks + +*Comparison between different supervised semantic speech tokenizers on ASR Task.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ModelCodebook SizeFPSC.V. ENC.V. CNFluers ENFluers CN
S3 Tokenizer(VQ) (Du et al., 2024a)40965012.0615.38--
S3 Tokenizer(VQ) (Du et al., 2024a)40962511.5618.267.655.03
S3 Tokenizer(FSQ) (Du et al., 2024a)65612510.677.296.584.43
Qwen-TTS-Tokenizer-25Hz (Stage 1)32768257.5110.733.074.23
Qwen-TTS-Tokenizer-25Hz (Stage 2)327682510.4014.994.144.67
+ +
+ +*Comparison between different semantic-related speech tokenizers.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ModelNQCodebook SizeFPSPESQ_WBPESQ_NBSTOIUTMOSSIM
SpeechTokenizer (Zhang et al., 2023a)81024502.603.050.923.900.85
X-codec (Ye et al., 2025a)21024502.683.270.864.110.84
X-codec 2 (Ye et al., 2025b)165536502.433.040.924.130.82
XY-Tokenizer (Gong et al., 2025)8102412.52.413.000.913.980.83
Mimi (Défossez et al., 2024)16204812.52.883.420.943.870.87
FireredTTS 2 Tokenizer (Xie et al., 2025)16204812.52.733.280.943.880.87
Qwen-TTS-Tokenizer-12Hz16204812.53.213.680.964.160.95
+ +
+ + +## Citation + +If you find our paper and code useful in your research, please consider giving a star :star: and citation :pencil: :) + +```BibTeX +@article{Qwen3-TTS, + title={Qwen3-TTS Technical Report}, + author={Hangrui Hu and Xinfa Zhu and Ting He and Dake Guo and Bin Zhang and Xiong Wang and Zhifang Guo and Ziyue Jiang and Hongkun Hao and Zishan Guo and Xinyu Zhang and Pei Zhang and Baosong Yang and Jin Xu and Jingren Zhou and Junyang Lin}, + journal={arXiv preprint arXiv:2601.15621}, + year={2026} +} +``` + +
\ No newline at end of file diff --git a/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt.meta b/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt.meta new file mode 100644 index 0000000..a6ba9dd --- /dev/null +++ b/Assets/StreamingAssets/Notices/Qwen3-TTS-model-card.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aa8f5c034dc02644ab2897558d6e569c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SourceAssets/Art/Faces/face-expressions-v1.png b/SourceAssets/Art/Faces/face-expressions-v1.png new file mode 100644 index 0000000..e800b7c Binary files /dev/null and b/SourceAssets/Art/Faces/face-expressions-v1.png differ diff --git a/SourceAssets/Art/Faces/face-expressions-v2.png b/SourceAssets/Art/Faces/face-expressions-v2.png new file mode 100644 index 0000000..af77cd0 Binary files /dev/null and b/SourceAssets/Art/Faces/face-expressions-v2.png differ diff --git a/SourceAssets/Art/Faces/provenance.json b/SourceAssets/Art/Faces/provenance.json new file mode 100644 index 0000000..4f86257 --- /dev/null +++ b/SourceAssets/Art/Faces/provenance.json @@ -0,0 +1,66 @@ +{ + "schemaVersion": 1, + "generatedDateUtc": "2026-10-05", + "tool": "built-in image_gen.imagegen, default mode", + "model": null, + "modelDisclosure": "The built-in tool did not expose its model identifier; no model is inferred.", + "transparentBackgroundRequested": true, + "adoptedSource": "SourceAssets/Art/Faces/face-expressions-v2.png", + "runtimeCopy": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Textures/FaceExpressions.png", + "sha256": "0e3c115619c4ae68cf8859ccbc6d4bfb3a26a1a247b3ddb41327c46829540c98", + "format": "RGBA PNG, 1536x1024; generated alpha preserved byte-for-byte", + "sourceModification": "No raster editing or raster conversion. V2 is a built-in image tool edit of V1. Unity Sprite.Create references six cell rects; runtime face scale is 0.9. Numbers and Korean text remain TMP strings. Sprite pivots: top row(.5,.5), bottom row(.5,.68) align mask/eyes on the same existing sphere without changing source pixels.", + "usage": "Project-requested generated face decals only. No Numberblocks character, audio, third-party image, sphere body or extra head was used. Generation does not establish an exclusive-rights claim; service terms apply.", + "variants": [ + { + "file": "SourceAssets/Art/Faces/face-expressions-v1.png", + "status": "superseded, retained as original generation", + "originalToolPath": "C:/Users/baram/AppData/Roaming/orca/codex-runtime-home/home/generated_images/01a10a89-017e-7801-abeb-39a5898f69d3/exec-132d2b86-8436-45bd-bb5b-5cb576913b36.png", + "prompt": "Use case: stylized-concept. Asset type: production transparent game face expression atlas, six equal cells in exact 3 columns by 2 rows, landscape. Each cell has ONLY the same friendly cartoon face decal: two big brown eyes with white sclera, a thin blue superhero eye-mask and small mouth. No head, no sphere, no body, no background, no cape, no text, no numbers, no eyebrows outside cell margins. The face decal fits inside its own cell with at least 15 percent transparent padding, cells separated by transparent space; identical face scale across all six cells. Read order left to right top row: neutral warm smile, curious interested eyes, focused gentle concentration. Bottom row: laughing with smiling eyes, reassuring encouraging smile, celebrating joyful smile. Rounded toy cartoon 3D shaded decal aesthetic, blue mask thin and soft, brown eyes large and expressive, small friendly mouth. Actual transparent alpha background. Do not include a checkerboard or white backdrop. Designed to sit on the surface of an existing 3D sphere, never a replacement body.", + "sha256": "6E43DCDAB2AD4B4B0FDDC1498FD3CE7755D827F65FD1898859912BA1EA9AE85C" + }, + { + "file": "SourceAssets/Art/Faces/face-expressions-v2.png", + "status": "adopted after actual same-sphere six-expression Unity RT alpha/position review; Android regression separate", + "originalToolPath": "C:/Users/baram/AppData/Roaming/orca/codex-runtime-home/home/generated_images/01a10a89-017e-7801-abeb-39a5898f69d3/exec-8711739a-0cc4-4214-afa2-807e3b993de6.png", + "referencedImage": "face-expressions-v1.png", + "prompt": "Edit target: this six-face decal atlas. Remove ALL blue haze, dark backdrop, luminous glow, shadows and colored pixels outside the exact eyes, thin blue mask and mouth cutouts. Preserve the six expressions, their positions and size, exact 3 by 2 grid and proportions. The space around and between faces and in between mask and mouth must be fully transparent, alpha 0, with crisp antialiased cutout edges. NO head, NO body, NO sphere, NO skin. Keep only mask/eyes/mouth isolated opaque decals on genuinely transparent background. No text or numbers.", + "sha256": "0E3C115619C4AE68CF8859CCBC6D4BFB3A26A1A247B3DDB41327C46829540C98" + } + ], + "alphaObservation": { + "range": [ + 0, + 254 + ], + "transparentPixels": [ + [ + 0, + 0 + ], + [ + 512, + 256 + ], + [ + 256, + 500 + ], + [ + 0, + 512 + ] + ], + "eyePixelsAlpha253": [ + [ + 100, + 250 + ], + [ + 200, + 250 + ] + ], + "parentReview": "Cell boundary alpha maximum 1 in top middle cell; other five boundaries 0. RGB under transparent pixels appears blue in some viewers; actual Unity surface captures required to check bleed." + } +} diff --git a/SourceAssets/Audio/Voice/active-adoption.json b/SourceAssets/Audio/Voice/active-adoption.json new file mode 100644 index 0000000..f4eb97f --- /dev/null +++ b/SourceAssets/Audio/Voice/active-adoption.json @@ -0,0 +1,581 @@ +{ + "schemaVersion": 1, + "recordedUtc": "2026-10-05T06:02:18.8300367Z", + "supersedesHistoricalSelection": false, + "approvedCount": 44, + "draftCount": 0, + "clips": [ + { + "id": "count_01", + "text": "하나", + "sourceRunId": "20261004T161148012934Z_47f3a009", + "sourceFile": "generated/20261004T161148012934Z_47f3a009/count_01.wav", + "sourceSha256": "cb7f5e25d8ba3e726b9557597002aef72c35e51edd6012defcb327728c10021f", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_01.wav", + "editedSha256": "13a882ce1620140d447635e14f2d4758045d5e348960c17386df1c720050c100", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_01.wav", + "runtimeSha256": "13a882ce1620140d447635e14f2d4758045d5e348960c17386df1c720050c100", + "adoption": "user-approved-exact-hash", + "approvalRecord": "Prior user approval retained at exact source hash" + }, + { + "id": "count_02", + "text": "둘", + "sourceRunId": "20261004T161231511126Z_aa20f404", + "sourceFile": "generated/20261004T161231511126Z_aa20f404/count_02.wav", + "sourceSha256": "ee8b600198b802248715beafe51848066ce4955c20ac600d5b577590372830cf", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_02.wav", + "editedSha256": "278dd0b6e96f2abca2237ff98eda453a011fa0b2e78d5575b7ddc9c9b3028b32", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_02.wav", + "runtimeSha256": "278dd0b6e96f2abca2237ff98eda453a011fa0b2e78d5575b7ddc9c9b3028b32", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_03", + "text": "셋", + "sourceRunId": "20261004T161231511126Z_aa20f404", + "sourceFile": "generated/20261004T161231511126Z_aa20f404/count_03.wav", + "sourceSha256": "572416e0d66821e1b939833cab328c23b5c97aef2233619428cd54c0603b6b12", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_03.wav", + "editedSha256": "4133b0150aa08e26f1b93b11d29ecab1282bbff236b3c92f8416e781109188c1", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_03.wav", + "runtimeSha256": "4133b0150aa08e26f1b93b11d29ecab1282bbff236b3c92f8416e781109188c1", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_04", + "text": "넷", + "sourceRunId": "20261004T161148012934Z_47f3a009", + "sourceFile": "generated/20261004T161148012934Z_47f3a009/count_04.wav", + "sourceSha256": "c37c335baa80dbdade6e8c6163eb2339cda307d187258306e881b55ab7149f79", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_04.wav", + "editedSha256": "c5c8c78ccd89011050d7317960a854130e3e445c8b92d23e9520eeb7490aa300", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_04.wav", + "runtimeSha256": "c5c8c78ccd89011050d7317960a854130e3e445c8b92d23e9520eeb7490aa300", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_05", + "text": "다섯.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/count_05.wav", + "sourceSha256": "3154b144d44a8f6c353773a20cb21646f47f5f269f76561a8e7c16145a71dcea", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_05.wav", + "editedSha256": "700b9827ea827adeae0ebfc3b4af2b9125d7d3eddc699c63c0ce5c1ba5cbd04c", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_05.wav", + "runtimeSha256": "700b9827ea827adeae0ebfc3b4af2b9125d7d3eddc699c63c0ce5c1ba5cbd04c", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_06", + "text": "여섯", + "sourceRunId": "20261004T161231511126Z_aa20f404", + "sourceFile": "generated/20261004T161231511126Z_aa20f404/count_06.wav", + "sourceSha256": "235c4b6a73be845080af4a10508c433e3d6bf05cb4e0445cba18e23e367d51f7", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_06.wav", + "editedSha256": "d4800a23a73d1315987d9129d260baa0680621d6502351137845a6ee351c6274", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_06.wav", + "runtimeSha256": "d4800a23a73d1315987d9129d260baa0680621d6502351137845a6ee351c6274", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_07", + "text": "일곱", + "sourceRunId": "20261004T161148012934Z_47f3a009", + "sourceFile": "generated/20261004T161148012934Z_47f3a009/count_07.wav", + "sourceSha256": "af505fe8825eda62af188ee9dfe79b1ee91ff819cbe8e07596af6f741e0bf5a4", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_07.wav", + "editedSha256": "7d4ba785ccb28b8f2bf0d8f66053dc8adf1a19d332bedfab3bffd596208fe829", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_07.wav", + "runtimeSha256": "7d4ba785ccb28b8f2bf0d8f66053dc8adf1a19d332bedfab3bffd596208fe829", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_08", + "text": "여덟.", + "sourceRunId": "20261005T043059823226Z_abdd0294", + "sourceFile": "generated/20261005T043059823226Z_abdd0294/count_08.wav", + "sourceSha256": "f9d6ca2574b12936d69da81af723a842a7fec8a3cf1b760e531eec58e4e07ad5", + "editedFile": "edited/20261005T043059823226Z_abdd0294/count_08.wav", + "editedSha256": "fa8034948f6ac3e289e8e7e9fb447943760d4ed5ac577c8ab0c961c608fe49c2", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav", + "runtimeSha256": "fa8034948f6ac3e289e8e7e9fb447943760d4ed5ac577c8ab0c961c608fe49c2", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/count08-user-approval.json" + }, + { + "id": "count_09", + "text": "아홉", + "sourceRunId": "20261004T161231511126Z_aa20f404", + "sourceFile": "generated/20261004T161231511126Z_aa20f404/count_09.wav", + "sourceSha256": "c4a0a9183e1a108a4f54b8364971de3693083e27f5f1f69d8bdba7030313cea5", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_09.wav", + "editedSha256": "4a921bc405ed5181e26365764ef94c2d311af45ed5508b27ffd7ac6d53d83802", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_09.wav", + "runtimeSha256": "4a921bc405ed5181e26365764ef94c2d311af45ed5508b27ffd7ac6d53d83802", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "count_10", + "text": "열", + "sourceRunId": "20261004T161148012934Z_47f3a009", + "sourceFile": "generated/20261004T161148012934Z_47f3a009/count_10.wav", + "sourceSha256": "23e41b1b1ab51160979ac665301bbc91251505dedcf0c574f0f9fc5e457ac73a", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/count_10.wav", + "editedSha256": "b16ebccea20aedf93b884299edb0dd430f67e4deef069fb354b482f21b8e5fb8", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_10.wav", + "runtimeSha256": "b16ebccea20aedf93b884299edb0dd430f67e4deef069fb354b482f21b8e5fb8", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_collect", + "text": "친구를 찾아 끌어와 볼까?", + "sourceRunId": "20261004T161148012934Z_47f3a009", + "sourceFile": "generated/20261004T161148012934Z_47f3a009/guide_collect.wav", + "sourceSha256": "c772e4d9996b129eb4fdd59d90d03e93efa7ef434112e342be2e455d203878e6", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_collect.wav", + "editedSha256": "62e15c9e38c36f4094a6c7e9c5148510141290b5f41db5aad9dc1d8f1a158594", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_collect.wav", + "runtimeSha256": "62e15c9e38c36f4094a6c7e9c5148510141290b5f41db5aad9dc1d8f1a158594", + "adoption": "user-approved-exact-hash", + "approvalRecord": "Prior user approval retained at exact source hash" + }, + { + "id": "guide_count", + "text": "모두 모았네! 하나씩 눌러 세어 보자.", + "sourceRunId": "20261004T161231511126Z_aa20f404", + "sourceFile": "generated/20261004T161231511126Z_aa20f404/guide_count.wav", + "sourceSha256": "63086b0a17769a6c1a8e270f75db08db604b5eeb430456042e168ce95d02babe", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_count.wav", + "editedSha256": "debe29b89f3e2856f2bf4c5e01707a5f0a0657e5768c03be385ec88fa2328b40", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_count.wav", + "runtimeSha256": "debe29b89f3e2856f2bf4c5e01707a5f0a0657e5768c03be385ec88fa2328b40", + "adoption": "user-approved-exact-hash", + "approvalRecord": "Prior user approval retained at exact source hash" + }, + { + "id": "guide_merge", + "text": "친구를 가까이 끌어와 붙여 볼까?", + "sourceRunId": "20261004T193323396066Z_c5daf2df", + "sourceFile": "generated/20261004T193323396066Z_c5daf2df/guide_merge.wav", + "sourceSha256": "f521af71107190360187a11d20d0f95f4aac14ee73d79a75bb85018d1bfa164d", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_merge.wav", + "editedSha256": "522db037e0358b01b84dfc68f13e62073495a011a96d8ca407be28f36e98e16d", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_merge.wav", + "runtimeSha256": "522db037e0358b01b84dfc68f13e62073495a011a96d8ca407be28f36e98e16d", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split", + "text": "나누기를 누르고, 나눌 구를 골라 끌어내 보자.", + "sourceRunId": "20261004T193323396066Z_c5daf2df", + "sourceFile": "generated/20261004T193323396066Z_c5daf2df/guide_split.wav", + "sourceSha256": "9362a2243fd44b607a50fe4ca7f3a4d64a64e8ceb919b9eb6bb7098adaf67eac", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split.wav", + "editedSha256": "72df6edc53a6e320e48b6bae18ba6bed43034028795021ff48d6f04bc4dc7649", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split.wav", + "runtimeSha256": "72df6edc53a6e320e48b6bae18ba6bed43034028795021ff48d6f04bc4dc7649", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "demo_composition", + "text": "친구를 붙이면 하나의 친구가 돼. 나누기를 누르고 구를 골라 끌어내면, 두 친구로 나뉘어. 둘과 둘을 만들어 보자.", + "sourceRunId": "20261004T193323396066Z_c5daf2df", + "sourceFile": "generated/20261004T193323396066Z_c5daf2df/demo_composition.wav", + "sourceSha256": "f1aa3029c780da9005ccf1f173a82025f17225d4ee0952e9a21a75aa5516821e", + "editedFile": "edited/20261004T194102211708Z_8c81e83d/demo_composition.wav", + "editedSha256": "570452e9fa15ec545b126cd8bdba504a3db6f30b74a95405ee228015368761e7", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/demo_composition.wav", + "runtimeSha256": "570452e9fa15ec545b126cd8bdba504a3db6f30b74a95405ee228015368761e7", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_find", + "text": "빛나는 친구를 찾아 직접 끌어와 볼까?", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_find.wav", + "sourceSha256": "8dcf82748fe61a4635d64e0561bd6f534a094a450b1d9f264c3d837398e3f8db", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_find.wav", + "editedSha256": "14de802d534e95053b89c93f8ddd86510e1f68ac4bbf790f8b1f5274c2c34c41", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_find.wav", + "runtimeSha256": "14de802d534e95053b89c93f8ddd86510e1f68ac4bbf790f8b1f5274c2c34c41", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_uncounted", + "text": "아직 세지 않은 빛나는 구를 눌러 볼까?", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_uncounted.wav", + "sourceSha256": "dacd16c543bdb89366ebb8295da565d6a1665da18a22fc7ca7c3aedf5c85b552", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_uncounted.wav", + "editedSha256": "00eaa41c80725e45d62cc4f5a6b83ef2fce1a5810a8e74f8d60263e022d18575", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_uncounted.wav", + "runtimeSha256": "00eaa41c80725e45d62cc4f5a6b83ef2fce1a5810a8e74f8d60263e022d18575", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "demo_merge6", + "text": "시범을 볼까? 한 친구를 다른 친구 가까이 끌어오면 둘이 붙어. 이제 직접 해 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/demo_merge6.wav", + "sourceSha256": "76e35824d21934b610182d0d5965d526361219ea11c6999deb6ab0291e412a72", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/demo_merge6.wav", + "editedSha256": "6300c5490442c3168a52611888568ce37fdaffa82b1b72780e5c9eb5ce81fa53", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/demo_merge6.wav", + "runtimeSha256": "6300c5490442c3168a52611888568ce37fdaffa82b1b72780e5c9eb5ce81fa53", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "demo_split10", + "text": "시범을 볼까? 나누기를 누르고, 구 하나를 골라 끌어내면 두 친구로 나뉘어. 이제 직접 해 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/demo_split10.wav", + "sourceSha256": "1f4b3eb27892997c3654cfe2e0f139bba678e5b8917981bb76dbd78e6b04e79f", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/demo_split10.wav", + "editedSha256": "6bc2d42b24170fa0dda48ed8c5a24b147219e7237d9989432026cbf028e81712", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/demo_split10.wav", + "runtimeSha256": "6bc2d42b24170fa0dda48ed8c5a24b147219e7237d9989432026cbf028e81712", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_2_1", + "text": "구가 두 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_2_1.wav", + "sourceSha256": "bc187ed5ee6eb0b5eb2a32de4223b77c3f6df7aa65bdb11a4a7ece102f6ea716", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_2_1.wav", + "editedSha256": "305c4fe9bc09ac9785fad869420a37b0f15cdbe62e70d877b58774e15d16722b", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_2_1.wav", + "runtimeSha256": "305c4fe9bc09ac9785fad869420a37b0f15cdbe62e70d877b58774e15d16722b", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_3_1", + "text": "구가 세 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_3_1.wav", + "sourceSha256": "d489e05b83f63f4a31678d17307009c12c9ff42a0fac6caeae762cd8d0ee6a7c", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_3_1.wav", + "editedSha256": "ba409cd9f8d69111bb6a1a376cd56d98e1b88cd93f6e383662fcfb3430205ffc", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_3_1.wav", + "runtimeSha256": "ba409cd9f8d69111bb6a1a376cd56d98e1b88cd93f6e383662fcfb3430205ffc", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_4_1", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_4_1.wav", + "sourceSha256": "43fd54b1c3a12bbd06b90b7acc01de92586afaed216f4a4b3b0c002d16db2477", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_4_1.wav", + "editedSha256": "c6a33664da7a8d0ee722fae4c6e7ea3aabc002c6d914a1939f3273d7ce07be64", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_4_1.wav", + "runtimeSha256": "c6a33664da7a8d0ee722fae4c6e7ea3aabc002c6d914a1939f3273d7ce07be64", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_4_2", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_4_2.wav", + "sourceSha256": "30b9f54438657fe1125c70634a2ddca70cfbd5df8cbbe7aca8795e283b0f025c", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_4_2.wav", + "editedSha256": "520c0d11b828f1420c704e42e7b1790902b5fbec4726c369d6272827f36bfc03", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_4_2.wav", + "runtimeSha256": "520c0d11b828f1420c704e42e7b1790902b5fbec4726c369d6272827f36bfc03", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_5_1", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_5_1.wav", + "sourceSha256": "7b3b486e33ebc906b5a983592d26620698c0f5ca84933a37e95985673c654c99", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_5_1.wav", + "editedSha256": "d5bcee96fc42217494e525fec51f20cd2f1188070e2e5aeb20b5fc50f58be80f", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_5_1.wav", + "runtimeSha256": "d5bcee96fc42217494e525fec51f20cd2f1188070e2e5aeb20b5fc50f58be80f", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_5_2", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_5_2.wav", + "sourceSha256": "e7cb7c6f41145614cf985142fc8364b781ca23d704db880cebea79a2eec388c6", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_5_2.wav", + "editedSha256": "b946cda17c260eda8409d97ba13dee9f9b5fdf1f587ec623f047d0cf96a2e8b6", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_5_2.wav", + "runtimeSha256": "b946cda17c260eda8409d97ba13dee9f9b5fdf1f587ec623f047d0cf96a2e8b6", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_6_1", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_6_1.wav", + "sourceSha256": "fe7e7913bb16730e4a258a3564e7aa8064ad0a1441b7f8946c1e89fb87fd33ed", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_6_1.wav", + "editedSha256": "da9e39659a60eaf930f0ac0a7f41ebfc50508893d67ca0d1b7f6a0dfa0f773aa", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_6_1.wav", + "runtimeSha256": "da9e39659a60eaf930f0ac0a7f41ebfc50508893d67ca0d1b7f6a0dfa0f773aa", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_6_2", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_6_2.wav", + "sourceSha256": "8efd2e24e69e239748c98e4f76533892540d3512db04c1fda212dd86114f509e", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_6_2.wav", + "editedSha256": "6b634d5cf24b3d5eca2e9f6ab21519d31ef299b1e0204e9d767a106d9ec3ecf7", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_6_2.wav", + "runtimeSha256": "6b634d5cf24b3d5eca2e9f6ab21519d31ef299b1e0204e9d767a106d9ec3ecf7", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_6_3", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_6_3.wav", + "sourceSha256": "03b5943954ea101f15adc497d265a1c95abd4e7c0a6eb80e058150b5d8cd304c", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_6_3.wav", + "editedSha256": "9dfed6560f52343b57de209194a6342d41da444d1a3f2dcf5dabec7e93d23fa0", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_6_3.wav", + "runtimeSha256": "9dfed6560f52343b57de209194a6342d41da444d1a3f2dcf5dabec7e93d23fa0", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_7_1", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_7_1.wav", + "sourceSha256": "e817b33454ebdb9e465ed44c378b0decf2a1efb22edd7763a069adb7692d4a61", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_7_1.wav", + "editedSha256": "89f5600677849bb96c519bd2ef67776a0408df72c6d94d513263ac31193a69c1", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_7_1.wav", + "runtimeSha256": "89f5600677849bb96c519bd2ef67776a0408df72c6d94d513263ac31193a69c1", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_7_2", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_7_2.wav", + "sourceSha256": "89a96286908c25de716236f09c62453dafe2ceb545b4feefaf3f810944dcf627", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_7_2.wav", + "editedSha256": "818a8fc291bce3fe7253fbd47b36607e097669ba2a03c6b0262a2647e25e4a16", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_7_2.wav", + "runtimeSha256": "818a8fc291bce3fe7253fbd47b36607e097669ba2a03c6b0262a2647e25e4a16", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_7_3", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_7_3.wav", + "sourceSha256": "36865358730585a5345aa7cb2eefd64e53631dbd8e0495e494c2e7d364362e38", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_7_3.wav", + "editedSha256": "07296ac45990a214efa6fe18c5924456304aa128c364abbe3e00d539d63f7363", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_7_3.wav", + "runtimeSha256": "07296ac45990a214efa6fe18c5924456304aa128c364abbe3e00d539d63f7363", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_8_1", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_8_1.wav", + "sourceSha256": "e7cfe8db21cde074fdbb9731358789a6b4f5b54204362b4578123dbd36d2da23", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_8_1.wav", + "editedSha256": "eb1e903011bb3c82674c8b30f74683715dd988d22db2085db00fce4db697cfcc", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_8_1.wav", + "runtimeSha256": "eb1e903011bb3c82674c8b30f74683715dd988d22db2085db00fce4db697cfcc", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_8_2", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_8_2.wav", + "sourceSha256": "d9942f78831bdc9cdc2839cea958645884b373210521911ac9e41c912cd05ff1", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_8_2.wav", + "editedSha256": "c6e2211492e15196fb183e81845fab102f8c9cf1dcb82c29331d24403f9e68e3", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_8_2.wav", + "runtimeSha256": "c6e2211492e15196fb183e81845fab102f8c9cf1dcb82c29331d24403f9e68e3", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_8_3", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_8_3.wav", + "sourceSha256": "0203109185c675a467bcea6f124f4404e3fbced75f23c9adbba5d5ebbefd74b7", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_8_3.wav", + "editedSha256": "c7cf1eff30dde038774b40d895bb833d9dd9c640730ae679711aa48f453e8d90", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_8_3.wav", + "runtimeSha256": "c7cf1eff30dde038774b40d895bb833d9dd9c640730ae679711aa48f453e8d90", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_8_4", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_8_4.wav", + "sourceSha256": "77e3ef140ecbf2133b3ac86267ac75501c2c4f1589620c54029d4abcc2a05e6e", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_8_4.wav", + "editedSha256": "8c2254bf1d3d7fb773717f9cb006868f8978a91b2d926c49875c29d0af3a4db1", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_8_4.wav", + "runtimeSha256": "8c2254bf1d3d7fb773717f9cb006868f8978a91b2d926c49875c29d0af3a4db1", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_9_1", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_9_1.wav", + "sourceSha256": "2e4970c1e1950f9b9f9cde0462fff327b95916704e5236823ca26942f3e07470", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_9_1.wav", + "editedSha256": "c6a2a5a8b15795f40907629aafe639b18b28cdb4d1f574d32ad5324b8db35050", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_9_1.wav", + "runtimeSha256": "c6a2a5a8b15795f40907629aafe639b18b28cdb4d1f574d32ad5324b8db35050", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_9_2", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_9_2.wav", + "sourceSha256": "bd3854b0a61ab2d8b085a9ac0d8810ae6abdbda28c7d6271c418153491ff09ce", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_9_2.wav", + "editedSha256": "80f290977d76cf097f1be04e3e8a33f5fc677a6213fa4865b876e25d5933e1e7", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_9_2.wav", + "runtimeSha256": "80f290977d76cf097f1be04e3e8a33f5fc677a6213fa4865b876e25d5933e1e7", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_9_3", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_9_3.wav", + "sourceSha256": "1c2cb49748b2c250f1cb9c897371c81d0d1b1f9464135d9ff631928ad0f84ad5", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_9_3.wav", + "editedSha256": "c0a32bb1e7845d3b45c48b60ecab903670107ae0018cfd11e6a975f952feefd1", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_9_3.wav", + "runtimeSha256": "c0a32bb1e7845d3b45c48b60ecab903670107ae0018cfd11e6a975f952feefd1", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_9_4", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_9_4.wav", + "sourceSha256": "2a7715a6f73ee00b8a754a3be83423a3cff2fb6e4e4a5df8f93832cfdd3fa252", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_9_4.wav", + "editedSha256": "1d2bb033451a248b4a516da13a2e53dc89f4e5590a232ad978896845c8286168", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_9_4.wav", + "runtimeSha256": "1d2bb033451a248b4a516da13a2e53dc89f4e5590a232ad978896845c8286168", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_10_1", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_10_1.wav", + "sourceSha256": "2a0d95c287dd6c59da3301f18826c100cffb2f18f9ff218d5788b63f19df1ba0", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_10_1.wav", + "editedSha256": "045b2e2065ba0eb44fc5c49405227b7dc042a0a20e88b5aeae87bbea24d0a0c7", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_10_1.wav", + "runtimeSha256": "045b2e2065ba0eb44fc5c49405227b7dc042a0a20e88b5aeae87bbea24d0a0c7", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_10_2", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_10_2.wav", + "sourceSha256": "c037cbc44149c9868fcb57085c924a83b570003e193aa871c554a20a57701b4e", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_10_2.wav", + "editedSha256": "f3d7912563c761ca8ebace355000ceb1522f6f31a2e15735c712c0d26d011ed6", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_10_2.wav", + "runtimeSha256": "f3d7912563c761ca8ebace355000ceb1522f6f31a2e15735c712c0d26d011ed6", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_10_3", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_10_3.wav", + "sourceSha256": "6e5b776980b2aad671c861fcce1d90377ee248781bd62d221e1373151638a786", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_10_3.wav", + "editedSha256": "dc7f9f9750379fae5b7e8067d467cf6704a6501c3f1a57f4b50a93191ac7140f", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_10_3.wav", + "runtimeSha256": "dc7f9f9750379fae5b7e8067d467cf6704a6501c3f1a57f4b50a93191ac7140f", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_10_4", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_10_4.wav", + "sourceSha256": "b7b7d736f482cc172a51b99a306726c2e6550fbde0f00551bdb03c25e3e61b3e", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_10_4.wav", + "editedSha256": "d1ad45d2432befcfc4d78c29c5c355bdd42eb02492c6ed668c3c0d8ce9c0822d", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_10_4.wav", + "runtimeSha256": "d1ad45d2432befcfc4d78c29c5c355bdd42eb02492c6ed668c3c0d8ce9c0822d", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + }, + { + "id": "guide_split_10_5", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 다섯 개를 골라 끌어내 보자.", + "sourceRunId": "20261005T034100690940Z_96b6d5ac", + "sourceFile": "generated/20261005T034100690940Z_96b6d5ac/guide_split_10_5.wav", + "sourceSha256": "e30d4567386e1be969e7fb1f36ec684da85c1ded3e32f21468bfc90c745bc038", + "editedFile": "edited/20261005T034100690940Z_96b6d5ac/guide_split_10_5.wav", + "editedSha256": "28680c94450411fc93022830c08c2922257df144b0c22f592915988f741f60ca", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/guide_split_10_5.wav", + "runtimeSha256": "28680c94450411fc93022830c08c2922257df144b0c22f592915988f741f60ca", + "adoption": "user-approved-exact-hash", + "approvalRecord": "reviews/user-approval-remaining40.json" + } + ] +} diff --git a/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/count_08.wav b/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/count_08.wav new file mode 100644 index 0000000..4c3c4f7 Binary files /dev/null and b/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/count_08.wav differ diff --git a/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/selection.json b/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/selection.json new file mode 100644 index 0000000..8ccfb78 --- /dev/null +++ b/SourceAssets/Audio/Voice/edited/20261005T043059823226Z_abdd0294/selection.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "runId": "20261005T043059823226Z_abdd0294", + "profileHash": "a5740d9db8a4aaebf08d0ac3b8f3225693f878aa2868143f01191a059e2680e8", + "catalogHash": "c6bc24daadf42e2570959eb8f5578e113bb279dee3189ef43cbf084e88c54043", + "selections": [ + { + "id": "count_08", + "sourceRunId": "20261005T043059823226Z_abdd0294", + "sourceFile": "generated/20261005T043059823226Z_abdd0294/count_08.wav", + "sourceSha256": "f9d6ca2574b12936d69da81af723a842a7fec8a3cf1b760e531eec58e4e07ad5", + "editedFile": "edited/20261005T043059823226Z_abdd0294/count_08.wav", + "runtimeFile": "Assets/MagnetismHeroes/UnityRuntime/Presentation/Audio/Voice/count_08.wav", + "editedMetadata": { + "sha256": "fa8034948f6ac3e289e8e7e9fb447943760d4ed5ac577c8ab0c961c608fe49c2", + "sampleRate": 44100, + "channels": 1, + "frames": 24696, + "duration": 0.56, + "peak": 0.392578125, + "rms": 0.08855503797531128, + "qualityWarnings": [] + }, + "review": "not_listened", + "status": "draft", + "processing": "polyphase resample to mono PCM16 44100 Hz; no speech trimming" + } + ] +} diff --git a/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/catalog.json b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/catalog.json new file mode 100644 index 0000000..82ccc82 --- /dev/null +++ b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/catalog.json @@ -0,0 +1,1240 @@ +{ + "schemaVersion": 1, + "clips": [ + { + "id": "count_01", + "text": "하나", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_02", + "text": "둘", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_03", + "text": "셋", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_04", + "text": "넷", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_05", + "text": "다섯.", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_06", + "text": "여섯", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_07", + "text": "일곱", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_08", + "text": "여덟.", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_09", + "text": "아홉", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "count_10", + "text": "열", + "usage": "count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_collect", + "text": "친구를 찾아 끌어와 볼까?", + "usage": "guide_collect", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 16, + 17, + 18, + 19, + 20 + ], + "required": true + }, + { + "id": "guide_count", + "text": "모두 모았네! 하나씩 눌러 세어 보자.", + "usage": "guide_count", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 16, + 17, + 18, + 19, + 20 + ], + "required": true + }, + { + "id": "guide_merge", + "text": "친구를 가까이 끌어와 붙여 볼까?", + "usage": "composition-guide", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split", + "text": "나누기를 누르고, 나눌 구를 골라 끌어내 보자.", + "usage": "composition-guide", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "demo_composition", + "text": "친구를 붙이면 하나의 친구가 돼. 나누기를 누르고 구를 골라 끌어내면, 두 친구로 나뉘어. 둘과 둘을 만들어 보자.", + "usage": "composition-demo", + "stageIds": [ + 14 + ], + "required": false + }, + { + "id": "guide_find", + "text": "빛나는 친구를 찾아 직접 끌어와 볼까?", + "usage": "state-help", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 16, + 17, + 18, + 19, + 20 + ], + "required": true + }, + { + "id": "guide_uncounted", + "text": "아직 세지 않은 빛나는 구를 눌러 볼까?", + "usage": "state-help", + "stageIds": [ + 1, + 2, + 3, + 4, + 5, + 16, + 17, + 18, + 19, + 20 + ], + "required": true + }, + { + "id": "demo_merge6", + "text": "시범을 볼까? 한 친구를 다른 친구 가까이 끌어오면 둘이 붙어. 이제 직접 해 보자.", + "usage": "ghost-demo", + "stageIds": [ + 6 + ], + "required": true + }, + { + "id": "demo_split10", + "text": "시범을 볼까? 나누기를 누르고, 구 하나를 골라 끌어내면 두 친구로 나뉘어. 이제 직접 해 보자.", + "usage": "ghost-demo", + "stageIds": [ + 10 + ], + "required": true + }, + { + "id": "guide_split_2_1", + "text": "구가 두 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_3_1", + "text": "구가 세 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_4_1", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_4_2", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_5_1", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_5_2", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_6_1", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_6_2", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_6_3", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_7_1", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_7_2", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_7_3", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_8_1", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_8_2", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_8_3", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_8_4", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_9_1", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_9_2", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_9_3", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_9_4", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_10_1", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_10_2", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_10_3", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_10_4", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + }, + { + "id": "guide_split_10_5", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 다섯 개를 골라 끌어내 보자.", + "usage": "state-help", + "stageIds": [ + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30 + ], + "required": true + } + ] +} diff --git a/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/count_08.wav b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/count_08.wav new file mode 100644 index 0000000..fed0b84 Binary files /dev/null and b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/count_08.wav differ diff --git a/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/manifest.json b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/manifest.json new file mode 100644 index 0000000..ed87681 --- /dev/null +++ b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/manifest.json @@ -0,0 +1,79 @@ +{ + "schemaVersion": 1, + "runId": "20261005T043059823226Z_abdd0294", + "createdUtc": "2026-10-05T04:30:59.826226+00:00", + "modelRevision": "0c0e3051f131929182e2c023b9537f8b1c68adfe", + "catalogHash": "c6bc24daadf42e2570959eb8f5578e113bb279dee3189ef43cbf084e88c54043", + "profileHash": "a5740d9db8a4aaebf08d0ac3b8f3225693f878aa2868143f01191a059e2680e8", + "scope": "selected", + "regenerateRequested": true, + "inputSnapshots": { + "catalog": "catalog.json", + "profile": "profile.json" + }, + "requestedIds": [ + "count_08" + ], + "environment": { + "python": "3.12.15 | packaged by Anaconda, Inc. | (main, Oct 1 2026, 20:14:50) [MSC v.1942 64 bit (AMD64)]", + "packages": { + "qwen-tts": "0.1.1", + "torch": "2.11.0+cu128", + "torchaudio": "2.11.0", + "transformers": "4.57.3", + "soundfile": "0.14.0", + "huggingface-hub": "0.36.2" + }, + "device": "NVIDIA GeForce RTX 4080 SUPER", + "cuda": "12.8", + "modelDevice": "cuda:0", + "cudaProbe": 140.0, + "modelLoadSeconds": 4.906605000000127, + "modelPeakVramBytes": 4181138432, + "modelDefaults": { + "do_sample": true, + "repetition_penalty": 1.05, + "temperature": 0.9, + "top_p": 1.0, + "top_k": 50, + "subtalker_dosample": true, + "subtalker_temperature": 0.9, + "subtalker_top_p": 1.0, + "subtalker_top_k": 50, + "max_new_tokens": 8192 + }, + "effectiveGenerationParameters": { + "do_sample": true, + "top_k": 50, + "top_p": 1, + "temperature": 0.9, + "repetition_penalty": 1.05, + "subtalker_dosample": true, + "subtalker_top_k": 50, + "subtalker_top_p": 1, + "subtalker_temperature": 0.9, + "max_new_tokens": 8192 + }, + "peakVramBytes": 4227715072 + }, + "clips": [ + { + "id": "count_08", + "textHash": "35f39a2c24f64215a55d8af9906d7acb5b29bb07ca2ec2f399125108f7e8d99b", + "settingsHash": "a5740d9db8a4aaebf08d0ac3b8f3225693f878aa2868143f01191a059e2680e8", + "originalRunId": "20261005T043059823226Z_abdd0294", + "file": "generated/20261005T043059823226Z_abdd0294/count_08.wav", + "review": "not_listened", + "sha256": "f9d6ca2574b12936d69da81af723a842a7fec8a3cf1b760e531eec58e4e07ad5", + "sampleRate": 24000, + "channels": 1, + "frames": 13440, + "duration": 0.56, + "peak": 0.392578125, + "rms": 0.08848943561315536, + "qualityWarnings": [], + "result": "generated", + "generationSeconds": 2.1404024999992544 + } + ] +} diff --git a/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/profile.json b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/profile.json new file mode 100644 index 0000000..f27b4d1 --- /dev/null +++ b/SourceAssets/Audio/Voice/generated/20261005T043059823226Z_abdd0294/profile.json @@ -0,0 +1,24 @@ +{ + "schemaVersion": 1, + "modelId": "Qwen/Qwen3-TTS-12Hz-1.7B-CustomVoice", + "modelRevision": "0c0e3051f131929182e2c023b9537f8b1c68adfe", + "language": "Korean", + "speaker": "Sohee", + "instruct": "5~7세 아이에게 이야기하듯 따뜻하고 밝게, 천천히 또렷하게 읽어 주세요. 숫자는 정확하게 읽고 과장된 비명이나 웃음소리는 넣지 마세요.", + "device": "cuda:0", + "dtype": "bfloat16", + "attention": "sdpa", + "seed": 42, + "generationParameters": { + "do_sample": true, + "repetition_penalty": 1.05, + "temperature": 0.9, + "top_p": 1, + "top_k": 50, + "subtalker_dosample": true, + "subtalker_temperature": 0.9, + "subtalker_top_p": 1, + "subtalker_top_k": 50, + "max_new_tokens": 8192 + } +} diff --git a/SourceAssets/Audio/Voice/reviews/count08-correction-record.json b/SourceAssets/Audio/Voice/reviews/count08-correction-record.json new file mode 100644 index 0000000..0c290e3 --- /dev/null +++ b/SourceAssets/Audio/Voice/reviews/count08-correction-record.json @@ -0,0 +1,28 @@ +{ + "createdUtc": "2026-10-05T04:21:37.327134+00:00", + "id": "count_08", + "rejectedRuntimeSha256": "6bde9265a8e4ac5a4209b1ddcebf57251430bd2eb5134a59af403f351a640aa2", + "request": "count_08 음성이 이상합니다. 쉼표 없이 붙여서 읽으세요", + "candidateText": "여덟.", + "profileUnchanged": true, + "state": "new draft produced; human listening pending; current game runtime unchanged", + "runId": "20261005T043059823226Z_abdd0294", + "generationExitCode": 0, + "generationValidationErrors": [], + "prepareExitCode": 0, + "candidateMetadata": { + "sha256": "fa8034948f6ac3e289e8e7e9fb447943760d4ed5ac577c8ab0c961c608fe49c2", + "sampleRate": 44100, + "channels": 1, + "frames": 24696, + "duration": 0.56, + "peak": 0.392578125, + "rms": 0.08855503797531128, + "qualityWarnings": [] + }, + "candidatePreview": "artifacts/audio-preview/count08-correction-v2/count_08.wav", + "generationCommand": "C:/Users/baram/anaconda3/envs/qwen3-tts/python.exe C:/git/MagnetismHeroes/.dryforge/worktrees/T6/tools/audio/generate_voice.py --catalog C:/git/MagnetismHeroes/artifacts/audio-production/count08-correction/Voice/voice-catalog.json --profile C:/git/MagnetismHeroes/artifacts/audio-production/count08-correction/Voice/qwen-profile.json --ids count_08 --regenerate", + "environmentMode": "HF_HUB_OFFLINE=1; PYTHONIOENCODING=utf-8", + "producerToolSha256": "7a573af32fb29f9686a057e9c8ef7f4d2559deb802ca30a59a8648ac6d8ad807", + "auditoryReview": false +} diff --git a/SourceAssets/Audio/Voice/reviews/count08-user-approval.json b/SourceAssets/Audio/Voice/reviews/count08-user-approval.json new file mode 100644 index 0000000..51132a1 --- /dev/null +++ b/SourceAssets/Audio/Voice/reviews/count08-user-approval.json @@ -0,0 +1,13 @@ +{ + "id": "count_08", + "userReply": "새 음성 괜찮습니다", + "question": "새 count_08 후보의 두 음절이 자연스럽게 이어지고 잘림 없이 들리나요?", + "questionItemId": "call_NPL8ukkbJC3ktdrOTa10zFhG:0", + "approvedSha256": "fa8034948f6ac3e289e8e7e9fb447943760d4ed5ac577c8ab0c961c608fe49c2", + "previewPath": "artifacts/audio-preview/count08-correction-v2/count_08.wav", + "runId": "20261005T043059823226Z_abdd0294", + "recordedUtc": "2026-10-05T05:08:25.2417438Z", + "auditoryReview": true, + "reviewer": "user", + "scope": "Exact new count_08 file only; old rejected count_08 and other40 remain unapproved" +} diff --git a/SourceAssets/Audio/Voice/reviews/user-approval-remaining40.json b/SourceAssets/Audio/Voice/reviews/user-approval-remaining40.json new file mode 100644 index 0000000..6ccee28 --- /dev/null +++ b/SourceAssets/Audio/Voice/reviews/user-approval-remaining40.json @@ -0,0 +1,297 @@ +{ + "schemaVersion": 1, + "questionItemId": "call_mlggTCYSQGL4A1AMlleeEZ98:0", + "userReply": "나머지 40개도 괜찮습니다", + "recordedUtc": "2026-10-05T06:01:07.8592956Z", + "auditoryReview": true, + "approvedClipCount": 40, + "excludedClipIds": [ + "count_01", + "guide_collect", + "guide_count", + "count_08" + ], + "rejectedCount08Excluded": true, + "clips": [ + { + "id": "count_02", + "text": "둘", + "sha256": "278dd0b6e96f2abca2237ff98eda453a011fa0b2e78d5575b7ddc9c9b3028b32", + "previewFile": "count_02.wav", + "runtimeSha256": "278dd0b6e96f2abca2237ff98eda453a011fa0b2e78d5575b7ddc9c9b3028b32" + }, + { + "id": "count_03", + "text": "셋", + "sha256": "4133b0150aa08e26f1b93b11d29ecab1282bbff236b3c92f8416e781109188c1", + "previewFile": "count_03.wav", + "runtimeSha256": "4133b0150aa08e26f1b93b11d29ecab1282bbff236b3c92f8416e781109188c1" + }, + { + "id": "count_04", + "text": "넷", + "sha256": "c5c8c78ccd89011050d7317960a854130e3e445c8b92d23e9520eeb7490aa300", + "previewFile": "count_04.wav", + "runtimeSha256": "c5c8c78ccd89011050d7317960a854130e3e445c8b92d23e9520eeb7490aa300" + }, + { + "id": "count_05", + "text": "다섯.", + "sha256": "700b9827ea827adeae0ebfc3b4af2b9125d7d3eddc699c63c0ce5c1ba5cbd04c", + "previewFile": "count_05.wav", + "runtimeSha256": "700b9827ea827adeae0ebfc3b4af2b9125d7d3eddc699c63c0ce5c1ba5cbd04c" + }, + { + "id": "count_06", + "text": "여섯", + "sha256": "d4800a23a73d1315987d9129d260baa0680621d6502351137845a6ee351c6274", + "previewFile": "count_06.wav", + "runtimeSha256": "d4800a23a73d1315987d9129d260baa0680621d6502351137845a6ee351c6274" + }, + { + "id": "count_07", + "text": "일곱", + "sha256": "7d4ba785ccb28b8f2bf0d8f66053dc8adf1a19d332bedfab3bffd596208fe829", + "previewFile": "count_07.wav", + "runtimeSha256": "7d4ba785ccb28b8f2bf0d8f66053dc8adf1a19d332bedfab3bffd596208fe829" + }, + { + "id": "count_09", + "text": "아홉", + "sha256": "4a921bc405ed5181e26365764ef94c2d311af45ed5508b27ffd7ac6d53d83802", + "previewFile": "count_09.wav", + "runtimeSha256": "4a921bc405ed5181e26365764ef94c2d311af45ed5508b27ffd7ac6d53d83802" + }, + { + "id": "count_10", + "text": "열", + "sha256": "b16ebccea20aedf93b884299edb0dd430f67e4deef069fb354b482f21b8e5fb8", + "previewFile": "count_10.wav", + "runtimeSha256": "b16ebccea20aedf93b884299edb0dd430f67e4deef069fb354b482f21b8e5fb8" + }, + { + "id": "guide_merge", + "text": "친구를 가까이 끌어와 붙여 볼까?", + "sha256": "522db037e0358b01b84dfc68f13e62073495a011a96d8ca407be28f36e98e16d", + "previewFile": "guide_merge.wav", + "runtimeSha256": "522db037e0358b01b84dfc68f13e62073495a011a96d8ca407be28f36e98e16d" + }, + { + "id": "guide_split", + "text": "나누기를 누르고, 나눌 구를 골라 끌어내 보자.", + "sha256": "72df6edc53a6e320e48b6bae18ba6bed43034028795021ff48d6f04bc4dc7649", + "previewFile": "guide_split.wav", + "runtimeSha256": "72df6edc53a6e320e48b6bae18ba6bed43034028795021ff48d6f04bc4dc7649" + }, + { + "id": "demo_composition", + "text": "친구를 붙이면 하나의 친구가 돼. 나누기를 누르고 구를 골라 끌어내면, 두 친구로 나뉘어. 둘과 둘을 만들어 보자.", + "sha256": "570452e9fa15ec545b126cd8bdba504a3db6f30b74a95405ee228015368761e7", + "previewFile": "demo_composition.wav", + "runtimeSha256": "570452e9fa15ec545b126cd8bdba504a3db6f30b74a95405ee228015368761e7" + }, + { + "id": "guide_find", + "text": "빛나는 친구를 찾아 직접 끌어와 볼까?", + "sha256": "14de802d534e95053b89c93f8ddd86510e1f68ac4bbf790f8b1f5274c2c34c41", + "previewFile": "guide_find.wav", + "runtimeSha256": "14de802d534e95053b89c93f8ddd86510e1f68ac4bbf790f8b1f5274c2c34c41" + }, + { + "id": "guide_uncounted", + "text": "아직 세지 않은 빛나는 구를 눌러 볼까?", + "sha256": "00eaa41c80725e45d62cc4f5a6b83ef2fce1a5810a8e74f8d60263e022d18575", + "previewFile": "guide_uncounted.wav", + "runtimeSha256": "00eaa41c80725e45d62cc4f5a6b83ef2fce1a5810a8e74f8d60263e022d18575" + }, + { + "id": "demo_merge6", + "text": "시범을 볼까? 한 친구를 다른 친구 가까이 끌어오면 둘이 붙어. 이제 직접 해 보자.", + "sha256": "6300c5490442c3168a52611888568ce37fdaffa82b1b72780e5c9eb5ce81fa53", + "previewFile": "demo_merge6.wav", + "runtimeSha256": "6300c5490442c3168a52611888568ce37fdaffa82b1b72780e5c9eb5ce81fa53" + }, + { + "id": "demo_split10", + "text": "시범을 볼까? 나누기를 누르고, 구 하나를 골라 끌어내면 두 친구로 나뉘어. 이제 직접 해 보자.", + "sha256": "6bc2d42b24170fa0dda48ed8c5a24b147219e7237d9989432026cbf028e81712", + "previewFile": "demo_split10.wav", + "runtimeSha256": "6bc2d42b24170fa0dda48ed8c5a24b147219e7237d9989432026cbf028e81712" + }, + { + "id": "guide_split_2_1", + "text": "구가 두 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "305c4fe9bc09ac9785fad869420a37b0f15cdbe62e70d877b58774e15d16722b", + "previewFile": "guide_split_2_1.wav", + "runtimeSha256": "305c4fe9bc09ac9785fad869420a37b0f15cdbe62e70d877b58774e15d16722b" + }, + { + "id": "guide_split_3_1", + "text": "구가 세 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "ba409cd9f8d69111bb6a1a376cd56d98e1b88cd93f6e383662fcfb3430205ffc", + "previewFile": "guide_split_3_1.wav", + "runtimeSha256": "ba409cd9f8d69111bb6a1a376cd56d98e1b88cd93f6e383662fcfb3430205ffc" + }, + { + "id": "guide_split_4_1", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "c6a33664da7a8d0ee722fae4c6e7ea3aabc002c6d914a1939f3273d7ce07be64", + "previewFile": "guide_split_4_1.wav", + "runtimeSha256": "c6a33664da7a8d0ee722fae4c6e7ea3aabc002c6d914a1939f3273d7ce07be64" + }, + { + "id": "guide_split_4_2", + "text": "구가 네 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "520c0d11b828f1420c704e42e7b1790902b5fbec4726c369d6272827f36bfc03", + "previewFile": "guide_split_4_2.wav", + "runtimeSha256": "520c0d11b828f1420c704e42e7b1790902b5fbec4726c369d6272827f36bfc03" + }, + { + "id": "guide_split_5_1", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "d5bcee96fc42217494e525fec51f20cd2f1188070e2e5aeb20b5fc50f58be80f", + "previewFile": "guide_split_5_1.wav", + "runtimeSha256": "d5bcee96fc42217494e525fec51f20cd2f1188070e2e5aeb20b5fc50f58be80f" + }, + { + "id": "guide_split_5_2", + "text": "구가 다섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "b946cda17c260eda8409d97ba13dee9f9b5fdf1f587ec623f047d0cf96a2e8b6", + "previewFile": "guide_split_5_2.wav", + "runtimeSha256": "b946cda17c260eda8409d97ba13dee9f9b5fdf1f587ec623f047d0cf96a2e8b6" + }, + { + "id": "guide_split_6_1", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "da9e39659a60eaf930f0ac0a7f41ebfc50508893d67ca0d1b7f6a0dfa0f773aa", + "previewFile": "guide_split_6_1.wav", + "runtimeSha256": "da9e39659a60eaf930f0ac0a7f41ebfc50508893d67ca0d1b7f6a0dfa0f773aa" + }, + { + "id": "guide_split_6_2", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "6b634d5cf24b3d5eca2e9f6ab21519d31ef299b1e0204e9d767a106d9ec3ecf7", + "previewFile": "guide_split_6_2.wav", + "runtimeSha256": "6b634d5cf24b3d5eca2e9f6ab21519d31ef299b1e0204e9d767a106d9ec3ecf7" + }, + { + "id": "guide_split_6_3", + "text": "구가 여섯 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sha256": "9dfed6560f52343b57de209194a6342d41da444d1a3f2dcf5dabec7e93d23fa0", + "previewFile": "guide_split_6_3.wav", + "runtimeSha256": "9dfed6560f52343b57de209194a6342d41da444d1a3f2dcf5dabec7e93d23fa0" + }, + { + "id": "guide_split_7_1", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "89f5600677849bb96c519bd2ef67776a0408df72c6d94d513263ac31193a69c1", + "previewFile": "guide_split_7_1.wav", + "runtimeSha256": "89f5600677849bb96c519bd2ef67776a0408df72c6d94d513263ac31193a69c1" + }, + { + "id": "guide_split_7_2", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "818a8fc291bce3fe7253fbd47b36607e097669ba2a03c6b0262a2647e25e4a16", + "previewFile": "guide_split_7_2.wav", + "runtimeSha256": "818a8fc291bce3fe7253fbd47b36607e097669ba2a03c6b0262a2647e25e4a16" + }, + { + "id": "guide_split_7_3", + "text": "구가 일곱 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sha256": "07296ac45990a214efa6fe18c5924456304aa128c364abbe3e00d539d63f7363", + "previewFile": "guide_split_7_3.wav", + "runtimeSha256": "07296ac45990a214efa6fe18c5924456304aa128c364abbe3e00d539d63f7363" + }, + { + "id": "guide_split_8_1", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "eb1e903011bb3c82674c8b30f74683715dd988d22db2085db00fce4db697cfcc", + "previewFile": "guide_split_8_1.wav", + "runtimeSha256": "eb1e903011bb3c82674c8b30f74683715dd988d22db2085db00fce4db697cfcc" + }, + { + "id": "guide_split_8_2", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "c6e2211492e15196fb183e81845fab102f8c9cf1dcb82c29331d24403f9e68e3", + "previewFile": "guide_split_8_2.wav", + "runtimeSha256": "c6e2211492e15196fb183e81845fab102f8c9cf1dcb82c29331d24403f9e68e3" + }, + { + "id": "guide_split_8_3", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sha256": "c7cf1eff30dde038774b40d895bb833d9dd9c640730ae679711aa48f453e8d90", + "previewFile": "guide_split_8_3.wav", + "runtimeSha256": "c7cf1eff30dde038774b40d895bb833d9dd9c640730ae679711aa48f453e8d90" + }, + { + "id": "guide_split_8_4", + "text": "구가 여덟 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sha256": "8c2254bf1d3d7fb773717f9cb006868f8978a91b2d926c49875c29d0af3a4db1", + "previewFile": "guide_split_8_4.wav", + "runtimeSha256": "8c2254bf1d3d7fb773717f9cb006868f8978a91b2d926c49875c29d0af3a4db1" + }, + { + "id": "guide_split_9_1", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "c6a2a5a8b15795f40907629aafe639b18b28cdb4d1f574d32ad5324b8db35050", + "previewFile": "guide_split_9_1.wav", + "runtimeSha256": "c6a2a5a8b15795f40907629aafe639b18b28cdb4d1f574d32ad5324b8db35050" + }, + { + "id": "guide_split_9_2", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "80f290977d76cf097f1be04e3e8a33f5fc677a6213fa4865b876e25d5933e1e7", + "previewFile": "guide_split_9_2.wav", + "runtimeSha256": "80f290977d76cf097f1be04e3e8a33f5fc677a6213fa4865b876e25d5933e1e7" + }, + { + "id": "guide_split_9_3", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sha256": "c0a32bb1e7845d3b45c48b60ecab903670107ae0018cfd11e6a975f952feefd1", + "previewFile": "guide_split_9_3.wav", + "runtimeSha256": "c0a32bb1e7845d3b45c48b60ecab903670107ae0018cfd11e6a975f952feefd1" + }, + { + "id": "guide_split_9_4", + "text": "구가 아홉 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sha256": "1d2bb033451a248b4a516da13a2e53dc89f4e5590a232ad978896845c8286168", + "previewFile": "guide_split_9_4.wav", + "runtimeSha256": "1d2bb033451a248b4a516da13a2e53dc89f4e5590a232ad978896845c8286168" + }, + { + "id": "guide_split_10_1", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 한 개를 골라 끌어내 보자.", + "sha256": "045b2e2065ba0eb44fc5c49405227b7dc042a0a20e88b5aeae87bbea24d0a0c7", + "previewFile": "guide_split_10_1.wav", + "runtimeSha256": "045b2e2065ba0eb44fc5c49405227b7dc042a0a20e88b5aeae87bbea24d0a0c7" + }, + { + "id": "guide_split_10_2", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 두 개를 골라 끌어내 보자.", + "sha256": "f3d7912563c761ca8ebace355000ceb1522f6f31a2e15735c712c0d26d011ed6", + "previewFile": "guide_split_10_2.wav", + "runtimeSha256": "f3d7912563c761ca8ebace355000ceb1522f6f31a2e15735c712c0d26d011ed6" + }, + { + "id": "guide_split_10_3", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 세 개를 골라 끌어내 보자.", + "sha256": "dc7f9f9750379fae5b7e8067d467cf6704a6501c3f1a57f4b50a93191ac7140f", + "previewFile": "guide_split_10_3.wav", + "runtimeSha256": "dc7f9f9750379fae5b7e8067d467cf6704a6501c3f1a57f4b50a93191ac7140f" + }, + { + "id": "guide_split_10_4", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 네 개를 골라 끌어내 보자.", + "sha256": "d1ad45d2432befcfc4d78c29c5c355bdd42eb02492c6ed668c3c0d8ce9c0822d", + "previewFile": "guide_split_10_4.wav", + "runtimeSha256": "d1ad45d2432befcfc4d78c29c5c355bdd42eb02492c6ed668c3c0d8ce9c0822d" + }, + { + "id": "guide_split_10_5", + "text": "구가 열 개인 친구에서 나누기를 누르고, 구 다섯 개를 골라 끌어내 보자.", + "sha256": "28680c94450411fc93022830c08c2922257df144b0c22f592915988f741f60ca", + "previewFile": "guide_split_10_5.wav", + "runtimeSha256": "28680c94450411fc93022830c08c2922257df144b0c22f592915988f741f60ca" + } + ] +} diff --git a/SourceAssets/Audio/Voice/voice-catalog.json b/SourceAssets/Audio/Voice/voice-catalog.json index f0cab04..82ccc82 100644 --- a/SourceAssets/Audio/Voice/voice-catalog.json +++ b/SourceAssets/Audio/Voice/voice-catalog.json @@ -269,7 +269,7 @@ }, { "id": "count_08", - "text": "여덟", + "text": "여덟.", "usage": "count", "stageIds": [ 1, diff --git a/docs/asset-register.md b/docs/asset-register.md index 154a605..aa363dc 100644 --- a/docs/asset-register.md +++ b/docs/asset-register.md @@ -40,3 +40,18 @@ Stage06/10/14 ScriptableObject와 GameApp의 대표 선택·나누기·취소 | 실제 30 정의 | `Assets/MagnetismHeroes/UnityRuntime/StageAssets/Stage01.asset` .. `Stage30.asset` | Unity Editor API로 작성. R07 번호/초기/목표/종류는 고정이며 테마는 미술 데이터. 런타임 원본 수정 없음. | 수집 자석 55개(1..5,16..20)의 시점 탐색·실제 Collider pick·직접 drag/수집을 PlayMode에서 확인하고 `artifacts/verification/Content/editor-play/counting-discovery.txt`에 stage/ID/yaw/pitch 기록을 남긴다. 세 테마의 Free 0..10 공급, 전체 묶음 반납, 원래 stage 테마 복원도 검사한다. 시범 실루엣은 UI Image만 사용하며 실제 구 ID/Collider가 없다. T7의 최종 AI 얼굴·UI 이미지·VFX와 사용자가 추후 제공하는 SFX/BGM은 별도 미완료다. + +## T7 현재 채택: 얼굴·표현·음성 (2026-10-05) + +동일 기본 구 하나의 표면에 6표정(기본/관심/집중/웃음/격려/축하) 눈·입·얇은 파란 마스크 Sprite를 붙인다. 구 몸체·추가 머리·숫자 캐릭터 그림으로 대체하지 않는다. 수와 한국어는 TMP 동적 텍스트이며 얼굴/숫자/얇은 빛 리본은 안정 묶음당 하나다. 장식 Collider/raycast target이 없다. 선택 황색 테두리와 접촉 녹색 작은 고리는 독립적이며 확정 접촉 고리와 실제 접촉 위치에서의 짧은 거리별 빛 전파는 표현만 바꾼다. 기존 Core/저장 배열/구 기본 크기는 유지한다. + +| 자산 | 경로 | 출처·채택·사용 조건 | +| --- | --- | --- | +| 6표정 투명 PNG 원본/시안 | `SourceAssets/Art/Faces/face-expressions-v{1,2}.png`, `provenance.json` | built-in image_gen 생성/편집, 정확 prompt/생성일/경로/SHA/모델명 미노출 사실 보존. 외부 그림·캐릭터·글자·구 몸체 없음. V2 RGBA SHA `0E3C115619C4AE68CF8859CCBC6D4BFB3A26A1A247B3DDB41327C46829540C98`; 원본 alpha 유지. | +| runtime atlas / Unity Sprite 6개 | `Presentation/Textures/FaceExpressions.png`, `Presentation/Sprites/Face0.asset`..`Face5.asset` | Unity API Sprite.Create, 셀 rect/pivot만 metadata. 외부 경로 참조 없음. 실제 구 표면 RT 검수에서 사각 배경 없음. 최종 검수 원문은 T7 artifacts. | +| 얼굴·빛·반응형 가로 UI | `Editor/PresentationAssets.cs`, 기존 GameApp/GroupBadge/MagnetFriend prefab | 실제 Unity API 생성. 기존 GameApp GUID 유지. 숫자 배지는 같은 묶음 위의 가까운 공간을 찾는다. 카메라 FOV62/고정 상향 pivot .65는 미술 프레이밍이며 저장 CameraState 형식은 동일. 새 자유놀이 공급 row spacing1.8만 적용하며 저장된 배열/drag 위치는 재배치하지 않는다. | +| runtime 44 한국어 음성 | `SourceAssets/Audio/Voice/active-adoption.json` | 현재 runtime→edited→generated 정확 SHA/대본/출처/승인 기록 연결. 기존 3 승인 + 새 여덟. 승인 + 나머지40 승인. 이전 거절된8 이력과 과거 manifests는 유지. 모든44 사용자 청취 승인; 추론 도구/모델/SourceAssets는 APK 제외. | +| Qwen/Noto notices | `Assets/StreamingAssets/Notices/` | Apache-2.0 원문/모델 카드와 Noto OFL 원문을 빌드 포함 위치에 staging. 소스 검사와 실제 APK ZIP/byte 검사는 증거 범위를 구분한다. | +| SFX/BGM 연결 | `Presentation/GameSound.cs` | 기존 Mixer Voice/SFX/Music 직접 연결. 실제 발화 중 duck, nav/pause 무음 정리, 동일 테마 pause 재개. 사용자 미제공 모든 SFX/BGM clip은 null, 대체 음원 채택 없음. 실제 음원 청취·음악 3회 반복 최종 인수는 미완료. | + +Editor RT 캡처는 Camera.Render와 임시 ScreenSpaceCamera Canvas/안전영역 시뮬레이션 후 복원한 결과이며 Android 기기 화면과 구별한다. JSON은 raw CameraState, 실제 transform/FOV/pivot, 화면·Canvas·viewport 및 측정 범위를 기록한다. liveGameViewDrawCalls는 이전 live GameView CPU 통계이며 RT GPU draw/overdraw가 아니다. Camera.Render wall time은 Editor 비용이며 AVD/실기기 프레임 합격 증거가 아니다. 0/미측정 값을 합격으로 취급하지 않는다. diff --git a/docs/audio-requests.md b/docs/audio-requests.md index b0cf840..5dc80b0 100644 --- a/docs/audio-requests.md +++ b/docs/audio-requests.md @@ -20,3 +20,5 @@ 첫 퍼즐은 pickup/count/ui/success를 먼저 연결한다. 다른 효과음과 음악은 기능 확장 때 연결한다. 선택을 기다리는 동안 임시 소리·무음으로 기능을 검사하며 최종 음원 완료로 기록하지 않는다. 파일 또는 후보의 출처 링크와 사용 조건을 함께 받는다. 선택한 원본은 SourceAssets/Audio에 보관하고 편집본만 Unity에 연결한다. 초기 전달 형식은 음성·효과음 WAV PCM16 mono 44.1kHz, 음악 WAV PCM16 stereo 44.1kHz다. 원본이 다른 형식이어도 사용할 수 있다. 승인 없는 구매는 수행하지 않는다. + +T7 연결 상태: 기존 Voice/SFX/Music Mixer group에 direct AudioSource를 연결하고 합체/분리/계수/성공/선택/공급/힌트/UI hooks 및 발화 duck, navigation/pause 정리, 현재 theme 재개를 구현했다. 실제 SFX/BGM asset은 사용자의 추후 선택 대기이며 모든 clip=null이다. 합성 test-only AudioClip은 lifecycle 회귀에만 사용하고 runtime 대체 음원으로 채택하지 않았다. 실제 음원 재생·음악 3회 반복 청취/인수는 미실행·미완료다. diff --git a/docs/qwen-voice-register.md b/docs/qwen-voice-register.md index ff88767..649b714 100644 --- a/docs/qwen-voice-register.md +++ b/docs/qwen-voice-register.md @@ -104,3 +104,5 @@ runtime SHA256: | demo_composition | 570452e9fa15ec545b126cd8bdba504a3db6f30b74a95405ee228015368761e7 | 기존 승인 count01/guide_collect/guide_count는 동일 byte이며 기존 생성·승인·라이선스 기록은 변경하지 않았다. 새 후보에도 같은 로컬 모델/코드 라이선스가 적용된다. 효과음·음악은 생성하지 않았다. + +T7 2026-10-05 현재 채택: 기존3, 새 count_08(여덟.), 나머지40의 정확 SHA 사용자 청취 승인 기록을 SourceAssets/Audio/Voice/reviews 및 active-adoption.json에 연결했다. 현재 승인44/초안0. 이전 거절 take와 과거 draft manifests는 역사 원문으로 유지하며 현재 runtime 승인으로 소급 변조하지 않았다. diff --git a/tools/android/exercise-composition.ps1 b/tools/android/exercise-composition.ps1 index 087100d..326fe79 100644 --- a/tools/android/exercise-composition.ps1 +++ b/tools/android/exercise-composition.ps1 @@ -6,6 +6,7 @@ $adb=Join-Path $sdk 'platform-tools/adb.exe' $checks=[Collections.Generic.List[object]]::new(); $commands=[Collections.Generic.List[object]]::new(); $recorders=[Collections.Generic.List[object]]::new() $package='com.magnetismheroes.game'; $activity="$package/com.unity3d.player.UnityPlayerGameActivity"; $remote="/sdcard/Android/data/$package/files/progress.json" $result=[ordered]@{milestone='Composition';sourceCommit=(& git rev-parse HEAD);sourceDirty=[bool](& git status --porcelain);serial=$Serial;apkSha256=(Get-FileHash $ApkPath -Algorithm SHA256).Hash;status='failed';checks=@();commands=@()} +$result.rendererProjection=@{fieldOfView=62;fixedWorldPivot=@(0,.65,0);rawCamera='Saved Board.camera JSON remains canonical';viewport='Landscape wm size max/min; remaining UI and physical touch helper assume sole 2400x1080 AVD'} $networkBefore=$null $physicalInput=$false function Adb([string[]]$Arguments) { @@ -55,6 +56,18 @@ function Touch([int[]]$Contacts) { $commands.Add(@{command=('EmulatorController.sendTouch contacts='+($Contacts -join ','));exitCode=0}) } function SameJson($First,$Second) { return ($First | ConvertTo-Json -Depth 12 -Compress) -eq ($Second | ConvertTo-Json -Depth 12 -Compress) } +function BallPoint($Board,[string]$Id) { + $ball=@($Board.balls | Where-Object id -eq $Id)[0]; $camera=$Board.camera + $rotation=[Numerics.Quaternion]::new($camera.rotation.x,$camera.rotation.y,$camera.rotation.z,$camera.rotation.w) + $origin=[Numerics.Vector3]::new($camera.target.x,($camera.target.y+.65),$camera.target.z)+[Numerics.Vector3]::Transform([Numerics.Vector3]::new(0,0,-$camera.distance),$rotation) + $local=[Numerics.Vector3]::Transform([Numerics.Vector3]::new($ball.position.x,$ball.position.y,$ball.position.z)-$origin,[Numerics.Quaternion]::Inverse($rotation)) + $size=Adb @('shell','wm','size'); if ($size -notmatch '(\d+)x(\d+)') { throw "Unknown device resolution: $size" } + $width=[Math]::Max([int]$Matches[1],[int]$Matches[2]); $height=[Math]::Min([int]$Matches[1],[int]$Matches[2]) + $scale=($height/2)/([Math]::Tan(31*[Math]::PI/180)*$local.Z) + return @([int][Math]::Round(($width/2)+$local.X*$scale),[int][Math]::Round(($height/2)-$local.Y*$scale)) +} +function TapPoint([string]$Name,$Point) { Step $Name @('shell','input','tap',"$($Point[0])","$($Point[1])") } +function DragPoint([string]$Name,$Point,[int]$Dx,[int]$Dy=0) { Step $Name @('shell','input','swipe',"$($Point[0])","$($Point[1])","$($Point[0]+$Dx)","$($Point[1]+$Dy)",'650') } try { Check 'clean-source' (!$result.sourceDirty) $result.sourceCommit $build=Get-Content (Join-Path $EvidenceDir 'androidbuild-evidence.json') -Raw | ConvertFrom-Json @@ -75,41 +88,49 @@ try { Step 'six-initial-face-number' @('shell','input','tap','480','560') 1200 $sixBefore=Save 'six-before'; Check 'six-real-initial' ((($sixBefore.puzzleStates[0].groups | ForEach-Object {$_.ballIds.Count}) -join ',') -eq '1,1') 'Two initial singleton groups' # Hold real Android touch while observing the contact candidate; no runtime control server. - Touch @(1009,510,401,100); Start-Sleep -Milliseconds 100; Touch @(1291,510,401,100); Step 'six-contact-candidate' + $left=BallPoint $sixBefore.puzzleStates[0] $sixBefore.puzzleStates[0].balls[0].id + $right=BallPoint $sixBefore.puzzleStates[0] $sixBefore.puzzleStates[0].balls[1].id + $destination=@(($right[0]-45),$right[1]) + Touch @($left[0],$left[1],401,100); Start-Sleep -Milliseconds 100; Touch @($destination[0],$destination[1],401,100); Step 'six-contact-candidate' $preview=Save 'six-preview'; Check 'six-preview-not-saved' (SameJson $preview $sixBefore) 'Preview JSON equals committed initial JSON' - Touch @(1291,510,401,0); Step 'six-success-face-number' + Touch @($destination[0],$destination[1],401,0); Step 'six-success-face-number' $six=Save 'six-success'; Check 'six-final-two' ($six.completedStageIds -contains 6 -and $six.puzzleStates.Count -eq 0 -and $six.latestFreePlay.groups.Count -eq 1 -and $six.latestFreePlay.groups[0].ballIds.Count -eq 2) 'Completed6; one2 group; no unfinished' Check 'six-ids-preserved' ((($six.latestFreePlay.balls.id | Sort-Object) -join ',') -eq (($sixBefore.puzzleStates[0].balls.id | Sort-Object) -join ',')) 'All original IDs preserved' Fixture 10; StartAudio 'audio-guide-split' 12 Step 'ten-initial-face-number' @('shell','input','tap','1920','560') 1000 - Step 'ten-choose-friend' @('shell','input','tap','1120','510'); Step 'ten-split-mode' @('shell','input','tap','312','832') + $tenInitial=Save 'ten-initial'; $left=BallPoint $tenInitial.puzzleStates[0] $tenInitial.puzzleStates[0].balls[0].id; $right=BallPoint $tenInitial.puzzleStates[0] $tenInitial.puzzleStates[0].balls[1].id + TapPoint 'ten-choose-friend' $left; Step 'ten-split-mode' @('shell','input','tap','312','832') $tenBefore=Save 'ten-before' - Step 'ten-zero-selection-drag' @('shell','input','swipe','1120','510','850','510','500') + DragPoint 'ten-zero-selection-drag' $left -190 Check 'ten-zero-unchanged' (SameJson $tenBefore (Save 'ten-zero-after')) 'Zero selection preserves JSON' - Step 'ten-select-left' @('shell','input','tap','1120','510'); Step 'ten-select-right' @('shell','input','tap','1280','510') - Step 'ten-all-selection-drag' @('shell','input','swipe','1120','510','850','510','500') + TapPoint 'ten-select-left' $left; TapPoint 'ten-select-right' $right + DragPoint 'ten-all-selection-drag' $left -190 Check 'ten-all-unchanged' (SameJson $tenBefore (Save 'ten-all-after')) 'Entire selection preserves JSON' - Step 'ten-deselect-right' @('shell','input','tap','1280','510'); Step 'ten-selected-count-face-number' + TapPoint 'ten-deselect-right' $right; Step 'ten-selected-count-face-number' # Android injection preserves the out-of-window endpoint; emulator physical touch clamps its coordinates. - Step 'ten-outside-cancel' @('shell','input','swipe','1120','510','2500','510','650') + Step 'ten-outside-cancel' @('shell','input','swipe',"$($left[0])","$($left[1])",'2500',"$($left[1])",'650') Check 'ten-outside-cancel-unchanged' (SameJson $tenBefore (Save 'ten-outside-after')) 'Off-board release keeps committed JSON' - Step 'ten-select-again' @('shell','input','tap','1120','510'); Step 'ten-split-again' @('shell','input','tap','312','832'); Step 'ten-selection-again' @('shell','input','tap','1120','510') - Touch @(1120,510,421,100); Touch @(1030,510,421,100); Touch @(1390,510,422,100) - Touch @(1030,510,421,0,1390,510,422,0); Step 'ten-pinch-switch' + TapPoint 'ten-select-again' $left; Step 'ten-split-again' @('shell','input','tap','312','832'); TapPoint 'ten-selection-again' $left + Touch @($left[0],$left[1],421,100); Touch @(($left[0]-65),$left[1],421,100); Touch @(($right[0]+75),$right[1],422,100) + Touch @(($left[0]-65),$left[1],421,0,($right[0]+75),$right[1],422,0); Step 'ten-pinch-switch' $pinch=Save 'ten-pinch-after'; Check 'ten-pinch-no-split' ($pinch.puzzleStates[0].groups.Count -eq 1 -and (SameJson $pinch.puzzleStates[0].balls $tenBefore.puzzleStates[0].balls)) 'Pinch aborts split, all ball positions unchanged' # Return to unchanged committed camera by restarting from the fresh fixture before the successful split. - Fixture 10; Step 'ten-success-start' @('shell','input','tap','1920','560'); Step 'ten-success-choose' @('shell','input','tap','1120','510') - Step 'ten-success-split' @('shell','input','tap','312','832'); Step 'ten-success-select' @('shell','input','tap','1120','510') - Step 'ten-success-drag' @('shell','input','swipe','1120','510','850','510','650') + Fixture 10; Step 'ten-success-start' @('shell','input','tap','1920','560'); TapPoint 'ten-success-choose' $left + Step 'ten-success-split' @('shell','input','tap','312','832'); TapPoint 'ten-success-select' $left + DragPoint 'ten-success-drag' $left -190 $ten=Save 'ten-success'; Check 'ten-final-one-one-no-remerge' ($ten.completedStageIds -contains 10 -and $ten.puzzleStates.Count -eq 0 -and $ten.latestFreePlay.groups.Count -eq 2 -and @($ten.latestFreePlay.groups | Where-Object {$_.ballIds.Count -ne 1}).Count -eq 0) 'Completed10; exactly1,1; no auto-remerge' - Fixture 14; Step 'fourteen-initial' @('shell','input','tap','1200','366'); Step 'fourteen-choose-three' @('shell','input','tap','882','510') - Step 'fourteen-split-mode' @('shell','input','tap','312','832'); Step 'fourteen-select-end-one' @('shell','input','tap','882','510'); Step 'fourteen-select-end-two' @('shell','input','tap','1200','510') - Step 'fourteen-disconnected-selected' @(); Step 'fourteen-disconnected-split' @('shell','input','swipe','882','510','500','510','650') + Fixture 14; Step 'fourteen-initial' @('shell','input','tap','1200','366'); $initial=Save 'fourteen-initial-board' + $group=$initial.puzzleStates[0].groups[0]; $left=BallPoint $initial.puzzleStates[0] $group.ballIds[0]; $right=BallPoint $initial.puzzleStates[0] $group.ballIds[2] + TapPoint 'fourteen-choose-three' $left + Step 'fourteen-split-mode' @('shell','input','tap','312','832'); TapPoint 'fourteen-select-end-one' $left; TapPoint 'fourteen-select-end-two' $right + Step 'fourteen-disconnected-selected' @(); DragPoint 'fourteen-disconnected-split' $left -270 $fourteenBefore=Save 'fourteen-unfinished-before'; $sizes=@($fourteenBefore.puzzleStates[0].groups | ForEach-Object {$_.ballIds.Count} | Sort-Object) Check 'fourteen-disconnected-two-results' (($sizes -join ',') -eq '1,1,2') 'Selected disconnected ends form one2 friend; rest one1; original other1' Restart 'fourteen-restore'; Step 'fourteen-restore-selection' @('shell','input','tap','1200','616'); Step 'fourteen-restored' @('shell','input','tap','1200','366') Check 'fourteen-unfinished-restored' (SameJson $fourteenBefore (Save 'fourteen-unfinished-after')) 'All unfinished JSON including IDs positions groups camera restored' - Step 'fourteen-single-merge' @('shell','input','swipe','1041','510','1418','510','650') + $singles=@($fourteenBefore.puzzleStates[0].groups | Where-Object {$_.ballIds.Count -eq 1}) + $left=BallPoint $fourteenBefore.puzzleStates[0] $singles[0].ballIds[0]; $right=BallPoint $fourteenBefore.puzzleStates[0] $singles[1].ballIds[0] + Step 'fourteen-single-merge' @('shell','input','swipe',"$($left[0])","$($left[1])","$($right[0]-45)","$($right[1])",'650') $fourteen=Save 'fourteen-success'; Check 'fourteen-final-two-two' ($fourteen.completedStageIds -contains 14 -and $fourteen.puzzleStates.Count -eq 0 -and $fourteen.latestFreePlay.groups.Count -eq 2 -and @($fourteen.latestFreePlay.groups | Where-Object {$_.ballIds.Count -ne 2}).Count -eq 0) 'Exactly2,2 completes14 after split then merge' Restart 'free-restore'; Step 'free-restored' @('shell','input','tap','1200','810') Check 'free-json-restored' (SameJson $fourteen (Save 'free-after-restore')) 'Final free board restores all groups IDs positions camera' diff --git a/tools/android/exercise-content.ps1 b/tools/android/exercise-content.ps1 index 4e7b77e..ff7ece0 100644 --- a/tools/android/exercise-content.ps1 +++ b/tools/android/exercise-content.ps1 @@ -6,6 +6,7 @@ $package='com.magnetismheroes.game'; $activity="$package/com.unity3d.player.Unit $remote="/sdcard/Android/data/$package/files/progress.json" $checks=[Collections.Generic.List[object]]::new(); $commands=[Collections.Generic.List[object]]::new(); $recorders=[Collections.Generic.List[object]]::new() $result=[ordered]@{milestone='Content';sourceCommit=(& git rev-parse HEAD);sourceDirty=[bool](& git status --porcelain);serial=$Serial;apkSha256=(Get-FileHash -LiteralPath $ApkPath -Algorithm SHA256).Hash;status='failed'} +$result.rendererProjection=@{fieldOfView=62;fixedWorldPivot=@(0,.65,0);rawCamera='Saved Board.camera JSON remains canonical';viewport='Landscape wm size max/min; remaining UI and physical touch helper assume sole 2400x1080 AVD'} $networkBefore=$null function Adb([string[]]$Arguments) { $output=& $adb -s $Serial @Arguments 2>&1; $code=$LASTEXITCODE @@ -23,10 +24,12 @@ function Same($First,$Second) { return ($First | ConvertTo-Json -Depth 12 -Compr function BallPoint($Board,[string]$Id) { $ball=@($Board.balls | Where-Object id -eq $Id)[0]; $camera=$Board.camera $rotation=[Numerics.Quaternion]::new($camera.rotation.x,$camera.rotation.y,$camera.rotation.z,$camera.rotation.w) - $origin=[Numerics.Vector3]::new($camera.target.x,$camera.target.y,$camera.target.z)+[Numerics.Vector3]::Transform([Numerics.Vector3]::new(0,0,-$camera.distance),$rotation) + $origin=[Numerics.Vector3]::new($camera.target.x,($camera.target.y+.65),$camera.target.z)+[Numerics.Vector3]::Transform([Numerics.Vector3]::new(0,0,-$camera.distance),$rotation) $local=[Numerics.Vector3]::Transform([Numerics.Vector3]::new($ball.position.x,$ball.position.y,$ball.position.z)-$origin,[Numerics.Quaternion]::Inverse($rotation)) - $scale=540/([Math]::Tan(23*[Math]::PI/180)*$local.Z) - return @([int][Math]::Round(1200+$local.X*$scale),[int][Math]::Round(540-$local.Y*$scale)) + $size=Adb @('shell','wm','size'); if ($size -notmatch '(\d+)x(\d+)') { throw "Unknown device resolution: $size" } + $width=[Math]::Max([int]$Matches[1],[int]$Matches[2]); $height=[Math]::Min([int]$Matches[1],[int]$Matches[2]) + $scale=($height/2)/([Math]::Tan(31*[Math]::PI/180)*$local.Z) + return @([int][Math]::Round(($width/2)+$local.X*$scale),[int][Math]::Round(($height/2)-$local.Y*$scale)) } function TapBall([string]$Name,$Board,[string]$Id) { $point=BallPoint $Board $Id; Step $Name @('shell','input','tap',"$($point[0])","$($point[1])") } function StagePoint([int]$Id) { $index=$Id-1; return @([int][Math]::Round((.12+($index%6)*.152)*2400),[int][Math]::Round((1-(.76-[Math]::Floor($index/6)*.123))*1080)) } diff --git a/tools/android/exercise-persistence.ps1 b/tools/android/exercise-persistence.ps1 index 9d47d12..84bee8a 100644 --- a/tools/android/exercise-persistence.ps1 +++ b/tools/android/exercise-persistence.ps1 @@ -6,6 +6,7 @@ $package='com.magnetismheroes.game'; $activity="$package/com.unity3d.player.Unit $remote="/sdcard/Android/data/$package/files/progress.json" $checks=[Collections.Generic.List[object]]::new(); $commands=[Collections.Generic.List[object]]::new() $result=[ordered]@{milestone='Persistence';sourceCommit=(& git rev-parse HEAD);sourceDirty=[bool](& git status --porcelain);serial=$Serial;apkSha256=(Get-FileHash -LiteralPath $ApkPath -Algorithm SHA256).Hash;status='failed'} +$result.rendererProjection=@{fieldOfView=62;fixedWorldPivot=@(0,.65,0);rawCamera='Saved Board.camera JSON remains canonical';viewport='Landscape wm size max/min; remaining UI and physical touch helper assume sole 2400x1080 AVD'} $physicalInput=$false function Adb([string[]]$Arguments) { $output=& $adb -s $Serial @Arguments 2>&1; $code=$LASTEXITCODE @@ -40,10 +41,12 @@ function Touch([int[]]$Contacts) { function BallPoint($Board,[string]$Id) { $ball=@($Board.balls | Where-Object id -eq $Id)[0]; $camera=$Board.camera $rotation=[Numerics.Quaternion]::new($camera.rotation.x,$camera.rotation.y,$camera.rotation.z,$camera.rotation.w) - $origin=[Numerics.Vector3]::new($camera.target.x,$camera.target.y,$camera.target.z)+[Numerics.Vector3]::Transform([Numerics.Vector3]::new(0,0,-$camera.distance),$rotation) + $origin=[Numerics.Vector3]::new($camera.target.x,($camera.target.y+.65),$camera.target.z)+[Numerics.Vector3]::Transform([Numerics.Vector3]::new(0,0,-$camera.distance),$rotation) $local=[Numerics.Vector3]::Transform([Numerics.Vector3]::new($ball.position.x,$ball.position.y,$ball.position.z)-$origin,[Numerics.Quaternion]::Inverse($rotation)) - $scale=540/([Math]::Tan(23*[Math]::PI/180)*$local.Z) - return @([int][Math]::Round(1200+$local.X*$scale),[int][Math]::Round(540-$local.Y*$scale)) + $size=Adb @('shell','wm','size'); if ($size -notmatch '(\d+)x(\d+)') { throw "Unknown device resolution: $size" } + $width=[Math]::Max([int]$Matches[1],[int]$Matches[2]); $height=[Math]::Min([int]$Matches[1],[int]$Matches[2]) + $scale=($height/2)/([Math]::Tan(31*[Math]::PI/180)*$local.Z) + return @([int][Math]::Round(($width/2)+$local.X*$scale),[int][Math]::Round(($height/2)-$local.Y*$scale)) } function TapBall([string]$Name,$Board,[string]$Id) { $point=BallPoint $Board $Id; Step $Name @('shell','input','tap',"$($point[0])","$($point[1])") } function SelectStage([string]$Name,[int]$Id) {