diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/TNTBurket.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/TNTBurket.asset index ab10d013..e93e7c18 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/TNTBurket.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/TNTBurket.asset @@ -16,7 +16,7 @@ MonoBehaviour: enemyIcon: {fileID: 0} stepRange: 0 stepRangeMultiplier: 1 - speed: 0 + speed: 2 maxMoveCoolDown: 0 currentMoveCoolDown: 0 shieldValue: 0 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 8f1447aa..bdfc399e 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: LevelState_1 m_EditorClassIdentifier: levelStep: 0 + mapLevel: 0 currentPoint: {x: 0, y: 2} levelSaveMap: - levelDataList: @@ -24,6 +25,8 @@ MonoBehaviour: column: 0 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 passBy: 0 @@ -34,15 +37,19 @@ MonoBehaviour: nextLevelNodes: - {x: 1, y: 1} - {x: 1, y: 0} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 - passBy: 1 + passBy: 0 nodePos: {x: -7.583029, y: 0.05970955, z: -6.679107} line: 0 column: 2 fatherLevelNodes: [] nextLevelNodes: - {x: 1, y: 3} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 passBy: 0 @@ -51,8 +58,10 @@ MonoBehaviour: column: 3 fatherLevelNodes: [] nextLevelNodes: - - {x: 1, y: 3} - {x: 1, y: 4} + - {x: 1, y: 3} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 0 passBy: 0 @@ -61,8 +70,10 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 3 + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: -5.4530487, y: 0.059719086, z: -8.679108} @@ -71,8 +82,10 @@ MonoBehaviour: fatherLevelNodes: - {x: 0, y: 1} nextLevelNodes: - - {x: 2, y: 1} - - roomType: 0 + - {x: 2, y: 0} + fightEenemyPool: + mapIndex: + - roomType: 5 isUse: 1 passBy: 0 nodePos: {x: -5.4530506, y: 0.059720993, z: -7.679108} @@ -81,7 +94,9 @@ MonoBehaviour: fatherLevelNodes: - {x: 0, y: 1} nextLevelNodes: - - {x: 2, y: 2} + - {x: 2, y: 1} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 0 passBy: 0 @@ -90,7 +105,9 @@ MonoBehaviour: column: 2 fatherLevelNodes: [] nextLevelNodes: [] - - roomType: 5 + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: -5.45306, y: 0.059724808, z: -5.679114} @@ -100,9 +117,10 @@ MonoBehaviour: - {x: 0, y: 2} - {x: 0, y: 3} nextLevelNodes: - - {x: 2, y: 2} - - {x: 2, y: 4} - - roomType: 0 + - {x: 2, y: 3} + fightEenemyPool: + mapIndex: + - roomType: 5 isUse: 1 passBy: 0 nodePos: {x: -5.453064, y: 0.059726715, z: -4.679116} @@ -112,45 +130,56 @@ MonoBehaviour: - {x: 0, y: 3} nextLevelNodes: - {x: 2, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 5 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: -3.3230686, y: 0.059732437, z: -8.679108} line: 2 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 3 - isUse: 1 - passBy: 0 - nodePos: {x: -3.3230724, y: 0.059734344, z: -7.679109} - line: 2 - column: 1 fatherLevelNodes: - {x: 1, y: 0} nextLevelNodes: - {x: 3, y: 0} - - roomType: 5 + fightEenemyPool: + mapIndex: + - roomType: 3 isUse: 1 passBy: 0 - nodePos: {x: -3.3230762, y: 0.05973625, z: -6.679111} + nodePos: {x: -3.3230724, y: 0.059734344, z: -7.679109} line: 2 - column: 2 + column: 1 fatherLevelNodes: - {x: 1, y: 1} - - {x: 1, y: 3} nextLevelNodes: - - {x: 3, y: 1} - {x: 3, y: 2} - - roomType: 5 + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 0 passBy: 0 - nodePos: {x: -3.32308, y: 0.05973816, z: -5.679112} + nodePos: {x: -3.3230762, y: 0.05973625, z: -6.679111} line: 2 - column: 3 + column: 2 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: + - roomType: 3 + isUse: 1 + passBy: 0 + nodePos: {x: -3.32308, y: 0.05973816, z: -5.679112} + line: 2 + column: 3 + fatherLevelNodes: + - {x: 1, y: 3} + nextLevelNodes: + - {x: 3, y: 3} + - {x: 3, y: 2} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 passBy: 0 @@ -158,32 +187,34 @@ MonoBehaviour: line: 2 column: 4 fatherLevelNodes: - - {x: 1, y: 3} - {x: 1, y: 4} nextLevelNodes: - - {x: 3, y: 3} - {x: 3, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 5 + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: -1.1930923, y: 0.05974579, z: -8.679106} line: 3 column: 0 fatherLevelNodes: - - {x: 2, y: 1} + - {x: 2, y: 0} nextLevelNodes: - {x: 4, y: 0} - - roomType: 0 - isUse: 1 + fightEenemyPool: + mapIndex: + - roomType: 4 + isUse: 0 passBy: 0 nodePos: {x: -1.1930962, y: 0.059747696, z: -7.679107} line: 3 column: 1 - fatherLevelNodes: - - {x: 2, y: 2} - nextLevelNodes: - - {x: 4, y: 0} + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 5 isUse: 1 passBy: 0 @@ -191,9 +222,13 @@ MonoBehaviour: line: 3 column: 2 fatherLevelNodes: - - {x: 2, y: 2} + - {x: 2, y: 1} + - {x: 2, y: 3} nextLevelNodes: + - {x: 4, y: 3} - {x: 4, y: 2} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 passBy: 0 @@ -201,9 +236,11 @@ MonoBehaviour: line: 3 column: 3 fatherLevelNodes: - - {x: 2, y: 4} + - {x: 2, y: 3} nextLevelNodes: - {x: 4, y: 4} + fightEenemyPool: + mapIndex: - roomType: 5 isUse: 1 passBy: 0 @@ -214,6 +251,8 @@ MonoBehaviour: - {x: 2, y: 4} nextLevelNodes: - {x: 4, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 5 isUse: 1 @@ -222,11 +261,12 @@ MonoBehaviour: line: 4 column: 0 fatherLevelNodes: - - {x: 3, y: 1} - {x: 3, y: 0} nextLevelNodes: - - {x: 5, y: 0} - - roomType: 3 + - {x: 5, y: 1} + fightEenemyPool: + mapIndex: + - roomType: 1 isUse: 0 passBy: 0 nodePos: {x: 0.93688774, y: 0.059761047, z: -7.67911} @@ -234,7 +274,9 @@ MonoBehaviour: column: 1 fatherLevelNodes: [] nextLevelNodes: [] - - roomType: 3 + fightEenemyPool: + mapIndex: + - roomType: 5 isUse: 1 passBy: 0 nodePos: {x: 0.93688583, y: 0.059762955, z: -6.679111} @@ -243,15 +285,21 @@ MonoBehaviour: fatherLevelNodes: - {x: 3, y: 2} nextLevelNodes: - - {x: 5, y: 3} - - roomType: 5 - isUse: 0 + - {x: 5, y: 2} + fightEenemyPool: + mapIndex: + - roomType: 3 + isUse: 1 passBy: 0 nodePos: {x: 0.93688345, y: 0.059764862, z: -5.679114} line: 4 column: 3 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 3, y: 2} + nextLevelNodes: + - {x: 5, y: 2} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 1 passBy: 0 @@ -263,45 +311,56 @@ MonoBehaviour: - {x: 3, y: 4} nextLevelNodes: - {x: 5, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 1 - isUse: 1 + - roomType: 0 + isUse: 0 passBy: 0 nodePos: {x: 3.0668812, y: 0.05977249, z: -8.679108} line: 5 column: 0 - fatherLevelNodes: - - {x: 4, y: 0} - nextLevelNodes: - - {x: 6, y: 0} - - {x: 6, y: 1} + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 1 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: 3.0668805, y: 0.0597744, z: -7.679108} line: 5 column: 1 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 4 - isUse: 0 + fatherLevelNodes: + - {x: 4, y: 0} + nextLevelNodes: + - {x: 6, y: 1} + fightEenemyPool: + mapIndex: + - roomType: 1 + isUse: 1 passBy: 0 nodePos: {x: 3.0668807, y: 0.059776306, z: -6.67911} line: 5 column: 2 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 1 - isUse: 1 + fatherLevelNodes: + - {x: 4, y: 3} + - {x: 4, y: 2} + nextLevelNodes: + - {x: 6, y: 2} + - {x: 6, y: 1} + fightEenemyPool: + mapIndex: + - roomType: 0 + isUse: 0 passBy: 0 nodePos: {x: 3.06688, y: 0.059778214, z: -5.679112} line: 5 column: 3 - fatherLevelNodes: - - {x: 4, y: 2} - nextLevelNodes: - - {x: 6, y: 4} - - roomType: 5 + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: + - roomType: 3 isUse: 1 passBy: 0 nodePos: {x: 3.0668788, y: 0.05978012, z: -4.679114} @@ -310,18 +369,21 @@ MonoBehaviour: fatherLevelNodes: - {x: 4, y: 4} nextLevelNodes: + - {x: 6, y: 3} - {x: 6, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 6 - isUse: 1 + isUse: 0 passBy: 0 nodePos: {x: 5.1968794, y: 0.059785843, z: -8.679108} line: 6 column: 0 - fatherLevelNodes: - - {x: 5, y: 0} - nextLevelNodes: - - {x: 7, y: 1} + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 6 isUse: 1 passBy: 0 @@ -329,25 +391,37 @@ MonoBehaviour: line: 6 column: 1 fatherLevelNodes: - - {x: 5, y: 0} + - {x: 5, y: 1} + - {x: 5, y: 2} nextLevelNodes: + - {x: 7, y: 0} - {x: 7, y: 1} + fightEenemyPool: + mapIndex: - roomType: 6 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: 5.1968794, y: 0.059789658, z: -6.679112} line: 6 column: 2 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 5, y: 2} + nextLevelNodes: + - {x: 7, y: 1} + fightEenemyPool: + mapIndex: - roomType: 6 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: 5.1968794, y: 0.059791565, z: -5.679115} line: 6 column: 3 - fatherLevelNodes: [] - nextLevelNodes: [] + fatherLevelNodes: + - {x: 5, y: 4} + nextLevelNodes: + - {x: 7, y: 3} + fightEenemyPool: + mapIndex: - roomType: 6 isUse: 1 passBy: 0 @@ -355,33 +429,38 @@ MonoBehaviour: line: 6 column: 4 fatherLevelNodes: - - {x: 5, y: 3} - {x: 5, y: 4} nextLevelNodes: - - {x: 7, y: 3} - {x: 7, y: 4} + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 0 - isUse: 0 + - roomType: 4 + isUse: 1 passBy: 0 nodePos: {x: 7.3268824, y: 0.059799194, z: -8.679108} line: 7 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 4 + fatherLevelNodes: + - {x: 6, y: 1} + nextLevelNodes: + - {x: 8, y: 0} + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: 7.3268833, y: 0.0598011, z: -7.67911} line: 7 column: 1 fatherLevelNodes: - - {x: 6, y: 0} + - {x: 6, y: 2} - {x: 6, y: 1} nextLevelNodes: - - {x: 8, y: 2} - - {x: 8, y: 1} - - roomType: 4 + - {x: 8, y: 0} + fightEenemyPool: + mapIndex: + - roomType: 5 isUse: 0 passBy: 0 nodePos: {x: 7.326885, y: 0.05980301, z: -6.679111} @@ -389,6 +468,8 @@ MonoBehaviour: column: 2 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 1 isUse: 1 passBy: 0 @@ -396,11 +477,12 @@ MonoBehaviour: line: 7 column: 3 fatherLevelNodes: - - {x: 6, y: 4} + - {x: 6, y: 3} nextLevelNodes: - - {x: 8, y: 4} - - {x: 8, y: 2} - - roomType: 5 + - {x: 8, y: 3} + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: 7.326885, y: 0.059806824, z: -4.679115} @@ -409,99 +491,116 @@ MonoBehaviour: fatherLevelNodes: - {x: 6, y: 4} nextLevelNodes: - - {x: 8, y: 4} + - {x: 8, y: 3} + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 1 - isUse: 0 + - roomType: 3 + isUse: 1 passBy: 0 nodePos: {x: 9.456891, y: 0.059812546, z: -8.679108} line: 8 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 1 - isUse: 1 - passBy: 0 - nodePos: {x: 9.456893, y: 0.059814453, z: -7.679108} - line: 8 - column: 1 fatherLevelNodes: - {x: 7, y: 1} + - {x: 7, y: 0} nextLevelNodes: + - {x: 9, y: 0} - {x: 9, y: 1} + fightEenemyPool: + mapIndex: - roomType: 0 - isUse: 1 + isUse: 0 passBy: 0 - nodePos: {x: 9.456895, y: 0.05981636, z: -6.67911} + nodePos: {x: 9.456893, y: 0.059814453, z: -7.679108} line: 8 - column: 2 - fatherLevelNodes: - - {x: 7, y: 1} - - {x: 7, y: 3} - nextLevelNodes: - - {x: 9, y: 3} - - {x: 9, y: 2} + column: 1 + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 0 passBy: 0 - nodePos: {x: 9.456898, y: 0.059818268, z: -5.679112} + nodePos: {x: 9.456895, y: 0.05981636, z: -6.67911} line: 8 - column: 3 + column: 2 fatherLevelNodes: [] nextLevelNodes: [] - - roomType: 4 + fightEenemyPool: + mapIndex: + - roomType: 5 isUse: 1 passBy: 0 - nodePos: {x: 9.456898, y: 0.059820175, z: -4.679116} + nodePos: {x: 9.456898, y: 0.059818268, z: -5.679112} line: 8 - column: 4 + column: 3 fatherLevelNodes: - {x: 7, y: 3} - {x: 7, y: 4} nextLevelNodes: - {x: 9, y: 3} + fightEenemyPool: + mapIndex: + - roomType: 0 + isUse: 0 + passBy: 0 + nodePos: {x: 9.456898, y: 0.059820175, z: -4.679116} + line: 8 + column: 4 + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 1 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: 11.586908, y: 0.059825897, z: -8.679108} line: 9 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 1 + fatherLevelNodes: + - {x: 8, y: 0} + nextLevelNodes: + - {x: 10, y: 1} + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: 11.586911, y: 0.059827805, z: -7.679109} line: 9 column: 1 fatherLevelNodes: - - {x: 8, y: 1} + - {x: 8, y: 0} nextLevelNodes: - - {x: 10, y: 2} - - roomType: 1 - isUse: 1 + - {x: 10, y: 1} + fightEenemyPool: + mapIndex: + - roomType: 4 + isUse: 0 passBy: 0 nodePos: {x: 11.586914, y: 0.059829712, z: -6.679111} line: 9 column: 2 - fatherLevelNodes: - - {x: 8, y: 2} - nextLevelNodes: - - {x: 10, y: 2} - - roomType: 0 + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: + - roomType: 1 isUse: 1 passBy: 0 nodePos: {x: 11.58692, y: 0.05983162, z: -5.679112} line: 9 column: 3 fatherLevelNodes: - - {x: 8, y: 2} - - {x: 8, y: 4} + - {x: 8, y: 3} nextLevelNodes: - {x: 10, y: 3} - {x: 10, y: 2} - - roomType: 4 + fightEenemyPool: + mapIndex: + - roomType: 1 isUse: 0 passBy: 0 nodePos: {x: 11.586924, y: 0.059833527, z: -4.679114} @@ -509,8 +608,10 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 0 + - roomType: 4 isUse: 0 passBy: 0 nodePos: {x: 13.71693, y: 0.05983925, z: -8.679108} @@ -518,28 +619,36 @@ MonoBehaviour: column: 0 fatherLevelNodes: [] nextLevelNodes: [] - - roomType: 0 - isUse: 0 + fightEenemyPool: + mapIndex: + - roomType: 5 + isUse: 1 passBy: 0 nodePos: {x: 13.716934, y: 0.059841156, z: -7.679107} line: 10 column: 1 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 4 + fatherLevelNodes: + - {x: 9, y: 0} + - {x: 9, y: 1} + nextLevelNodes: + - {x: 11, y: 1} + - {x: 11, y: 0} + - {x: 11, y: 2} + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 1 passBy: 0 nodePos: {x: 13.716938, y: 0.059843063, z: -6.679109} line: 10 column: 2 fatherLevelNodes: - - {x: 9, y: 1} - {x: 9, y: 3} - - {x: 9, y: 2} nextLevelNodes: - - {x: 11, y: 1} - {x: 11, y: 2} - - roomType: 5 + fightEenemyPool: + mapIndex: + - roomType: 4 isUse: 1 passBy: 0 nodePos: {x: 13.71694, y: 0.05984497, z: -5.679113} @@ -549,6 +658,8 @@ MonoBehaviour: - {x: 9, y: 3} nextLevelNodes: - {x: 11, y: 2} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 0 passBy: 0 @@ -557,27 +668,34 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - - roomType: 4 - isUse: 0 + - roomType: 0 + isUse: 1 passBy: 0 nodePos: {x: 15.846952, y: 0.0598526, z: -8.67911} line: 11 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 1 + fatherLevelNodes: + - {x: 10, y: 1} + nextLevelNodes: + - {x: 12, y: 0} + fightEenemyPool: + mapIndex: + - roomType: 4 isUse: 1 passBy: 0 nodePos: {x: 15.846956, y: 0.059854507, z: -7.67911} line: 11 column: 1 fatherLevelNodes: - - {x: 10, y: 2} + - {x: 10, y: 1} nextLevelNodes: - - {x: 12, y: 1} - - {x: 12, y: 2} - - roomType: 0 + - {x: 12, y: 0} + fightEenemyPool: + mapIndex: + - roomType: 3 isUse: 1 passBy: 0 nodePos: {x: 15.84696, y: 0.059856415, z: -6.679111} @@ -586,9 +704,12 @@ MonoBehaviour: fatherLevelNodes: - {x: 10, y: 3} - {x: 10, y: 2} + - {x: 10, y: 1} nextLevelNodes: - {x: 12, y: 3} - {x: 12, y: 2} + fightEenemyPool: + mapIndex: - roomType: 0 isUse: 0 passBy: 0 @@ -597,7 +718,9 @@ MonoBehaviour: column: 3 fatherLevelNodes: [] nextLevelNodes: [] - - roomType: 1 + fightEenemyPool: + mapIndex: + - roomType: 0 isUse: 0 passBy: 0 nodePos: {x: 15.846968, y: 0.05986023, z: -4.679115} @@ -605,26 +728,33 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 4 - isUse: 0 + isUse: 1 passBy: 0 nodePos: {x: 17.976984, y: 0.05986595, z: -8.679108} line: 12 column: 0 - fatherLevelNodes: [] - nextLevelNodes: [] - - roomType: 4 - isUse: 1 - passBy: 0 - nodePos: {x: 17.976994, y: 0.05986786, z: -7.679109} - line: 12 - column: 1 fatherLevelNodes: - {x: 11, y: 1} + - {x: 11, y: 0} nextLevelNodes: - {x: 13, y: 2} - {x: 13, y: 2} + fightEenemyPool: + mapIndex: + - roomType: 4 + isUse: 0 + passBy: 0 + nodePos: {x: 17.976994, y: 0.05986786, z: -7.679109} + line: 12 + column: 1 + fatherLevelNodes: [] + nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 4 isUse: 1 passBy: 0 @@ -632,11 +762,12 @@ MonoBehaviour: line: 12 column: 2 fatherLevelNodes: - - {x: 11, y: 1} - {x: 11, y: 2} nextLevelNodes: - {x: 13, y: 2} - {x: 13, y: 2} + fightEenemyPool: + mapIndex: - roomType: 4 isUse: 1 passBy: 0 @@ -647,6 +778,8 @@ MonoBehaviour: - {x: 11, y: 2} nextLevelNodes: - {x: 13, y: 2} + fightEenemyPool: + mapIndex: - roomType: 4 isUse: 0 passBy: 0 @@ -655,6 +788,8 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - levelDataList: - roomType: 2 isUse: 0 @@ -664,6 +799,8 @@ MonoBehaviour: column: 0 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 2 isUse: 0 passBy: 0 @@ -672,6 +809,8 @@ MonoBehaviour: column: 1 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 2 isUse: 1 passBy: 0 @@ -679,12 +818,14 @@ MonoBehaviour: line: 13 column: 2 fatherLevelNodes: + - {x: 12, y: 0} + - {x: 12, y: 0} - {x: 12, y: 3} - - {x: 12, y: 1} - - {x: 12, y: 1} - {x: 12, y: 2} - {x: 12, y: 2} nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 2 isUse: 0 passBy: 0 @@ -693,6 +834,8 @@ MonoBehaviour: column: 3 fatherLevelNodes: [] nextLevelNodes: [] + fightEenemyPool: + mapIndex: - roomType: 2 isUse: 0 passBy: 0 @@ -701,4 +844,5 @@ MonoBehaviour: column: 4 fatherLevelNodes: [] nextLevelNodes: [] - fightEenemyPool: weak + fightEenemyPool: + mapIndex: diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset index 228e88c4..a5b1c1f8 100644 --- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset +++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset @@ -23,4 +23,5 @@ MonoBehaviour: currentHP: 68 cardRewardNumToChoose: 0 cardRewardNumToGget: 0 + canColorCount: 20 money: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab deleted file mode 100644 index 11593010..00000000 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab +++ /dev/null @@ -1,131 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1496019408761085200 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5563030652977735299} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5563030652977735299 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1496019408761085200} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.17, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 6047049870113643063} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2458175114420723768 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6047049870113643063} - - component: {fileID: 4354208083307919355} - - component: {fileID: 3998761273940534422} - m_Layer: 0 - m_Name: Whirlpool - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6047049870113643063 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458175114420723768} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449} - m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 5563030652977735299} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0} ---- !u!212 &4354208083307919355 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458175114420723768} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: f9ca4d2a420a8f14b8ff292551fc0001, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.923, y: 1.879} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &3998761273940534422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2458175114420723768} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8e1d4d1a606d36b43ae3dd2b9a98896f, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree.meta b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab.meta similarity index 77% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab.meta index fba72a25..0bcb9d68 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree.meta +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8530888d5a27b2741a53af50312ea8fe +guid: d568482e910ee3943abf3fad34ef25ae folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Boom.prefab similarity index 93% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Boom.prefab index 5901150d..4a6c62f4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Boom.prefab @@ -42,6 +42,7 @@ GameObject: - component: {fileID: 6047049870113643063} - component: {fileID: 4354208083307919355} - component: {fileID: 1659492356731567997} + - component: {fileID: 2413313573070466585} m_Layer: 0 m_Name: Boom m_TagString: Untagged @@ -175,6 +176,18 @@ MonoBehaviour: damage: 4 damageParticle: {fileID: 0} particlePoint: {fileID: 213849091084324756} +--- !u!114 &2413313573070466585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d99a212ab38d69947b365e3770680781, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8227655768270691818 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Boom.prefab.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Boom.prefab.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TntBurket.prefab similarity index 91% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TntBurket.prefab index 690ee599..a4c0ec38 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TntBurket.prefab @@ -42,6 +42,7 @@ GameObject: - component: {fileID: 6047049870113643063} - component: {fileID: 4354208083307919355} - component: {fileID: 7413273311470108406} + - component: {fileID: 1630748448776617996} m_Layer: 0 m_Name: TntBurket m_TagString: Untagged @@ -171,3 +172,16 @@ MonoBehaviour: colorUnderAttack: 0 canMove: 0 planAction: 0 +--- !u!114 &1630748448776617996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d99a212ab38d69947b365e3770680781, type: 3} + m_Name: + m_EditorClassIdentifier: + takeOverType: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TntBurket.prefab.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/TntBurket.prefab.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Whirlpool.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Whirlpool.prefab new file mode 100644 index 00000000..4a686373 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Whirlpool.prefab @@ -0,0 +1,377 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &791787655015542540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3507841565684247920} + - component: {fileID: 9192163590229144868} + - component: {fileID: 780701334481676733} + - component: {fileID: 4869295605941821901} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3507841565684247920 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791787655015542540} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5757482445103523294} + m_Father: {fileID: 6047049870113643063} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.33} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &9192163590229144868 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791787655015542540} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 801241541 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &780701334481676733 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791787655015542540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &4869295605941821901 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791787655015542540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &2458175114420723768 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6047049870113643063} + - component: {fileID: 4354208083307919355} + - component: {fileID: 3998761273940534422} + - component: {fileID: 8508715456860937413} + m_Layer: 0 + m_Name: Whirlpool + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6047049870113643063 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3507841565684247920} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4354208083307919355 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 21300000, guid: f9ca4d2a420a8f14b8ff292551fc0001, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.923, y: 1.879} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &3998761273940534422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e1d4d1a606d36b43ae3dd2b9a98896f, type: 3} + m_Name: + m_EditorClassIdentifier: + posX: 0 + posY: 0 + holdColorCount: 7 + holdeText: {fileID: 1137274421971972761} + holdPool: [] +--- !u!114 &8508715456860937413 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d99a212ab38d69947b365e3770680781, type: 3} + m_Name: + m_EditorClassIdentifier: + takeOverType: 0 + blockType: 1 +--- !u!1 &2956698644888883949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666127146751557209} + - component: {fileID: 4527207791058968114} + - component: {fileID: 1137274421971972761} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &666127146751557209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956698644888883949} + 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: 5757482445103523294} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4527207791058968114 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956698644888883949} + m_CullTransparentMesh: 1 +--- !u!114 &1137274421971972761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2956698644888883949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 7 +--- !u!1 &8745365788768358793 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5757482445103523294} + - component: {fileID: 1406558591327533686} + - component: {fileID: 6754258001192525857} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5757482445103523294 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745365788768358793} + 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: + - {fileID: 666127146751557209} + m_Father: {fileID: 3507841565684247920} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 99, y: 99} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1406558591327533686 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745365788768358793} + m_CullTransparentMesh: 1 +--- !u!114 &6754258001192525857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8745365788768358793} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Whirlpool.prefab.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/Whirlpool.prefab.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/tree.prefab similarity index 91% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/tree.prefab index 6bba831f..c148e8d3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/tree.prefab @@ -42,6 +42,7 @@ GameObject: - component: {fileID: 6047049870113643063} - component: {fileID: 4354208083307919355} - component: {fileID: 4840821816182305307} + - component: {fileID: 6425500129360686181} m_Layer: 0 m_Name: tree m_TagString: Untagged @@ -172,3 +173,16 @@ MonoBehaviour: canMove: 0 planAction: 0 drawCardCount: 2 +--- !u!114 &6425500129360686181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2458175114420723768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d99a212ab38d69947b365e3770680781, type: 3} + m_Name: + m_EditorClassIdentifier: + takeOverType: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab.meta b/ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/tree.prefab.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab.meta rename to ColorlessWorld-2024-4-2/Assets/Resources/ItemPrefab/tree.prefab.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity index 0daa4255..2bbbe8a9 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level3.unity @@ -26816,6 +26816,7 @@ MonoBehaviour: - Y: [] - Y: [] - Y: [] + ToolX: [] character: 0 playerOn: {fileID: 0} player: {fileID: 1809205617} @@ -41980,7 +41981,11 @@ MonoBehaviour: mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3} line: 9 column: 5 + lineForTool: 0 + columnForTool: 0 generatePoint: {fileID: 514899946} + generatePointTest: {fileID: 0} + cameraObject: {fileID: 0} lineOffSet: {x: 1, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.865} enemyGenerateDataList: [] @@ -42433,8 +42438,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: step: 2 - startPositionX: 3 - startPositionY: 0 + startPositionX: 8 + startPositionY: 2 chooseNodeLayerMask: serializedVersion: 2 m_Bits: 64 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity index d1dceca1..d95cbaef 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Level4.unity @@ -26818,6 +26818,7 @@ MonoBehaviour: - Y: [] - Y: [] - Y: [] + ToolX: [] character: 0 playerOn: {fileID: 0} player: {fileID: 1809205617} @@ -41982,7 +41983,11 @@ MonoBehaviour: mapUnity: {fileID: 887005656701010215, guid: ecde4b12dc4538b4caff9ada56c9ab30, type: 3} line: 11 column: 6 + lineForTool: 0 + columnForTool: 0 generatePoint: {fileID: 514899946} + generatePointTest: {fileID: 0} + cameraObject: {fileID: 0} lineOffSet: {x: 1, y: 0, z: 0} columnOffSet: {x: 0, y: 0, z: 0.865} enemyGenerateDataList: [] @@ -42435,8 +42440,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: step: 2 - startPositionX: 3 - startPositionY: 0 + startPositionX: 9 + startPositionY: 3 chooseNodeLayerMask: serializedVersion: 2 m_Bits: 64 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity index 440d009e..c5337a98 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Map.unity @@ -3841,6 +3841,12 @@ MonoBehaviour: campfireIcon: {fileID: -1693594073, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} incidentIcon: {fileID: -687936468, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} treasureIcon: {fileID: 558621461, guid: ee9d3d2936bac1148abcec2385b98ec3, type: 3} + forgingIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + deleteCardIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + addCardIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + resourceIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + potionIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} + startIcon: {fileID: 21300000, guid: 02691098c39ccd6458dd3771b3004071, type: 3} --- !u!1 &324633910 GameObject: m_ObjectHideFlags: 0 @@ -6387,7 +6393,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &516762761 RectTransform: m_ObjectHideFlags: 0 @@ -15897,6 +15903,7 @@ GameObject: - component: {fileID: 1218299171} - component: {fileID: 1218299173} - component: {fileID: 1218299172} + - component: {fileID: 1218299174} m_Layer: 0 m_Name: LevelGenerator m_TagString: Untagged @@ -16034,7 +16041,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1218299170} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 866d367de8bbaf7429cd6671eca3869e, type: 3} m_Name: @@ -16076,6 +16083,38 @@ MonoBehaviour: - {fileID: 3078551910747698100, guid: 287ce1e0469b3834d9755ff86a081d6f, type: 3} BossLevelPrefabList: - {fileID: 1885417030641983838, guid: 901545c3f11968544836db15d83586de, type: 3} + enemyPoolFileName: EnemyPoolToLevel.csv +--- !u!114 &1218299174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1218299170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9357c62ffeceff4468da4ccfd5b937a3, type: 3} + m_Name: + m_EditorClassIdentifier: + generatorPoint: {fileID: 1941874171} + originalPoint: {x: 0, y: 0, z: 0} + generatorLine: 14 + generatorColumn: 3 + lineOffset: 1 + columnOffset: 2 + pathAmount: 3 + treasureFloor: 5 + forgingFloor: 11 + randomFightFloor: + normalFightFloor: + rewardNodeFloor: 0200000007000000 + randomRoomTypeWeightBase: 050000000700000008000000090000000a0000000b000000 + randomRoomTypeWeightAttach: 05000000050000000700000008000000090000000a0000000b000000 + levelPrefab: {fileID: 980190143975240430, guid: c8c223db4c0d17645bca03489a39b721, + type: 3} + levelBossPrefab: {fileID: 980190143975240430, guid: e252a7011ae30f84da117f7e07d56996, + type: 3} + enemyPoolFileName: EnemyPoolToLevel.csv --- !u!1 &1219222994 GameObject: m_ObjectHideFlags: 0 @@ -24691,7 +24730,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941874171} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -24699,7 +24738,7 @@ RectTransform: 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_AnchoredPosition: {x: -139.4, y: -30.4} + m_AnchoredPosition: {x: -139.4, y: -20.3} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1946917990 @@ -25138,7 +25177,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1972940909 RectTransform: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity index 93eb83bf..309abf54 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity @@ -39330,6 +39330,7 @@ MonoBehaviour: type: 3} isPass: 0 isTreasure: 0 + itemCsvFilePath: LevelMapToItem.csv --- !u!4 &1690695890 Transform: m_ObjectHideFlags: 0 @@ -42075,6 +42076,7 @@ MonoBehaviour: bookAnim: {fileID: 4328817775323300922} paper: {fileID: 802147682} whiteColorNode: {fileID: 1485211135} + itemPrefabPath: ItemPrefab/ --- !u!4 &1802141879 Transform: m_ObjectHideFlags: 0 @@ -42513,7 +42515,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: step: 2 - startPositionX: 3 + startPositionX: 4 startPositionY: 0 chooseNodeLayerMask: serializedVersion: 2 diff --git a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity index b9b533c0..bd659467 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity +++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity @@ -1673,53 +1673,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 145456228} m_CullTransparentMesh: 1 ---- !u!1 &146625438 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 146625440} - - component: {fileID: 146625439} - m_Layer: 0 - m_Name: TipManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &146625439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 146625438} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3} - m_Name: - m_EditorClassIdentifier: - tipFather: {fileID: 985714519} - tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16, - type: 3} ---- !u!4 &146625440 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 146625438} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &148855150 GameObject: m_ObjectHideFlags: 0 @@ -7383,6 +7336,53 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &227687488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 227687490} + - component: {fileID: 227687489} + m_Layer: 0 + m_Name: TipManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &227687489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227687488} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3} + m_Name: + m_EditorClassIdentifier: + tipFather: {fileID: 0} + tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16, + type: 3} +--- !u!4 &227687490 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 227687488} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &238416521 GameObject: m_ObjectHideFlags: 0 @@ -8471,7 +8471,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &431178197 RectTransform: m_ObjectHideFlags: 0 @@ -9261,63 +9261,6 @@ RectTransform: m_AnchoredPosition: {x: 2.5, y: 0} m_SizeDelta: {x: -5, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &485170431 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 485170433} - - component: {fileID: 485170432} - m_Layer: 0 - m_Name: PlayerStatsManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &485170432 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485170431} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3} - m_Name: - m_EditorClassIdentifier: - playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2} - levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} - cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} - relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} - colorSortList: - commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, - type: 3} - legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, - type: 3} - rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, - type: 3} - isPass: 0 - isTreasure: 0 ---- !u!4 &485170433 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 485170431} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &490265091 GameObject: m_ObjectHideFlags: 0 @@ -9586,62 +9529,6 @@ RectTransform: m_AnchoredPosition: {x: 296.6, y: 27.171} m_SizeDelta: {x: 52.6, y: 54.714} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &526484576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 526484578} - - component: {fileID: 526484577} - m_Layer: 0 - m_Name: InforBarManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &526484577 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526484576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9f2f6a3e81a55a4e989158e3351d7ee, type: 3} - m_Name: - m_EditorClassIdentifier: - InforBar: {fileID: 0} - InforBarTipPrefab: {fileID: 8650645450562924027, guid: 64ec1d3890ee945458d7528b185a796a, - type: 3} - InforBarTipList: [] - buffInforBar: {fileID: 0} - buffInforBarTipPrefab: {fileID: 2592041783247472681, guid: 1b58ed47ff3c01b408a4adac252a6554, - type: 3} - buffInforBarTipList: [] - relicInforBar: {fileID: 0} - relicInforBarTipPrefab: {fileID: 2592041783247472681, guid: 42e2dea72c5c004419a8c0eb09a884d0, - type: 3} - relicInforBarTipList: [] ---- !u!4 &526484578 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526484576} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &526514134 GameObject: m_ObjectHideFlags: 0 @@ -9721,6 +9608,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 526514134} m_CullTransparentMesh: 1 +--- !u!1 &541884787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 541884789} + - component: {fileID: 541884788} + m_Layer: 0 + m_Name: ToolDontDestory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &541884788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541884787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6f23279cbd0f954ca899908598a8505, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &541884789 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541884787} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.8241224, y: 1.0390644, z: 1.4156547} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &572520064 GameObject: m_ObjectHideFlags: 0 @@ -10393,6 +10324,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 619847234} m_CullTransparentMesh: 1 +--- !u!1 &623796530 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 623796532} + - component: {fileID: 623796531} + m_Layer: 0 + m_Name: CardManager(Color) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &623796531 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 623796530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &623796532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 623796530} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.160092, y: 2.9316888, z: 3.9849322} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &633658177 GameObject: m_ObjectHideFlags: 0 @@ -11108,7 +11083,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 662446367} m_CullTransparentMesh: 1 ---- !u!1 &709795120 +--- !u!1 &676333704 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11116,100 +11091,466 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 709795121} - - component: {fileID: 709795123} - - component: {fileID: 709795122} - m_Layer: 5 - m_Name: Background1 + - component: {fileID: 676333709} + - component: {fileID: 676333708} + - component: {fileID: 676333707} + - component: {fileID: 676333706} + - component: {fileID: 676333705} + m_Layer: 0 + m_Name: AudioManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &709795121 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 709795120} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.17, y: 1.17, z: 1.17} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 1872135081} - 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_AnchoredPosition: {x: -3.9244, y: -6.7664} - m_SizeDelta: {x: 1648.7651, y: 927.218} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &709795122 -MonoBehaviour: + m_IsActive: 1 +--- !u!82 &676333705 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 709795120} + m_GameObject: {fileID: 676333704} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 301680cf212838c458b8897adf60224f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &709795123 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 709795120} - m_CullTransparentMesh: 1 ---- !u!1 &712036183 -GameObject: + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f44b5427b062799468a1894cf3c8a8bf, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.75 + 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!82 &676333706 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 712036184} - - component: {fileID: 712036186} - - component: {fileID: 712036185} - m_Layer: 5 - m_Name: MainVoice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &712036184 -RectTransform: + m_GameObject: {fileID: 676333704} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + 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!82 &676333707 +AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 712036183} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000083277} + m_GameObject: {fileID: 676333704} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + 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!114 &676333708 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676333704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b2b8537b62d04d45ad201dafc853142, type: 3} + m_Name: + m_EditorClassIdentifier: + mainVoiceVolume: 1 + effectVoiceVolume: 1 + musicVoiceVolume: 1 + UIClick: {fileID: 8300000, guid: 90e7a416c58aeda47898e5c6bafa1703, type: 3} + menuOpenClip: {fileID: 8300000, guid: aa09967122165064693a43a3ee1ac3be, type: 3} + menuCloseClip: {fileID: 8300000, guid: e526247df8496df41823965b29bcf59e, type: 3} + turnChangeClip: {fileID: 8300000, guid: dc21cb12cefb22b478ec62e4c23c76fb, type: 3} + AttackClips: + - {fileID: 8300000, guid: 7d0ed2b193dec034b9372a647211329c, type: 3} + - {fileID: 8300000, guid: bad8f72a868ea0f49a08f4839852274a, type: 3} + upShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} + downShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} + playerMoveClip: {fileID: 8300000, guid: 57e1e3f3225346247ad0fff702ad6049, type: 3} + enemyHurtClip: {fileID: 8300000, guid: 32d4f8be35b20a0419ac2d6ac36e6a97, type: 3} + enemyMoveClip: {fileID: 8300000, guid: 57e1e3f3225346247ad0fff702ad6049, type: 3} + onePageClip: {fileID: 8300000, guid: 8d3ebc252a552e346aafb2b8da7b3717, type: 3} + amountPageClip: {fileID: 8300000, guid: 2f02670f32b7b1949859664e7ddd9667, type: 3} + oneDrawClip: {fileID: 8300000, guid: 53bbd3f6b67ce1349be6899419543471, type: 3} + amoutDrawClip: {fileID: 8300000, guid: a7c4b426f6488924ba4d8220940d553e, type: 3} + chooseClip: {fileID: 8300000, guid: b0a53ae3759f330419116d317aeb12f1, type: 3} + disChooseClip: {fileID: 8300000, guid: f15e1aab9d3d92943902c03337517e9f, type: 3} + flipClip: {fileID: 8300000, guid: ba40307e688223e4d85ba5ad5749e73c, type: 3} + gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} + gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} + buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} + fightBGM: {fileID: 8300000, guid: f44b5427b062799468a1894cf3c8a8bf, type: 3} + shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3} + startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} + UIClickSource: {fileID: 676333707} + ActionSource: {fileID: 676333706} + BGMSoure: {fileID: 676333705} +--- !u!4 &676333709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 676333704} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &709795120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 709795121} + - component: {fileID: 709795123} + - component: {fileID: 709795122} + m_Layer: 5 + m_Name: Background1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &709795121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709795120} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.17, y: 1.17, z: 1.17} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1872135081} + 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_AnchoredPosition: {x: -3.9244, y: -6.7664} + m_SizeDelta: {x: 1648.7651, y: 927.218} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &709795122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709795120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 301680cf212838c458b8897adf60224f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &709795123 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 709795120} + m_CullTransparentMesh: 1 +--- !u!1 &712036183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 712036184} + - component: {fileID: 712036186} + - component: {fileID: 712036185} + m_Layer: 5 + m_Name: MainVoice + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &712036184 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 712036183} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000083277} m_LocalScale: {x: 0.9997415, y: 0.9997415, z: 0.9997415} m_ConstrainProportionsScale: 0 m_Children: @@ -12011,7 +12352,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776671193} m_CullTransparentMesh: 1 ---- !u!1 &786224516 +--- !u!1 &780405986 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -12019,26 +12360,90 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 786224519} - - component: {fileID: 786224518} - - component: {fileID: 786224517} - m_Layer: 5 - m_Name: UP + - component: {fileID: 780405988} + - component: {fileID: 780405987} + m_Layer: 0 + m_Name: CardResourcesManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &786224517 + m_IsActive: 1 +--- !u!114 &780405987 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 786224516} + m_GameObject: {fileID: 780405986} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3} + m_Name: + m_EditorClassIdentifier: + redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3} + blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} + greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} + whiteNodeImage: {fileID: 1140146974, guid: 12e2f3d0cb603f44cb12b2362e45aa19, type: 3} + blackNodeImage: {fileID: 21300000, guid: cb1d88127e421da4c9be4ce96e438ec7, type: 3} + attack: {fileID: 2089713304, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + shield: {fileID: 298242201, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + step: {fileID: -1638093221, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + weak: {fileID: 1313707503, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + wet: {fileID: 807148770, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + costRestore: {fileID: 587810021, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + drawCard: {fileID: 162605382, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + posion: {fileID: -1661284519, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + vulnerable: {fileID: 30630105, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + fireSeed: {fileID: 562257326, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} + imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903, + type: 3} + textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, + type: 3} + tree: {fileID: 2458175114420723768, guid: f3c59a4c3b3c54a4c952f50e44940dfc, type: 3} +--- !u!4 &780405988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 780405986} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &786224516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 786224519} + - component: {fileID: 786224518} + - component: {fileID: 786224517} + m_Layer: 5 + m_Name: UP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &786224517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 786224516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -12503,69 +12908,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &813733998 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 813734000} - - component: {fileID: 813733999} - m_Layer: 0 - m_Name: CardResourcesManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &813733999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 813733998} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3} - m_Name: - m_EditorClassIdentifier: - redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3} - blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3} - greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3} - whiteNodeImage: {fileID: 1140146974, guid: 12e2f3d0cb603f44cb12b2362e45aa19, type: 3} - blackNodeImage: {fileID: 21300000, guid: cb1d88127e421da4c9be4ce96e438ec7, type: 3} - attack: {fileID: 2089713304, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - shield: {fileID: 298242201, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - step: {fileID: -1638093221, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - weak: {fileID: 1313707503, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - wet: {fileID: 807148770, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - costRestore: {fileID: 587810021, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - drawCard: {fileID: 162605382, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - posion: {fileID: -1661284519, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - vulnerable: {fileID: 30630105, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - fireSeed: {fileID: 562257326, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3} - imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903, - type: 3} - textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a, - type: 3} ---- !u!4 &813734000 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 813733998} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &814158907 GameObject: m_ObjectHideFlags: 0 @@ -13066,6 +13408,51 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 847820862} m_CullTransparentMesh: 1 +--- !u!1 &852531555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 852531557} + - component: {fileID: 852531556} + m_Layer: 0 + m_Name: ServentStateManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &852531556 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852531555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86c2fab3deda01e4fb16a6d8fbcda640, type: 3} + m_Name: + m_EditorClassIdentifier: + servantState: {fileID: 0} +--- !u!4 &852531557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852531555} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &856356056 GameObject: m_ObjectHideFlags: 0 @@ -14165,6 +14552,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 997443146} m_CullTransparentMesh: 1 +--- !u!1 &1010659527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1010659529} + - component: {fileID: 1010659528} + m_Layer: 0 + m_Name: InforBarManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1010659528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010659527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9f2f6a3e81a55a4e989158e3351d7ee, type: 3} + m_Name: + m_EditorClassIdentifier: + InforBar: {fileID: 0} + InforBarTipPrefab: {fileID: 8650645450562924027, guid: 64ec1d3890ee945458d7528b185a796a, + type: 3} + InforBarTipList: [] + buffInforBar: {fileID: 0} + buffInforBarTipPrefab: {fileID: 2592041783247472681, guid: 1b58ed47ff3c01b408a4adac252a6554, + type: 3} + buffInforBarTipList: [] + relicInforBar: {fileID: 0} + relicInforBarTipPrefab: {fileID: 2592041783247472681, guid: 42e2dea72c5c004419a8c0eb09a884d0, + type: 3} + relicInforBarTipList: [] +--- !u!4 &1010659529 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010659527} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1014383273 GameObject: m_ObjectHideFlags: 0 @@ -15526,50 +15969,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1157009883} m_CullTransparentMesh: 1 ---- !u!1 &1164528880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1164528882} - - component: {fileID: 1164528881} - m_Layer: 0 - m_Name: CardOriginalDataList - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1164528881 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164528880} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 34479ee20dc78fb49927983a85316eb8, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1164528882 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164528880} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1169516690 GameObject: m_ObjectHideFlags: 0 @@ -15665,7 +16064,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1173798764 RectTransform: m_ObjectHideFlags: 0 @@ -16063,7 +16462,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &1204729961 +--- !u!1 &1213638683 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -16071,62 +16470,18 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1204729963} - - component: {fileID: 1204729962} - m_Layer: 0 - m_Name: CardManager(Color) + - component: {fileID: 1213638684} + - component: {fileID: 1213638686} + - component: {fileID: 1213638685} + m_Layer: 5 + m_Name: Text (Legacy) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1204729962 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204729961} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1204729963 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1204729961} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.160092, y: 2.9316888, z: 3.9849322} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1213638683 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1213638684} - - component: {fileID: 1213638686} - - component: {fileID: 1213638685} - m_Layer: 5 - m_Name: Text (Legacy) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1213638684 -RectTransform: +--- !u!224 &1213638684 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -16298,50 +16653,6 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: -10, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1224874801 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1224874803} - - component: {fileID: 1224874802} - m_Layer: 0 - m_Name: ToolDontDestory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1224874802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1224874801} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d6f23279cbd0f954ca899908598a8505, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1224874803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1224874801} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.8241224, y: 1.0390644, z: 1.4156547} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1248285550 GameObject: m_ObjectHideFlags: 0 @@ -17178,6 +17489,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1312317052} m_CullTransparentMesh: 1 +--- !u!1 &1338730078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1338730080} + - component: {fileID: 1338730079} + m_Layer: 0 + m_Name: CardManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1338730079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338730078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1338730080 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1338730078} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1341249520 GameObject: m_ObjectHideFlags: 0 @@ -17902,6 +18257,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1393103354} m_CullTransparentMesh: 1 +--- !u!1 &1393863276 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1393863277} + m_Layer: 0 + m_Name: ------DontDestory------ + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1393863277 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393863276} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.9480368, y: 0.27446842, z: 6.9678106} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1396522571 GameObject: m_ObjectHideFlags: 0 @@ -19195,6 +19581,64 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1517792570} m_CullTransparentMesh: 1 +--- !u!1 &1518257280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1518257282} + - component: {fileID: 1518257281} + m_Layer: 0 + m_Name: PlayerStatsManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1518257281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1518257280} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3} + m_Name: + m_EditorClassIdentifier: + playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2} + levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2} + cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2} + relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2} + colorSortList: 010000000300000004000000 + commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, + type: 3} + legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, + type: 3} + rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259, + type: 3} + isPass: 0 + isTreasure: 0 + itemCsvFilePath: LevelMapToItem.csv +--- !u!4 &1518257282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1518257280} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1535934833 GameObject: m_ObjectHideFlags: 0 @@ -19532,51 +19976,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1555174416} m_CullTransparentMesh: 1 ---- !u!1 &1571871170 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1571871172} - - component: {fileID: 1571871171} - m_Layer: 0 - m_Name: ServentStateManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1571871171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1571871170} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86c2fab3deda01e4fb16a6d8fbcda640, type: 3} - m_Name: - m_EditorClassIdentifier: - servantState: {fileID: 0} ---- !u!4 &1571871172 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1571871170} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1574058775 GameObject: m_ObjectHideFlags: 0 @@ -19671,7 +20070,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1576156920 RectTransform: m_ObjectHideFlags: 0 @@ -20263,7 +20662,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611897405} m_CullTransparentMesh: 1 ---- !u!1 &1612287985 +--- !u!1 &1621631698 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -20271,76 +20670,32 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1612287987} - - component: {fileID: 1612287986} + - component: {fileID: 1621631699} + - component: {fileID: 1621631701} m_Layer: 0 - m_Name: CardManager + m_Name: ScenceManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1612287986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1612287985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca1e05724f689024392e0ea50533f6ad, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1612287987 +--- !u!4 &1621631699 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1612287985} + m_GameObject: {fileID: 1621631698} 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: 0} + m_Father: {fileID: 315632828} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1621631698 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1621631699} - - component: {fileID: 1621631701} - m_Layer: 0 - m_Name: ScenceManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1621631699 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621631698} - 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: 315632828} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1621631701 -MonoBehaviour: +--- !u!114 &1621631701 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -21360,574 +21715,208 @@ RectTransform: 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: 141132603} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 10, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1737998288 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1737998286} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1737998289 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1737998286} - m_CullTransparentMesh: 1 ---- !u!1 &1741164159 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1741164160} - - component: {fileID: 1741164162} - - component: {fileID: 1741164161} - m_Layer: 5 - m_Name: Label - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1741164160 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741164159} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000029753} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 643491997} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -12.5, y: 0.000017166138} - m_SizeDelta: {x: -25, y: -0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1741164161 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741164159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 1920x1080 ---- !u!222 &1741164162 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1741164159} - m_CullTransparentMesh: 1 ---- !u!1 &1742836362 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1742836363} - - component: {fileID: 1742836365} - - component: {fileID: 1742836364} - m_Layer: 5 - m_Name: Name - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1742836363 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836362} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000060143} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 960347734} - m_Father: {fileID: 1116031403} - 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_AnchoredPosition: {x: -74.522, y: 0} - m_SizeDelta: {x: 149.05, y: 39.21} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1742836364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836362} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1742836365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836362} - m_CullTransparentMesh: 1 ---- !u!1 &1763913762 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1763913767} - - component: {fileID: 1763913766} - - component: {fileID: 1763913765} - - component: {fileID: 1763913764} - - component: {fileID: 1763913763} - m_Layer: 0 - m_Name: AudioManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &1763913763 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763913762} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: ea163b0948a84ab4f929c4579a9105e7, type: 3} - m_PlayOnAwake: 1 - m_Volume: 0.75 - 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!82 &1763913764 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763913762} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - 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!82 &1763913765 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763913762} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - 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!114 &1763913766 + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 141132603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1737998288 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763913762} + m_GameObject: {fileID: 1737998286} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b2b8537b62d04d45ad201dafc853142, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - mainVoiceVolume: 1 - effectVoiceVolume: 1 - musicVoiceVolume: 1 - UIClick: {fileID: 8300000, guid: 90e7a416c58aeda47898e5c6bafa1703, type: 3} - menuOpenClip: {fileID: 8300000, guid: aa09967122165064693a43a3ee1ac3be, type: 3} - menuCloseClip: {fileID: 8300000, guid: e526247df8496df41823965b29bcf59e, type: 3} - turnChangeClip: {fileID: 8300000, guid: dc21cb12cefb22b478ec62e4c23c76fb, type: 3} - AttackClips: - - {fileID: 8300000, guid: 7d0ed2b193dec034b9372a647211329c, type: 3} - - {fileID: 8300000, guid: bad8f72a868ea0f49a08f4839852274a, type: 3} - upShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} - downShieldClip: {fileID: 8300000, guid: 05878b36e4cfec048bb24c2927d72ff3, type: 3} - playerMoveClip: {fileID: 8300000, guid: 57e1e3f3225346247ad0fff702ad6049, type: 3} - enemyHurtClip: {fileID: 8300000, guid: 32d4f8be35b20a0419ac2d6ac36e6a97, type: 3} - enemyMoveClip: {fileID: 8300000, guid: 57e1e3f3225346247ad0fff702ad6049, type: 3} - onePageClip: {fileID: 8300000, guid: 8d3ebc252a552e346aafb2b8da7b3717, type: 3} - amountPageClip: {fileID: 8300000, guid: 2f02670f32b7b1949859664e7ddd9667, type: 3} - oneDrawClip: {fileID: 8300000, guid: 53bbd3f6b67ce1349be6899419543471, type: 3} - amoutDrawClip: {fileID: 8300000, guid: a7c4b426f6488924ba4d8220940d553e, type: 3} - chooseClip: {fileID: 8300000, guid: b0a53ae3759f330419116d317aeb12f1, type: 3} - disChooseClip: {fileID: 8300000, guid: f15e1aab9d3d92943902c03337517e9f, type: 3} - flipClip: {fileID: 8300000, guid: ba40307e688223e4d85ba5ad5749e73c, type: 3} - gainMoneyClip: {fileID: 8300000, guid: 4bdf1399abfddc549af7f38a8c9446d2, type: 3} - gainCardClip: {fileID: 8300000, guid: 2cba30942ef3c9a4181c67e0cad3fdaf, type: 3} - buyClip: {fileID: 8300000, guid: cd6237820d5c34d4c9ad4c59d45002e4, type: 3} - fightBGM: {fileID: 8300000, guid: f44b5427b062799468a1894cf3c8a8bf, type: 3} - shopBGM: {fileID: 8300000, guid: 6cd3e5a8ae3963446a483cb25f052163, type: 3} - startMenuBgm: {fileID: 8300000, guid: 51d48687a1d476c45828b13642627ac3, type: 3} - UIClickSource: {fileID: 1763913765} - ActionSource: {fileID: 1763913764} - BGMSoure: {fileID: 1763913763} ---- !u!4 &1763913767 -Transform: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1737998289 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1763913762} - serializedVersion: 2 + m_GameObject: {fileID: 1737998286} + m_CullTransparentMesh: 1 +--- !u!1 &1741164159 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1741164160} + - component: {fileID: 1741164162} + - component: {fileID: 1741164161} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1741164160 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741164159} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.0000029753} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 643491997} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -12.5, y: 0.000017166138} + m_SizeDelta: {x: -25, y: -0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1741164161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741164159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1920x1080 +--- !u!222 &1741164162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1741164159} + m_CullTransparentMesh: 1 +--- !u!1 &1742836362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1742836363} + - component: {fileID: 1742836365} + - component: {fileID: 1742836364} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1742836363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742836362} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000060143} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 960347734} + m_Father: {fileID: 1116031403} 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_AnchoredPosition: {x: -74.522, y: 0} + m_SizeDelta: {x: 149.05, y: 39.21} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1742836364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742836362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6698113, g: 0.6698113, b: 0.6698113, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1742836365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1742836362} + m_CullTransparentMesh: 1 --- !u!1 &1764108575 GameObject: m_ObjectHideFlags: 0 @@ -22514,6 +22503,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1802288533} m_CullTransparentMesh: 1 +--- !u!1 &1817400296 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1817400298} + - component: {fileID: 1817400297} + m_Layer: 0 + m_Name: CardOriginalDataList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1817400297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817400296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34479ee20dc78fb49927983a85316eb8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1817400298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1817400296} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1823169379 GameObject: m_ObjectHideFlags: 0 @@ -29381,20 +29414,21 @@ SceneRoots: - {fileID: 1122200156} - {fileID: 1715060595} - {fileID: 315632828} - - {fileID: 1204729963} - - {fileID: 485170433} - - {fileID: 1164528882} - - {fileID: 1763913767} - - {fileID: 1571871172} - - {fileID: 1224874803} - - {fileID: 1612287987} - - {fileID: 813734000} - - {fileID: 146625440} - - {fileID: 61966381} - - {fileID: 526484578} - {fileID: 955483355} - {fileID: 1915999131} - {fileID: 468653673} - {fileID: 2083961204} - {fileID: 1970215290} - {fileID: 490265095} + - {fileID: 1393863277} + - {fileID: 623796532} + - {fileID: 227687490} + - {fileID: 1518257282} + - {fileID: 1817400298} + - {fileID: 676333709} + - {fileID: 1010659529} + - {fileID: 852531557} + - {fileID: 541884789} + - {fileID: 1338730080} + - {fileID: 780405988} + - {fileID: 61966381} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs index 5f39c987..86f48cab 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyPool.cs @@ -67,4 +67,23 @@ public class EnemyPool : MonoBehaviour } return enemyPrefabs; } + + public static string enemyIndexToString( int enemyIndex) + { + switch (enemyIndex) + { + case 2001: + return Name.EnemyName.DarkCloud; + case 2002: + return Name.EnemyName.BlackSheep; + case 2003: + return Name.EnemyName.Grinfiend; + case 2004: + return Name.EnemyName.Polymaw; + case 2005: + return Name.EnemyName.Mushroom; + } + + return Name.EnemyName.BlackSheep; + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI/BlockUIBar.cs similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI/BlockUIBar.cs diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI/BlockUIBar.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/BlockUI/BlockUIBar.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BlockNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/BlockNode.cs similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BlockNode.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/BlockNode.cs diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BlockNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/BlockNode.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BlockNode.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/BlockNode.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs similarity index 98% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs index 7ac77547..962b6a80 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.UIElements; -public class BoomNode : BlockNode +public class Boom : BlockNode { public int damage = 4; public GameObject damageParticle; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Boom.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Box.cs similarity index 97% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Box.cs index d1d2fe5d..b5e54d13 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Box.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class BoxNode : MonoBehaviour +public class Box : MonoBehaviour { EnemyNode enemyNode; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Box.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Box.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/TNTBucket.cs similarity index 94% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/TNTBucket.cs index 8297ce39..4f80ceab 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/TNTBucket.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class TNTBucketNode : BlockNode +public class TNTBucket : BlockNode { public override void OnDeath() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/TNTBucket.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/TNTBucket.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Tree.cs similarity index 95% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Tree.cs index 94ac6ab4..0a0da948 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Tree.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class TreeNode : BlockNode +public class Tree : BlockNode { public int drawCardCount=2; public override void OnDeath() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Tree.cs.meta similarity index 100% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/BlockNode/Tree.cs.meta diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode.meta similarity index 77% rename from ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block.meta rename to ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode.meta index a2002b20..9282d5b2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block.meta +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab7664ff672480f459fb5c68b41dcc23 +guid: 158addf8acf787245a6bc01d0b3fd919 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs new file mode 100644 index 00000000..bd0cde30 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs @@ -0,0 +1,64 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemTakerOverNode : MonoBehaviour +{ + public enum TakeOverType + { + oneCenter, + oneCircle + } + public TakeOverType takeOverType; + public enum BlockType + { + common, + whirlpool + } + public BlockType blockType; + + public HashSet TakeOverCalculation(MapUnity currentMapUnity) + { + HashSet mapUnities = new HashSet (); + switch (takeOverType) + { + case TakeOverType.oneCenter: + if(currentMapUnity !=null && currentMapUnity .blocked ==false &¤tMapUnity .gameObject .activeInHierarchy ==true ) + { + mapUnities .Add(currentMapUnity ); + } + else + { + return null; + } + break; + } + + return mapUnities; + } + + public void GenerateBlockItem(MapUnity currentMapUnity,GameObject prefab) + { + switch (blockType) + { + case BlockType.common: + Vector3 pos = currentMapUnity.transform.position; + pos.y = 1; + var block = Instantiate(prefab, pos, Quaternion.identity); + currentMapUnity.enemyNode = block.GetComponent(); + currentMapUnity.enemyNode.positionX = currentMapUnity.locationX; + currentMapUnity.enemyNode.positionY = currentMapUnity.locationY; + currentMapUnity.blocked = true; + break; + case BlockType.whirlpool: + Vector3 pos2 = currentMapUnity.transform.position; + pos.y = 1; + var whirlpool = Instantiate(prefab, pos2, Quaternion.identity); + Whirlpool whirlpoolS = whirlpool.GetComponent(); + whirlpoolS.posX = currentMapUnity.locationX; + whirlpoolS.posY = currentMapUnity.locationY; + break; + } + + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs.meta new file mode 100644 index 00000000..bc165f96 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/TakerOverNode/ItemTakerOverNode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d99a212ab38d69947b365e3770680781 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs index 5943905d..4a67dc5e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs @@ -13,7 +13,7 @@ public class Whirlpool : MonoBehaviour private void Start() { - MapUnity currentNode = GameManager .Instance .X[posX].Y[posY]; + MapUnity currentNode = getNodeTools.LocationToGetNode( posX,posY); this.gameObject.transform.position = currentNode.transform.position; for(int i=0;i //开局场地涂色 IEnumerator StartMapColour() { - //玩家 - for (int i = 0; i < X.Count ; i++) + /* //玩家 + for (int i = 0; i < X.Count ; i++) + { + if (i % 2 == 0) + { + X[i].Y[0].switchColor(PlayerStatsManager.Instance.colorSortList[0]); + } + else + { + X[i].Y[0].switchColor(PlayerStatsManager.Instance.colorSortList[1]); + } + } + for (int i = 0; i < X.Count; i++) + { + X[i].Y[1].switchColor(PlayerStatsManager.Instance.colorSortList[2]); + } + //怪物 + for (int i = 0; i whiteMapUnities = new List(); + for(int i=0;i< X .Count;i++) { - if (i % 2 == 0) + for (int j=0;j +{ + public GameObject generatorPoint;//初始位置 + public Vector3 originalPoint; + + [Header("节点生成行(横)")] + public int generatorLine; + [Header("节点生成列(竖)")] + public int generatorColumn; + + [Header("节点生成列(竖)间距")] + public float lineOffset; + [Header("节点生成行(横)间距")] + public float columnOffset; + + [Header("生成路线数量")] + public int pathAmount; + + [Header("特定房间生成层数")] + //宝箱 + public int treasureFloor; + //锻造 + public int forgingFloor; + //随机战 + public List randomFightFloor; + //普通战 + public List normalFightFloor; + //随机奖励节点 + public List rewardNodeFloor; + public List randomRoomTypeWeightBase; + public List randomRoomTypeWeightAttach; + + + [Header("节点生成资源")] + public GameObject levelPrefab; + public GameObject levelBossPrefab; + + [Header("怪物池地图概率字典")] + public string enemyPoolFileName; + Dictionary> probabilityDictionaryWeak = new Dictionary>(); + Dictionary> probabilityDictionaryStrong = new Dictionary>(); + Dictionary> probabilityDictionaryElite = new Dictionary>(); + Dictionary> probabilityDictionaryBoss = new Dictionary>(); + private void Start() + { + originalPoint = generatorPoint.transform.position; + if (LevelDevelopManager.Instance.levelDevelopData.levelStep == 0) + { + GenerateLevelMap(generatorLine, generatorColumn); + //存储保存数据 + SaveDataLoader(); + } + else + { + GeneratorLevelMapFormSave(); + } + + } + public void GenerateLevelMap(int generatorLine, int generatorColumn) + { + GenerateGridMap(generatorLine, generatorColumn); + GeneratePath(); + RandomSetUpRoom(); + // CheckNodeRule(); + ShowMap(); + SetRoomEnemyPoolAndMap(); + } + //生成网格 + public void GenerateGridMap(int generatorLine, int generatorColumn) + { + + for (int i = 0; i < generatorLine; i++) + { + if (i == generatorLine - 1) + { + + for (int j = 0; j < generatorColumn; j++) + { + generatorPoint.transform.position = new Vector3(generatorPoint.transform.position.x, generatorPoint.transform.position.y, generatorPoint.transform.position.z + lineOffset); + + var level = Instantiate(levelBossPrefab, generatorPoint.transform.position, levelPrefab.transform.rotation); + level.transform.SetParent(LevelDevelopManager.Instance.levelFather.transform); + level.transform.localScale = new Vector3(0.1f, 0.1f, 0.1f); + level.transform.localPosition += new Vector3(0, 5f, 0); + LevelNode bossLevelNode = level.GetComponent(); + bossLevelNode.line = i; + bossLevelNode.column = j; + LevelDevelopManager.Instance.levelMap[i].levelColumn.Add(bossLevelNode); + } + + } + else + { + for (int j = 0; j < generatorColumn; j++) + { + generatorPoint.transform.position = new Vector3(generatorPoint.transform.position.x, generatorPoint.transform.position.y, generatorPoint.transform.position.z + lineOffset); + + GenerateLevelNode(i, j, generatorPoint.transform.position); + } + } + + generatorPoint.transform.position = new Vector3(generatorPoint.transform.position.x + columnOffset, generatorPoint.transform.position.y, originalPoint.z); + } + } + + //生成路线 + public void GeneratePath() + { + List levelMap = LevelDevelopManager.Instance.levelMap; + for (int i=0;i path = new List(); + path.Add(LevelDevelopManager.Instance.levelMap[0].levelColumn[currentColum].column);//加入起点 + + + LevelNode LevelNode = LevelDevelopManager.Instance.levelMap[line - 1].levelColumn[currentColum]; + LevelNode nextLevelNode = LevelDevelopManager.Instance.levelMap[line].levelColumn[generatorColumn / 2]; + LevelNode.nextLevelNodes.Add(nextLevelNode); + nextLevelNode.fatherLevelNodes.Add(LevelNode); + nextLevelNode.isUse = true; + + int pathOffset = Random.Range(-1, 2); + if (CheckChoosePath(line, currentColum, pathOffset)) + { + LevelNode LevelNode = LevelDevelopManager.Instance.levelMap[line - 1].levelColumn[currentColum]; + currentColum += pathOffset; + LevelNode nextLevelNode = LevelDevelopManager.Instance.levelMap[line].levelColumn[currentColum]; + + if (!LevelNode.nextLevelNodes.Contains(nextLevelNode)) + LevelNode.nextLevelNodes.Add(nextLevelNode); + if (!nextLevelNode.fatherLevelNodes.Contains(LevelNode)) + nextLevelNode.fatherLevelNodes.Add(LevelNode); + nextLevelNode.isUse = true; + + //加入路线表 + path.Add(nextLevelNode.column); + break; + }*/ + + + } + + //检查路线选择是否合理 + public bool CheckChoosePath(int line, int column, int pathOffset) + { + int nextcolumn = (column + pathOffset); + if (nextcolumn < 0 || nextcolumn > generatorColumn - 1) + { + return false; + } + + if (pathOffset == -1) + { + LevelNode levelNode = LevelDevelopManager.Instance.levelMap[line - 1].levelColumn[column - 1]; + if (levelNode.isUse == true) + { + foreach (var node in levelNode.nextLevelNodes) + { + if (node.column > nextcolumn) + { + return false; + } + } + } + } + + if (pathOffset == 1) + { + LevelNode levelNode = LevelDevelopManager.Instance.levelMap[line - 1].levelColumn[column + 1]; + if (levelNode.isUse == true) + { + foreach (var node in levelNode.nextLevelNodes) + { + if (node.column < nextcolumn) + { + return false; + } + } + } + } + return true; + } + + //检查节点是否合理(分支目的地不同,保底精英) + public void CheckNodeRule() + { + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[i].levelColumn[j]; + if (currentLevelNode.isUse) + { + if (currentLevelNode.nextLevelNodes.Count > 1 && i != treasureFloor - 1 && i != generatorLine - 3 && i != generatorLine - 2) + { + Debug.Log(i); + List roomTypes = new List(); + foreach (var room in currentLevelNode.nextLevelNodes) + { + if (!roomTypes.Contains(room.roomType)) + { + Debug.Log(currentLevelNode.line + ";" + currentLevelNode.column + "过"); + roomTypes.Add(room.roomType); + } + else + { + Debug.Log(currentLevelNode.line + ";" + currentLevelNode.column + "否"); + RandomGetOneRoom(currentLevelNode.nextLevelNodes, i, j); + } + } + + } + } + } + } + } + + + //生成房间 + public LevelNode GenerateLevelNode(int line, int column, Vector3 pos) + { + var level = Instantiate(levelPrefab, pos, levelPrefab.transform.rotation); + level.transform.SetParent(LevelDevelopManager.Instance.levelFather.transform); + level.transform.localScale = new Vector3(0.04f, 0.04f, 0.04f); + LevelNode levelNode = level.GetComponent(); + levelNode.line = line; + levelNode.column = column; + LevelDevelopManager.Instance.levelMap[line].levelColumn.Add(levelNode); + + return levelNode; + } + //生成Boss房间 + public LevelNode GenerateLevelBossNode(int line, int column, Vector3 pos) + { + var level = Instantiate(levelBossPrefab, pos, levelPrefab.transform.rotation); + level.transform.SetParent(LevelDevelopManager.Instance.levelFather.transform); + level.transform.localScale = new Vector3(0.04f, 0.04f, 0.04f); + LevelNode levelNode = level.GetComponent(); + levelNode.line = line; + levelNode.column = column; + LevelDevelopManager.Instance.levelMap[line].levelColumn.Add(levelNode); + + return levelNode; + } + //按规则随机设定房间 + public void RandomSetUpRoom() + { + List levelMap = LevelDevelopManager.Instance.levelMap; + for (int i = 0; i < generatorLine; i++) + { + if (i == 0) + { + //第一层是初始点 + foreach (var room in levelMap[i].levelColumn) + { + room.SetUpRoom(RoomType.start); + } + } + else if (i == treasureFloor) + { + //指定宝箱层 + foreach (var room in levelMap[i].levelColumn) + { + room.SetUpRoom(RoomType.treasure); + } + } + else if (i == generatorLine - 2) + { + //倒数第二层全是篝火 + foreach (var room in levelMap[i].levelColumn) + { + room.SetUpRoom(RoomType.campfire); + } + } + else if (i == generatorLine - 1) + { + //最后一层boss房 + foreach (var room in levelMap[i].levelColumn) + { + room.SetUpRoom(RoomType.boss); + } + } + + } + + //阶段a的随机奖励生成 + List> levelNodes = new List>(); + List aNode_1 = new List (); + List aNode_2 = new List(); + List bNode_1 = new List(); + List bNode_2 = new List(); + for (int i = 0; i < 3; i++) + { + aNode_1.Add(levelMap[rewardNodeFloor[0]].levelColumn[i]); + aNode_2.Add(levelMap[rewardNodeFloor[0]+2].levelColumn[i]); + + bNode_1.Add(levelMap[rewardNodeFloor[1]].levelColumn[i]); + bNode_2.Add(levelMap[rewardNodeFloor[1] + 2].levelColumn[i]); + } + levelNodes .Add(aNode_1); + levelNodes .Add(aNode_2); + levelNodes.Add(bNode_1); + levelNodes.Add(bNode_2); + int shopA_l = Random.Range(0, 2); + int shopA_C = Random.Range(0, levelNodes[shopA_l].Count); + int shopB_l = Random.Range(2, 4); + int shopB_C = Random.Range(0, levelNodes[shopB_l].Count); + levelNodes[shopA_l][shopA_C ].SetUpRoom(RoomType.shop); + levelNodes[shopB_l][shopB_C].SetUpRoom(RoomType.shop); + levelNodes[shopA_l][shopA_C] = null; + levelNodes[shopB_l][shopB_C] = null; + for (int i = 0; i nextLevelNodes, int line, int column) + { + HashSet candidateRoomTypeList = new HashSet(); + + while (true) + { + candidateRoomTypeList.Clear(); + + for (int i = 0; i < nextLevelNodes.Count; i++) + { + bool contravenes = true; + LevelDevelopManager.RoomType candidateRoomType = LevelDevelopManager.RoomType.monster; + while (contravenes) + { + contravenes = false; + + //candidateRoomType = GetRoomTypeByWeight();//获取后选房间类型 + LevelNode currentLevelNode = nextLevelNodes[i]; + + switch (candidateRoomType) + { + case LevelDevelopManager.RoomType.monster: + + break; + case LevelDevelopManager.RoomType.eliteMonster: + foreach (var fatherRoom in currentLevelNode.fatherLevelNodes) + { + if (fatherRoom.roomType == LevelDevelopManager.RoomType.eliteMonster || line < 5) + { + contravenes = true; + } + } + break; + case LevelDevelopManager.RoomType.incident: + + break; + case LevelDevelopManager.RoomType.campfire: + foreach (var fatherRoom in currentLevelNode.fatherLevelNodes) + { + if (fatherRoom.roomType == LevelDevelopManager.RoomType.campfire || line == generatorLine - 3 || line < 5) + { + contravenes = true; + } + } + break; + case LevelDevelopManager.RoomType.shop: + foreach (var fatherRoom in currentLevelNode.fatherLevelNodes) + { + if (fatherRoom.roomType == LevelDevelopManager.RoomType.shop) + { + contravenes = true; + } + } + break; + } + + } + candidateRoomTypeList.Add(candidateRoomType); + } + + if (candidateRoomTypeList.Count == nextLevelNodes.Count) + { + + List roomTypes = candidateRoomTypeList.ToList(); + for (int k = 0; k < nextLevelNodes.Count; k++) + { + Debug.Log(roomTypes[k]); + nextLevelNodes[k].SetUpRoom(roomTypes[k]); + } + + break; + } + + } + + } + //显示连线,设置能否进入 + public void ShowMap() + { + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + if (LevelDevelopManager.Instance.levelMap[i].levelColumn[j].isUse == false) + { + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].gameObject.SetActive(false); + } + else + { + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].GetComponent().LineShow(); + } + LevelDevelopManager.Instance.levelMap[i].levelColumn[j].GetComponent().JudgeCanEnter(); + } + + } + + } + + //载入保存数据 + public void SaveDataLoader() + { + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList.Clear(); + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList.Add(LevelDevelopManager.Instance.levelMap[i].levelColumn[j].ReturnSaveData()); + } + + } + } + + //根据保存的信息生成地图 + public void GeneratorLevelMapFormSave() + { + for (int i = 0; i < LevelDevelopManager.Instance.levelDevelopData.levelSaveMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList.Count; j++) + { + LevelDevelopData_SO.levelData currentLevelData = LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList[j]; + + if (i == generatorLine - 1) + { + LevelNode currentNode = GenerateLevelBossNode(i, j, currentLevelData.nodePos); + currentNode.SetUpRoomWithRoomData(currentLevelData); + + } + else + { + LevelNode currentNode = GenerateLevelNode(i, j, currentLevelData.nodePos); + currentNode.SetUpRoomWithRoomData(currentLevelData); + } + + } + + } + for (int i = 0; i < LevelDevelopManager.Instance.levelDevelopData.levelSaveMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList.Count; j++) + { + LevelDevelopData_SO.levelData currentLevelData = LevelDevelopManager.Instance.levelDevelopData.levelSaveMap[i].levelDataList[j]; + LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[i].levelColumn[j]; + currentLevelNode.SetUpRoomLinkWithRoomData(currentLevelData); + + if (currentLevelNode.isUse == false) + { + currentLevelNode.gameObject.SetActive(false); + } + else + { + currentLevelNode.LineShow(); + } + //设置进度标识 + if (currentLevelNode.isPassBy == true) + { + currentLevelNode.passByMark.SetActive(true); + } + currentLevelNode.JudgeCanEnter(); + } + + } + //判断能否进入 + int line = LevelDevelopManager.Instance.levelDevelopData.levelStep; + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[line].levelColumn.Count; j++) + { + LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[line].levelColumn[j]; + currentLevelNode.JudgeRoadCanEnter(); + } + + } + //设置房间怪物组和地图 + public void SetRoomEnemyPoolAndMap() + { + ReadEnemyPoolInforCsv(enemyPoolFileName); + //权重概率表 + Dictionary weakProbabilityDic = new Dictionary(); + int weakTotalWight = 0; + foreach (var pool in probabilityDictionaryWeak.Keys.ToList()) + { + weakTotalWight += int.Parse(probabilityDictionaryWeak[pool][2]); + weakProbabilityDic.Add(weakTotalWight, pool); + } + List strongProbabilityList = probabilityDictionaryStrong.Keys.ToList(); + List eliteProbabilityList = probabilityDictionaryElite.Keys.ToList(); + List bossProbabilityList = probabilityDictionaryBoss.Keys.ToList(); + //设置怪物池 + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[i].levelColumn[j]; + switch (currentLevelNode.roomType) + { + case RoomType.monster: + if (i < 5) + { + currentLevelNode.fightEenemyPool = Name.EnemyPool.Weak; + //根据怪物池随机怪物组和地图 + int mark1 = Random.Range(0, weakTotalWight); + List weakProbabilityList = weakProbabilityDic.Keys.ToList(); + for (int a = 0; a < weakProbabilityList.Count; a++) + { + if (mark1 < weakProbabilityList[a]) + { + string[] enemys = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + break; + } + } + } + else + { + currentLevelNode.fightEenemyPool = Name.EnemyPool.Strong; + //根据怪物池随机怪物组和地图 + int mark2 = Random.Range(0, 100); + for (int a = 0; a < strongProbabilityList.Count; a++) + { + if (mark2 < strongProbabilityList[a]) + { + string[] enemys = probabilityDictionaryStrong[strongProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryStrong[strongProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + } + break; + case RoomType.boss: + currentLevelNode.fightEenemyPool = Name.EnemyPool.Boss; + //根据怪物池随机怪物组和地图 + int mark3 = Random.Range(0, 100); + for (int a = 0; a < bossProbabilityList.Count; a++) + { + if (mark3 < bossProbabilityList[a]) + { + string[] enemys = probabilityDictionaryBoss[bossProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryBoss[bossProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + break; + case RoomType.eliteMonster: + currentLevelNode.fightEenemyPool = Name.EnemyPool.Elite; + //根据怪物池随机怪物组和地图 + int mark4 = Random.Range(0, 100); + for (int a = 0; a < eliteProbabilityList.Count; a++) + { + if (mark4 < eliteProbabilityList[a]) + { + string[] enemys = probabilityDictionaryElite[eliteProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryElite[eliteProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + break; + } + } + } + + } + + public void ReadEnemyPoolInforCsv(string fileName) + { + string filePath = Path.Combine(Application.streamingAssetsPath, fileName); + using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using (StreamReader reader = new StreamReader(fs)) + { + bool isFirstLine = true; + while (!reader.EndOfStream) + { + string line = reader.ReadLine(); + if (isFirstLine) + { + isFirstLine = false; + continue; // 跳过标题行 + } + // 用逗号分隔每行数据 + string[] values = line.Split(','); + switch (values[1]) + { + case Name.EnemyPool.Weak: + probabilityDictionaryWeak.Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Strong: + probabilityDictionaryStrong.Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Elite: + probabilityDictionaryElite.Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Boss: + probabilityDictionaryBoss.Add(int.Parse(values[0]), values.ToList()); + break; + } + } + } + } +} diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs.meta b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs.meta new file mode 100644 index 00000000..93cd742f --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LeveGeneraterNew.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9357c62ffeceff4468da4ccfd5b937a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelDevelopManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelDevelopManager.cs index 3d4e6e7c..6e363736 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelDevelopManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelDevelopManager.cs @@ -26,6 +26,12 @@ public class LevelDevelopManager : Singleton public Sprite campfireIcon; public Sprite incidentIcon; public Sprite treasureIcon; + public Sprite forgingIcon; + public Sprite deleteCardIcon; + public Sprite addCardIcon; + public Sprite resourceIcon; + public Sprite potionIcon; + public Sprite startIcon; public enum RoomType { monster, @@ -34,8 +40,13 @@ public class LevelDevelopManager : Singleton shop, campfire, incident, - treasure - + treasure, + forging,//锻造 + deleteCard, + addCard, + resource, + potion, + start } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs index 0dd860a5..289bc2da 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelGenerator.cs @@ -1,8 +1,7 @@ -using System.Collections; using System.Collections.Generic; +using System.IO; using System.Linq; using UnityEngine; -using UnityEngine.UI; using static LevelDevelopManager; public class LevelGenerator : Singleton @@ -53,6 +52,12 @@ public class LevelGenerator : Singleton public List levelPrefabList = new List(); public List BossLevelPrefabList = new List(); + [Header("怪物池地图概率字典")] + public string enemyPoolFileName; + Dictionary> probabilityDictionaryWeak = new Dictionary>(); + Dictionary> probabilityDictionaryStrong = new Dictionary>(); + Dictionary> probabilityDictionaryElite = new Dictionary>(); + Dictionary> probabilityDictionaryBoss = new Dictionary>(); private void Start() { originalPoint= generatorPoint.transform.position; @@ -78,6 +83,7 @@ public class LevelGenerator : Singleton CheckEliteMonster(); SetRoomBig(); ShowMap(); + SetRoomEnemyPoolAndMap(); } //生成网格 public void GenerateGridMap( int generatorLine,int generatorColumn) @@ -715,5 +721,134 @@ public class LevelGenerator : Singleton } } + //设置房间怪物组和地图 + public void SetRoomEnemyPoolAndMap() + { + ReadEnemyPoolInforCsv(enemyPoolFileName); + //权重概率表 + Dictionary weakProbabilityDic = new Dictionary(); + int weakTotalWight = 0; + foreach (var pool in probabilityDictionaryWeak.Keys.ToList()) + { + weakTotalWight += int.Parse(probabilityDictionaryWeak[pool][2]); + weakProbabilityDic.Add(weakTotalWight,pool); + } + List strongProbabilityList = probabilityDictionaryStrong.Keys.ToList(); + List eliteProbabilityList = probabilityDictionaryElite.Keys.ToList(); + List bossProbabilityList = probabilityDictionaryBoss.Keys.ToList(); + //设置怪物池 + for (int i = 0; i < LevelDevelopManager.Instance.levelMap.Count; i++) + { + for (int j = 0; j < LevelDevelopManager.Instance.levelMap[i].levelColumn.Count; j++) + { + LevelNode currentLevelNode = LevelDevelopManager.Instance.levelMap[i].levelColumn[j]; + switch (currentLevelNode.roomType) + { + case RoomType.monster: + if (i < 5) + { + currentLevelNode.fightEenemyPool = Name.EnemyPool.Weak; + //根据怪物池随机怪物组和地图 + int mark1 = Random.Range(0, weakTotalWight); + List weakProbabilityList = weakProbabilityDic .Keys .ToList(); + for (int a = 0; a < weakProbabilityList.Count; a++) + { + if (mark1 < weakProbabilityList[a]) + { + string[] enemys = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryWeak[weakProbabilityDic[weakProbabilityList[a]]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + break; + } + } + } + else + { + currentLevelNode.fightEenemyPool = Name.EnemyPool.Strong; + //根据怪物池随机怪物组和地图 + int mark2 = Random.Range(0, 100); + for (int a = 0; a < strongProbabilityList.Count; a++) + { + if (mark2 < strongProbabilityList[a]) + { + string[] enemys = probabilityDictionaryStrong[strongProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryStrong[strongProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + } + break; + case RoomType.boss: + currentLevelNode.fightEenemyPool = Name.EnemyPool.Boss; + //根据怪物池随机怪物组和地图 + int mark3 = Random.Range(0, 100); + for (int a = 0; a < bossProbabilityList.Count; a++) + { + if (mark3 < bossProbabilityList[a]) + { + string[] enemys = probabilityDictionaryBoss[bossProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryBoss[bossProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + break; + case RoomType.eliteMonster: + currentLevelNode.fightEenemyPool = Name.EnemyPool.Elite; + //根据怪物池随机怪物组和地图 + int mark4 = Random.Range(0, 100); + for (int a = 0; a < eliteProbabilityList.Count; a++) + { + if (mark4 < eliteProbabilityList[a]) + { + string[] enemys = probabilityDictionaryElite[eliteProbabilityList[a]][3].Split(';'); + currentLevelNode.enemyList = enemys.ToList(); + string[] maps = probabilityDictionaryElite[eliteProbabilityList[a]][4].Split(';'); + currentLevelNode.mapIndex = maps[Random.Range(0, maps.Count())]; + } + } + break; + } + } + } + + } + public void ReadEnemyPoolInforCsv(string fileName) + { + string filePath = Path.Combine(Application.streamingAssetsPath, fileName); + using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using (StreamReader reader = new StreamReader(fs)) + { + bool isFirstLine = true; + while (!reader.EndOfStream) + { + string line = reader.ReadLine(); + if (isFirstLine) + { + isFirstLine = false; + continue; // 跳过标题行 + } + // 用逗号分隔每行数据 + string[] values = line.Split(','); + switch (values[1]) + { + case Name.EnemyPool.Weak: + probabilityDictionaryWeak.Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Strong: + probabilityDictionaryStrong .Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Elite: + probabilityDictionaryElite.Add(int.Parse(values[0]), values.ToList()); + break; + case Name.EnemyPool.Boss: + probabilityDictionaryBoss.Add(int.Parse(values[0]), values.ToList()); + break; + } + } + } + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs index f7147567..b2504915 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs @@ -31,7 +31,13 @@ public class LevelNode : MonoBehaviour public Text roomText; [Header("路过房间标识")] public GameObject passByMark; - + //怪物地图生成参数 + [Header("当前战斗怪物池强度")] + public string fightEenemyPool; + [Header("当前战斗怪物列表")] + public List enemyList = new List(); + [Header("当前战斗地图")] + public string mapIndex; private void OnEnable() { roomIcon = this.transform.GetChild(1).GetComponent(); @@ -118,11 +124,11 @@ public class LevelNode : MonoBehaviour LevelDevelopManager.Instance.levelDevelopData.levelStep += 1; //计算敌人强度 - if (roomType == LevelDevelopManager.RoomType.monster || roomType == LevelDevelopManager.RoomType.eliteMonster || roomType == LevelDevelopManager.RoomType.boss) + /* if (roomType == LevelDevelopManager.RoomType.monster || roomType == LevelDevelopManager.RoomType.eliteMonster || roomType == LevelDevelopManager.RoomType.boss) { PlayerStatsManager.Instance.CalculateEnemyStrength(roomType); - } - + }*/ + ScenceLoadManager.Instance.LoadTargetLevel(roomDestinationIndex); @@ -168,6 +174,13 @@ public class LevelNode : MonoBehaviour { levelData.nextLevelNodes.Add(new Vector2(child.line, child.column)); } + levelData.fightEenemyPool = fightEenemyPool; + foreach (var enemy in enemyList) + { + levelData.enemyList.Add(enemy); + } + levelData .mapIndex = mapIndex; + return levelData; } @@ -226,6 +239,30 @@ public class LevelNode : MonoBehaviour roomText.text = "宝箱"; roomIcon.sprite = LevelDevelopManager.Instance.treasureIcon; break; + case LevelDevelopManager.RoomType.forging: + roomText.text = "锻造"; + roomIcon.sprite = LevelDevelopManager.Instance.forgingIcon; + break; + case LevelDevelopManager.RoomType.deleteCard: + roomText.text = "删卡"; + roomIcon.sprite = LevelDevelopManager.Instance.deleteCardIcon; + break; + case LevelDevelopManager.RoomType.addCard: + roomText.text = "新卡"; + roomIcon.sprite = LevelDevelopManager.Instance.addCardIcon; + break; + case LevelDevelopManager.RoomType.resource: + roomText.text = "资源"; + roomIcon.sprite = LevelDevelopManager.Instance.resourceIcon; + break; + case LevelDevelopManager.RoomType.potion: + roomText.text = "药水"; + roomIcon.sprite = LevelDevelopManager.Instance.potionIcon; + break; + case LevelDevelopManager.RoomType.start: + roomText.text = "开始"; + roomIcon.sprite = LevelDevelopManager.Instance.startIcon; + break; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs index d2a54fa7..25e85786 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.Rendering.VirtualTexturing; using UnityEngine.UI; @@ -49,6 +50,9 @@ public class MapManager : Singleton public GameObject paper; [Header("白色太阳")] public Image whiteColorNode; + [Header("生成物品")] + public string itemPrefabPath; + void Start() { StartCoroutine (starttest()); @@ -125,11 +129,7 @@ public class MapManager : Singleton enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.bossEnemyPool); break; } - foreach (string a in enemyList) - { - Debug.Log("怪物是" + a); - } - + List enemyListTest =new List (); HashSet mapSet = new HashSet (); List mapList = new List (); @@ -184,8 +184,8 @@ public class MapManager : Singleton bookAnim.GetComponent().SetTrigger("move"); //书缝愈合 //bookUpAnim.SetActive(true); - StartCoroutine(GenerateProcessTest()); - enemyBurn(PlayerStatsManager.Instance.levelDevelopData.fightEenemyPool); + StartCoroutine(GenerateProcessTest()); + // enemyBurn(PlayerStatsManager.Instance.levelDevelopData.fightEenemyPool); } //总动画控制进程 public void ContinueProgress() @@ -202,6 +202,7 @@ public class MapManager : Singleton yield return StartCoroutine(SetUpMapUnityForCube()); yield return StartCoroutine(UPMoveMapUnity()); yield return new WaitForSeconds(2); + yield return StartCoroutine(GenerateItem()); yield return StartCoroutine(EnemyGenerate()); yield return StartCoroutine(CompleteGenerate()); CardManager.createCardImageMap(); @@ -310,6 +311,28 @@ public class MapManager : Singleton enemynode.positionY = enemy.locationY; enemynode.StartPosition(); } + LevelDevelopData_SO levelData_SO = PlayerStatsManager.Instance.levelDevelopData; + LevelDevelopData_SO.levelData currentLevelData = levelData_SO.levelSaveMap[(int)levelData_SO.currentPoint.x].levelDataList[(int)levelData_SO.currentPoint.y]; + List enemyList = new List(); + foreach (var enemyID in currentLevelData.enemyList) + { + enemyList.Add(EnemyPool.enemyIndexToString(int.Parse(enemyID))); + } + List enemyPrefabList = EnemyPool.getEnemyPrefab(enemyList); + + HashSet allCanUseNode = getNodeTools.getAllCanUseNode(); + foreach (var enemyPrefab in enemyPrefabList) + { + MapUnity currentMapUnity = allCanUseNode.ElementAt(Random.Range(0, allCanUseNode.Count)); + var currentEnemy = Instantiate(enemyPrefab, currentMapUnity.transform.position,enemyPrefab.transform.rotation); + EnemyNode enemynode = currentEnemy.GetComponent(); + enemynode.positionX = currentMapUnity.locationX; + enemynode.positionY = currentMapUnity.locationY; + enemynode.StartPosition(); + allCanUseNode.Remove(currentMapUnity); + yield return null; + } + yield return null; } IEnumerator SetUpMapUnity() @@ -586,6 +609,44 @@ public class MapManager : Singleton } } + //生成初始物品 + IEnumerator GenerateItem() + { + LevelDevelopData_SO levelData_SO = PlayerStatsManager.Instance.levelDevelopData; + LevelDevelopData_SO.levelData currentLevelData = levelData_SO.levelSaveMap[(int)levelData_SO.currentPoint.x].levelDataList[(int)levelData_SO.currentPoint.y]; + List itemList = PlayerStatsManager.Instance.itemInforDic[int.Parse(currentLevelData.mapIndex)]; + HashSet allNode = getNodeTools.getAllCanUseNode(); + for (int i=0;i(itemPrefabPath + values[0]); + int itemCount = Random.Range(int.Parse(values[1]), int.Parse(values[2])); + for(int j=0;j takeOverNode = item.GetComponent().TakeOverCalculation(currentNode); + if(takeOverNode !=null ) + { + if (takeOverNode.IsSubsetOf(allNode)) + { + item.GetComponent().GenerateBlockItem(currentNode, item); + allNode.ExceptWith(takeOverNode); + break; + } + } + + } + + } + yield return null; + } + + yield return null; + } [System .Serializable ] public class EnemyGenerateData { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs index 82e19303..f3509507 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs @@ -1,9 +1,11 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO; using System.Linq; using Unity.VisualScripting; using UnityEngine; +using static Name; public class PlayerStatsManager : Singleton { @@ -26,12 +28,17 @@ public class PlayerStatsManager : Singleton public bool isPass; [Header("是否经是宝箱")] public bool isTreasure; + + [Header("房间物品字典")] + public string itemCsvFilePath; + public Dictionary> itemInforDic = new Dictionary>(); + private void Start() { DontDestroyOnLoad(this.gameObject); - + ReadItemInforCsv(itemCsvFilePath); } //选项效果==加一个同步UI的订阅系统 @@ -141,30 +148,28 @@ public class PlayerStatsManager : Singleton return cardPrefab; } - //计算怪物强度 - public void CalculateEnemyStrength(LevelDevelopManager .RoomType currentRoomType ) + + //读取房间生成物品字典 + public void ReadItemInforCsv(string fileName) { - if(levelDevelopData.levelStep == levelDevelopData.levelSaveMap .Count -1) - { - levelDevelopData.fightEenemyPool = Name.EnemyPool.Boss; - return; - } - if (levelDevelopData.levelStep<5) - { - if(currentRoomType != LevelDevelopManager.RoomType.eliteMonster ) - { - levelDevelopData.fightEenemyPool = Name.EnemyPool.Weak; - } - } - else + string filePath = Path.Combine(Application.streamingAssetsPath, fileName); + using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) + using (StreamReader reader = new StreamReader(fs)) { - if (currentRoomType != LevelDevelopManager.RoomType.eliteMonster) - { - levelDevelopData.fightEenemyPool = Name.EnemyPool.Strong; - } - else + bool isFirstLine = true; + while (!reader.EndOfStream) { - levelDevelopData.fightEenemyPool = Name.EnemyPool.Elite; + string line = reader.ReadLine(); + if (isFirstLine) + { + isFirstLine = false; + continue; // 跳过标题行 + } + // 用逗号分隔每行数据 + string[] values = line.Split(','); + List itemInfor = values.ToList(); + itemInfor.RemoveAt(0); + itemInforDic.Add(int.Parse(values[0]), itemInfor); } } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs index e2b13593..ee9894ed 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/LevelDevelopData_SO.cs @@ -7,12 +7,10 @@ using UnityEngine; public class LevelDevelopData_SO : ScriptableObject { public int levelStep;//关卡前进步数 + public int mapLevel;//大关层数 public Vector2 currentPoint;//当前选择关卡,用来判断下一步那些可以走 public List levelSaveMap = new List();//关卡保存数据列表 - [Header("当前层战斗怪物池")] - public string fightEenemyPool; - [System.Serializable] public class LevelDataList { @@ -30,5 +28,12 @@ public class LevelDevelopData_SO : ScriptableObject public List fatherLevelNodes = new List(); public List nextLevelNodes = new List(); + + //当前层战斗怪物池强度 + public string fightEenemyPool; + //当前层战斗怪物列表 + public List enemyList = new List(); + //当前层战斗地图 + public string mapIndex; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs index 22bc5cc8..878dcafa 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/PlayerState_SO.cs @@ -29,6 +29,7 @@ public class PlayerState_SO : ScriptableObject public int cardRewardNumToGget;//实际可以选择卡牌奖励的数量 + public int canColorCount;//玩家可以初始染色多少地块 [Header("资源系统")] public int money; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs index f9458b14..bc762ced 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/getNodeTools.cs @@ -751,4 +751,22 @@ public class getNodeTools return influencePreviewPool; } + + //拿到全图可用节点 + public static HashSet getAllCanUseNode() + { + HashSet mapUnities = new HashSet(); + for (int i=0;i