武器系统改版

ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset

@@ -30,7 +30,7 @@ MonoBehaviour:
       mapIndex: 
     - roomType: 13
       isUse: 1
-      passBy: 0
+      passBy: 1
       nodePos: {x: -7.583021, y: 0.059706688, z: -6.669104}
       line: 0
       column: 1
@@ -62,8 +62,7 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
-      - 2002
+      - 2001
-      - 2002
       mapIndex: 100001
     - roomType: 0
       isUse: 1
@@ -79,7 +78,8 @@ MonoBehaviour:
       - {x: 2, y: 2}
       fightEenemyPool: weak
       enemyList:
-      - 2003
+      - 2002
+      - 2002
       mapIndex: 100001
     - roomType: 0
       isUse: 0
@@ -91,13 +91,10 @@ MonoBehaviour:
       nextLevelNodes: []
       fightEenemyPool: weak
       enemyList:
-      - 2004
+      - 2001
-      - 2005
+      mapIndex: 100001
-      - 2003
-      - 2003
-      mapIndex: 100004
   - levelDataList:
-    - roomType: 9
+    - roomType: 12
       isUse: 1
       passBy: 0
       nodePos: {x: -3.5830479, y: 0.05972004, z: -7.669102}
@@ -110,7 +107,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 4
+    - roomType: 6
       isUse: 1
       passBy: 0
       nodePos: {x: -3.5830517, y: 0.059721947, z: -6.669105}
@@ -150,7 +147,7 @@ MonoBehaviour:
       enemyList:
       - 2002
       - 2002
-      mapIndex: 100002
+      mapIndex: 100001
     - roomType: 0
       isUse: 1
       passBy: 0
@@ -180,9 +177,9 @@ MonoBehaviour:
       enemyList:
       - 2002
       - 2002
-      mapIndex: 100001
+      mapIndex: 100002
   - levelDataList:
-    - roomType: 8
+    - roomType: 10
       isUse: 1
       passBy: 0
       nodePos: {x: 0.41692686, y: 0.0597353, z: -7.669103}
@@ -195,7 +192,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 12
+    - roomType: 8
       isUse: 1
       passBy: 0
       nodePos: {x: 0.41692448, y: 0.059737206, z: -6.669104}
@@ -208,7 +205,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 8
+    - roomType: 4
       isUse: 1
       passBy: 0
       nodePos: {x: 0.41692352, y: 0.059739113, z: -5.669106}
@@ -271,7 +268,7 @@ MonoBehaviour:
       fightEenemyPool: strong
       enemyList: []
       mapIndex: 
-    - roomType: 0
+    - roomType: 2
       isUse: 1
       passBy: 0
       nodePos: {x: 4.4169207, y: 0.059752464, z: -6.669105}
@@ -283,7 +280,7 @@ MonoBehaviour:
       - {x: 7, y: 1}
       - {x: 7, y: 0}
       - {x: 7, y: 2}
-      fightEenemyPool: strong
+      fightEenemyPool: 
       enemyList: []
       mapIndex: 
     - roomType: 0
@@ -298,7 +295,7 @@ MonoBehaviour:
       enemyList: []
       mapIndex: 
   - levelDataList:
-    - roomType: 10
+    - roomType: 8
       isUse: 1
       passBy: 0
       nodePos: {x: 6.4169235, y: 0.059758186, z: -7.669102}
@@ -311,7 +308,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 6
+    - roomType: 9
       isUse: 1
       passBy: 0
       nodePos: {x: 6.416924, y: 0.059760094, z: -6.669105}
@@ -324,7 +321,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 4
+    - roomType: 10
       isUse: 1
       passBy: 0
       nodePos: {x: 6.416925, y: 0.059762, z: -5.669108}
@@ -375,7 +372,7 @@ MonoBehaviour:
       enemyList: []
       mapIndex: 
   - levelDataList:
-    - roomType: 6
+    - roomType: 9
       isUse: 1
       passBy: 0
       nodePos: {x: 10.41694, y: 0.059773445, z: -7.669103}
@@ -388,7 +385,7 @@ MonoBehaviour:
       fightEenemyPool: 
       enemyList: []
       mapIndex: 
-    - roomType: 9
+    - roomType: 4
       isUse: 1
       passBy: 0
       nodePos: {x: 10.416943, y: 0.059775352, z: -6.669104}
@@ -426,7 +423,7 @@ MonoBehaviour:
       fightEenemyPool: strong
       enemyList: []
       mapIndex: 
-    - roomType: 2
+    - roomType: 0
       isUse: 1
       passBy: 0
       nodePos: {x: 12.416956, y: 0.059782982, z: -6.669105}
@@ -438,7 +435,7 @@ MonoBehaviour:
       - {x: 9, y: 2}
       nextLevelNodes:
       - {x: 11, y: 1}
-      fightEenemyPool: 
+      fightEenemyPool: strong
       enemyList: []
       mapIndex: 
     - roomType: 0

ColorlessWorld-2024-4-2/Assets/Scripts/GameManager.cs

@@ -640,16 +640,22 @@ public class GameManager : Singleton<GameManager>
 
         for(int i = 0; i < playerState.canColorCount ; i++)
         {
+            if (whiteMapUnities.Count <= 0)
+            {
+                break;
+            }
             int index = UnityEngine.Random.Range(0, whiteMapUnities.Count );
-
             whiteMapUnities[index].switchColor(PlayerStatsManager.Instance.colorSortList[UnityEngine.Random.Range(0, 3)]);
             whiteMapUnities.RemoveAt(index);
             yield return null;
         }
         for (int i = 0; i < 20; i++)
         {
+            if(whiteMapUnities.Count<=0)
+            {
+                break;
+            }
             int index = UnityEngine.Random.Range(0, whiteMapUnities.Count);
-
             whiteMapUnities[index].switchColor(Name.stringColorToint (Name .Color .Black ));
             whiteMapUnities.RemoveAt(index);
             yield return null;

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/UI.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/UI/MouseSetActiveUI.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class MouseSetActiveUI : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    public GameObject gameObject;
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+       gameObject.SetActive(true);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        gameObject .SetActive (false);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/UI/MouseSetActiveUI.cs.meta

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