Merge remote-tracking branch 'origin/notemovement'

RhythmKata/Assets/Resources/Level/Precision Strike.asset

@@ -12,6 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9da68daca0d18d643a5342861db4e4df, type: 3}
   m_Name: Precision Strike
   m_EditorClassIdentifier: Assembly-CSharp:Core:LevelScriptableObject
+  title: Precision Strike
+  image: {fileID: 21300000, guid: 59df497dae69b0b42ac354c2c9ea8898, type: 3}
   bms: {fileID: -8350457297130525221, guid: bbd833f16d7e27749bf4697b9530280f, type: 3}
   audioFile: {fileID: 8300000, guid: 51adb37087ebecf4d96fb77577c2312c, type: 3}
   offsetBarTime: 0

RhythmKata/Assets/Resources/Level/precision strike.jpg.meta

+fileFormatVersion: 2
+guid: 59df497dae69b0b42ac354c2c9ea8898
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

RhythmKata/Assets/Resources/Level/test.asset

@@ -12,6 +12,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9da68daca0d18d643a5342861db4e4df, type: 3}
   m_Name: test
   m_EditorClassIdentifier: Assembly-CSharp:Core:LevelScriptableObject
+  title: test
+  image: {fileID: 0}
   bms: {fileID: -3578495943587161340, guid: 902bbdf1e37cea640b6168c6f0772ddb, type: 3}
   audioFile: {fileID: 8300000, guid: f9e42d55c607b48418a7128b95607984, type: 3}
   offsetBarTime: 0

RhythmKata/Assets/Scripts/Core/LevelScriptableObject.cs

@@ -3,6 +3,8 @@
 [CreateAssetMenu(fileName = "New Level", menuName = "Level", order = 1)]
 public class LevelScriptableObject : ScriptableObject
 {
+    public string title;
+    public Sprite image;
     public TextAsset bms;
     public AudioClip audioFile;
     public double offsetBarTime = 0;

RhythmKata/Assets/Scripts/IngameUIManager.cs

@@ -3,6 +3,13 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
+public enum UISetType
+{
+    INGAME,
+    SELECTION,
+    RESULT
+}
+
 public class IngameUIManager : SingletonBehaviour<IngameUIManager>
 {
     public GameObject ringUIPrefab;
@@ -11,9 +18,19 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
     public Text comboText;
     private Vector3 comboTextPosition;
 
+    private int musicIdx = 0;
+    public Image prevMusicImage, nextMusicImage, curMusicImage;
+    public Text musicNameText;
+
+    public List<GameObject> UISetList = new List<GameObject>();
+
+    public Text perfectCountText, hitCountText, missCountText, scoreResultText, maxComboText;
+
     private void Start()
     {
         NoteObject.OnNoteHit += OnNoteHit;
+        ChangeUISet(UISetType.SELECTION);
+        OnChangeMusicButtonClicked(0);
     }
     public void OnNoteHit(JudgeResult type)
     {
@@ -47,4 +64,55 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
         }
         comboText.transform.localPosition = Vector3.zero;
     }
+
+    public void OnChangeMusicButtonClicked(int delta)
+    {
+        int musicCount = PlayEngine.inst.levelList.Length;
+        musicIdx += delta;
+        if (musicIdx < 0)
+        {
+            musicIdx = musicCount - 1;
+        }
+        else if (musicIdx > musicCount - 1)
+        {
+            musicIdx = 0;
+        }
+        LevelScriptableObject cur = PlayEngine.inst.levelList[musicIdx];
+        LevelScriptableObject prev = PlayEngine.inst.levelList[musicIdx - 1 >= 0 ? musicIdx - 1 : musicCount - 1];
+        LevelScriptableObject next = PlayEngine.inst.levelList[musicIdx + 1 < musicCount ? musicIdx + 1 : 0];
+
+        prevMusicImage.sprite = prev.image;
+        curMusicImage.sprite = cur.image;
+        nextMusicImage.sprite = next.image;
+
+        musicNameText.text ="♪ " + cur.title;
+    }
+    public void OnStartButtonClicked()
+    {
+        PlayEngine.inst.LoadAndPlay(musicIdx);
+        ChangeUISet(UISetType.INGAME);
+    }
+
+
+    public void ChangeUISet(UISetType type)
+    {
+        ChangeUISet((int)type);
+    }
+    public void ChangeUISet(int idx)
+    {
+        foreach(var set in UISetList)
+        {
+            set.SetActive(false);
+        }
+        UISetList[idx].SetActive(true);
+    }
+
+    public void UpdateResultUIs(int perfect, int hit, int miss, int score, int combo)
+    {
+        perfectCountText.text = perfect.ToString();
+        hitCountText.text = hit.ToString();
+        missCountText.text = miss.ToString();
+        scoreResultText.text = score.ToString();
+        maxComboText.text = "x " + combo.ToString();
+    }
 }

RhythmKata/Assets/Scripts/PlayEngine.cs

@@ -50,7 +50,7 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
     public void Start()
     {
         audioSource = GetComponent<AudioSource>();
-        LoadAndPlay(0);
+        //LoadAndPlay(0);
     }
 
     public void LoadAndPlay(int idx)