diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset index 5e13b07f..dd937333 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -12,9 +12,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3} m_Name: LevelState_1 m_EditorClassIdentifier: - levelStep: 14 + levelStep: 9 mapLevel: 1 - currentPoint: {x: 13, y: 1} + currentPoint: {x: 8, y: 1} levelSaveMap: - levelDataList: - roomType: 13 @@ -79,8 +79,8 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: weak enemyList: + - Gravitus - RatWarrior - - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -101,8 +101,8 @@ MonoBehaviour: - {x: 2, y: 2} fightEenemyPool: weak enemyList: - - RatWarrior - - Pharmacist + - LivingArmor + - FailedSample extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -119,8 +119,8 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: weak enemyList: - - Gravitus - RatWarrior + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -144,14 +144,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 9 - roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3} isUse: 1 passBy: 1 nodePos: {x: -4.579153, y: 0.059732437, z: -6.4491076} line: 2 column: 1 - roomDestinationIndex: 12 + roomDestinationIndex: 13 fatherLevelNodes: - {x: 1, y: 1} nextLevelNodes: @@ -213,8 +213,8 @@ MonoBehaviour: - {x: 4, y: 1} fightEenemyPool: weak enemyList: + - Gravitus - RatWarrior - - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -232,21 +232,21 @@ MonoBehaviour: - {x: 4, y: 2} fightEenemyPool: weak enemyList: + - Gravitus - RatWarrior - - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 10 - roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3} + - roomType: 12 + roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3} isUse: 1 passBy: 0 nodePos: {x: -0.57917356, y: 0.059755325, z: -8.949106} line: 4 column: 0 - roomDestinationIndex: 11 + roomDestinationIndex: 15 fatherLevelNodes: - {x: 3, y: 0} nextLevelNodes: @@ -257,14 +257,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} isUse: 1 passBy: 1 nodePos: {x: -0.57917595, y: 0.059755325, z: -6.4491076} line: 4 column: 1 - roomDestinationIndex: 9 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 3, y: 1} nextLevelNodes: @@ -275,14 +275,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 9 - roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} + - roomType: 11 + roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3} isUse: 1 passBy: 0 nodePos: {x: -0.57917786, y: 0.059757233, z: -3.9491086} line: 4 column: 2 - roomDestinationIndex: 12 + roomDestinationIndex: 13 fatherLevelNodes: - {x: 3, y: 2} nextLevelNodes: @@ -359,8 +359,9 @@ MonoBehaviour: nextLevelNodes: [] fightEenemyPool: strong enemyList: - - Thief - - PrismReflector + - RatWarrior + - FailedSample + - Pharmacist extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -381,8 +382,9 @@ MonoBehaviour: - {x: 7, y: 2} fightEenemyPool: strong enemyList: - - PollutionSpreader - - Gravitus + - Twinbee + - ReconnaissanceBee + - PrismReflector extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -406,14 +408,14 @@ MonoBehaviour: extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 11 - roomSprite: {fileID: 21300000, guid: 5edbcfc45fbb4b2428e4f2782201afad, type: 3} + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 passBy: 0 nodePos: {x: 5.420813, y: 0.059789658, z: -8.949108} line: 7 column: 0 - roomDestinationIndex: 13 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -424,14 +426,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 12 - roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3} + - roomType: 10 + roomSprite: {fileID: 21300000, guid: 4bba0a3acc15faf4a8b904c7c0a781e2, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: 5.420813, y: 0.059789658, z: -6.4491086} line: 7 column: 1 - roomDestinationIndex: 15 + roomDestinationIndex: 11 fatherLevelNodes: - {x: 6, y: 1} nextLevelNodes: @@ -445,7 +447,7 @@ MonoBehaviour: - roomType: 4 roomSprite: {fileID: 21300000, guid: e2a576b37ecc9ee4a92a1595d55eeb41, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 5.420813, y: 0.059791565, z: -3.9491115} line: 7 column: 2 @@ -484,7 +486,7 @@ MonoBehaviour: - roomType: 0 roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 - passBy: 0 + passBy: 1 nodePos: {x: 7.4208164, y: 0.0598011, z: -6.4491076} line: 8 column: 1 @@ -494,9 +496,9 @@ MonoBehaviour: - {x: 9, y: 1} fightEenemyPool: strong enemyList: - - RatWarrior - - FailedSample - - Pharmacist + - Twinbee + - ReconnaissanceBee + - PrismReflector extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -504,7 +506,7 @@ MonoBehaviour: - roomType: 1 roomSprite: {fileID: 21300000, guid: f3df96407bf665b4d8cd8f13dfb3d6d0, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 7.4208174, y: 0.05980301, z: -3.9491105} line: 8 column: 2 @@ -514,22 +516,22 @@ MonoBehaviour: - {x: 9, y: 2} fightEenemyPool: elite enemyList: + - Pollutinel + - Pollutinel - ContaminatusImmortalis - - ContaminatusImmortalis - - PrismReflector extraEnemyList: [] mapIndex: 100001 extraMapIndex: isExtra: 0 - levelDataList: - - roomType: 12 - roomSprite: {fileID: 21300000, guid: 6b27bdf9c297a274f95e945a248a7668, type: 3} + - roomType: 6 + roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.420822, y: 0.059812546, z: -8.949106} line: 9 column: 0 - roomDestinationIndex: 15 + roomDestinationIndex: 3 fatherLevelNodes: - {x: 8, y: 0} nextLevelNodes: @@ -540,14 +542,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 8 - roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} + - roomType: 9 + roomSprite: {fileID: 21300000, guid: e1cef9e8ec9cfc14e923f6d03f19f7af, type: 3} isUse: 1 passBy: 0 nodePos: {x: 9.420824, y: 0.059812546, z: -6.4491076} line: 9 column: 1 - roomDestinationIndex: 9 + roomDestinationIndex: 12 fatherLevelNodes: - {x: 8, y: 1} nextLevelNodes: @@ -558,14 +560,14 @@ MonoBehaviour: mapIndex: extraMapIndex: isExtra: 0 - - roomType: 6 - roomSprite: {fileID: 21300000, guid: dc3014f38b95b24448577e14bee06967, type: 3} + - roomType: 8 + roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 9.420826, y: 0.059814453, z: -3.9491086} line: 9 column: 2 - roomDestinationIndex: 3 + roomDestinationIndex: 9 fatherLevelNodes: - {x: 8, y: 2} nextLevelNodes: @@ -590,8 +592,8 @@ MonoBehaviour: fightEenemyPool: strong enemyList: - RatWarrior - - FailedSample - - Pharmacist + - RatWarrior + - LivingArmor extraEnemyList: [] mapIndex: 100001 extraMapIndex: @@ -599,7 +601,7 @@ MonoBehaviour: - roomType: 0 roomSprite: {fileID: 21300000, guid: b8a209883c3910b4199ecc6bd1beebbd, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 11.420842, y: 0.05982399, z: -6.4491076} line: 10 column: 1 @@ -634,8 +636,9 @@ MonoBehaviour: - PollutionSpreader - PollutionSpreader extraEnemyList: - - Thief - - PrismReflector + - RatWarrior + - RatWarrior + - LivingArmor mapIndex: 100001 extraMapIndex: 100001 isExtra: 0 @@ -659,7 +662,7 @@ MonoBehaviour: - roomType: 8 roomSprite: {fileID: 21300000, guid: 8c256e576311e0440a140e4be2ec9e51, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 13.420856, y: 0.059835434, z: -6.4491067} line: 11 column: 1 @@ -710,7 +713,7 @@ MonoBehaviour: - roomType: 5 roomSprite: {fileID: 21300000, guid: 4b752f8ca710d6f4c837a1396184e644, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 15.420868, y: 0.059846878, z: -6.4491076} line: 12 column: 1 @@ -766,7 +769,7 @@ MonoBehaviour: - roomType: 3 roomSprite: {fileID: 21300000, guid: 01fefd0475d0278479d34f4c72ce2525, type: 3} isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: 17.420897, y: 0.059858322, z: -6.4491076} line: 13 column: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs index dc73b119..a24fdc2b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/ScenceLoadManager.cs @@ -24,7 +24,7 @@ public class ScenceLoadManager : Singleton //Çл»bgm AudioManager.Instance.BGMSwitch(levelIndex); //Çл»³¡¾° - //loadScreen.SetActive(true); + loadScreen.SetActive(true); AsyncOperation operation = SceneManager.LoadSceneAsync(levelIndex); operation.allowSceneActivation = false;