Merge remote-tracking branch 'origin/map'

Assets/Resources/stages/stage1_5.json

+{"objects":[{"tag":0,"xPos":10.0,"yPos":0.0},{"tag":3,"xPos":0.5,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":9,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":4,"xPos":0.0,"yPos":-1.0}],"clears":[{"type":0,"goal":2}],"cases":[],"bullets":[1],"comments":""}
\ No newline at end of file

Assets/Resources/stages/stage1_5.json.meta

+fileFormatVersion: 2
+guid: 4b068fe8eb3b7914780b06dca7247d5d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/stages/stage3_6.json

+{"objects":[{"tag":0,"xPos":125.0,"yPos":0.0},{"tag":2,"xPos":-1.0,"yPos":-1.5},{"tag":2,"xPos":-0.5,"yPos":-1.0},{"tag":3,"xPos":-1.0,"yPos":-0.5},{"tag":2,"xPos":0.5,"yPos":-1.0},{"tag":2,"xPos":1.0,"yPos":-1.5},{"tag":3,"xPos":1.0,"yPos":0.5},{"tag":2,"xPos":0.5,"yPos":1.0},{"tag":2,"xPos":1.5,"yPos":-2.0},{"tag":2,"xPos":-1.5,"yPos":1.0},{"tag":2,"xPos":2.0,"yPos":-0.5},{"tag":2,"xPos":1.5,"yPos":2.0},{"tag":2,"xPos":-1.5,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":0.0},{"tag":1,"xPos":0.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":0.0},{"tag":1,"xPos":-1.0,"yPos":-1.0},{"tag":1,"xPos":-2.0,"yPos":-2.0},{"tag":1,"xPos":-1.0,"yPos":-2.0},{"tag":1,"xPos":0.0,"yPos":-1.0},{"tag":1,"xPos":0.0,"yPos":-2.0},{"tag":9,"xPos":0.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":-1.0},{"tag":1,"xPos":2.0,"yPos":-1.0},{"tag":1,"xPos":2.0,"yPos":-2.0},{"tag":1,"xPos":1.0,"yPos":0.0},{"tag":1,"xPos":2.0,"yPos":0.0},{"tag":1,"xPos":1.0,"yPos":1.0},{"tag":1,"xPos":1.0,"yPos":2.0},{"tag":1,"xPos":0.0,"yPos":2.0},{"tag":1,"xPos":-1.0,"yPos":2.0},{"tag":1,"xPos":-1.0,"yPos":1.0},{"tag":1,"xPos":2.0,"yPos":1.0},{"tag":1,"xPos":-2.0,"yPos":1.0},{"tag":4,"xPos":-2.0,"yPos":-2.0},{"tag":6,"xPos":0.0,"yPos":0.0},{"tag":5,"xPos":2.0,"yPos":-2.0}],"clears":[{"type":0,"goal":1}],"cases":[0],"bullets":[1,1],"comments":""}
\ No newline at end of file

Assets/Resources/stages/stage3_6.json.meta

+fileFormatVersion: 2
+guid: ecdc62db53252b74e941be358fbe04fb
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/MapEditor.unity

@@ -253,6 +253,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2028998455926151720, guid: 06619682524bc5149b5c3092da0722f2,
+        type: 3}
+      propertyPath: m_Options.m_Options.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2028998455926151720, guid: 06619682524bc5149b5c3092da0722f2,
+        type: 3}
+      propertyPath: m_Options.m_Options.Array.data[3].m_Text
+      value: Option C
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 06619682524bc5149b5c3092da0722f2, type: 3}
 --- !u!1001 &463381731

Assets/Scenes/SelectStage.unity

@@ -487,6 +487,16 @@ PrefabInstance:
       propertyPath: categoryCounts.Array.data[1]
       value: 4
       objectReference: {fileID: 0}
+    - target: {fileID: 5996849666618765155, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
+        type: 3}
+      propertyPath: categoryCounts.Array.data[0]
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5996849666618765155, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
+        type: 3}
+      propertyPath: categoryCounts.Array.data[2]
+      value: 6
+      objectReference: {fileID: 0}
     - target: {fileID: 5087174722634247129, guid: 8115fd4d1a1025b4fb05e45fc5fa6578,
         type: 3}
       propertyPath: m_AnchorMax.x

Assets/Scripts/Managers/MapManager.cs

@@ -86,7 +86,7 @@ public class MapManager : SingletonBehaviour<MapManager>
             PlayerController.inst.CreatePlayer(currentMap.startFloors[i]);
         for (int i = 0; i < loadedMapData.bullets.Count; i++)
             PlayerController.inst.AddBullet(loadedMapData.bullets[i]);
-        if (loadedMapData.comments != null)
+        if (loadedMapData.comments != null && loadedMapData.comments != "")
         {
             currentMap.comments = loadedMapData.comments;
             GameManager.inst.commentUIGenerator.SetComment(currentMap.comments);