diff --git a/Assets/AI/Demon/Meteor.prefab b/Assets/AI/Demon/Meteor.prefab index eed472bb0..e3b817858 100644 --- a/Assets/AI/Demon/Meteor.prefab +++ b/Assets/AI/Demon/Meteor.prefab @@ -4784,14 +4784,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947871717301538} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4577187839491108} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198706150799401992 ParticleSystem: m_ObjectHideFlags: 0 diff --git a/Assets/AI/FSM/FSM_Giant.asset b/Assets/AI/FSM/FSM_Giant.asset index 93df1c4e6..ec49e2aa7 100644 --- a/Assets/AI/FSM/FSM_Giant.asset +++ b/Assets/AI/FSM/FSM_Giant.asset @@ -190,11 +190,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -65 - y: 225 + x: 505 + y: 280 width: 150 height: 62 - positionRect: {x: -65, y: 225} + positionRect: {x: 505, y: 280} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 1, a: 1} @@ -206,7 +206,7 @@ MonoBehaviour: - decisions: - trueValue: 1 decision: {fileID: 5430119601860107240} - isValid: 0 + isValid: 1 validated: 0 - trueValue: 1 decision: {fileID: 117913083446138218} @@ -221,14 +221,14 @@ MonoBehaviour: parentState: {fileID: -6568372008305276654} trueRect: serializedVersion: 2 - x: 85 - y: 255 + x: 655 + y: 310 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 85 - y: 265 + x: 655 + y: 320 width: 10 height: 10 selectedTrue: 0 @@ -259,23 +259,15 @@ MonoBehaviour: parentFSM: {fileID: 11400000} executionType: -1 editingName: 0 - rockPrefab: {fileID: 1947871717301538, guid: 9591667a35466484096c6e63785e136c, type: 3} + meteorPrefab: {fileID: 0} decalPrefab: {fileID: 1743301284569550, guid: ad2ab49d0a2a17148bd51c93d977bdbc, type: 3} - meteorHeight: 30 + spawnHeight: 40 castDelay: 1.5 - obstacleCheckRadius: 2 - obstacleLayerMask: + groundMask: serializedVersion: 2 m_Bits: 4294967295 - groundLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - animatorBlockingBool: IsBlocking - maxGroundDistance: 100 - airCheckHeight: 5 enableDebug: 1 - showGizmos: 1 --- !u!114 &-6379838510941931433 MonoBehaviour: m_ObjectHideFlags: 1 @@ -329,11 +321,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: -25 - y: 380 + x: 545 + y: 435 width: 150 height: 106 - positionRect: {x: -25, y: 380} + positionRect: {x: 545, y: 435} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -360,14 +352,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 125 - y: 410 + x: 695 + y: 465 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 125 - y: 420 + x: 695 + y: 475 width: 10 height: 10 selectedTrue: 0 @@ -388,14 +380,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 125 - y: 432 + x: 695 + y: 487 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 125 - y: 442 + x: 695 + y: 497 width: 10 height: 10 selectedTrue: 0 @@ -424,14 +416,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 125 - y: 454 + x: 695 + y: 509 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 125 - y: 464 + x: 695 + y: 519 width: 10 height: 10 selectedTrue: 0 @@ -582,11 +574,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 250 - y: 230 + x: 820 + y: 285 width: 150 height: 62 - positionRect: {x: 250, y: 230} + positionRect: {x: 820, y: 285} rectWidth: 150 editingName: 1 nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1} @@ -605,14 +597,14 @@ MonoBehaviour: parentState: {fileID: -3177478727897100882} trueRect: serializedVersion: 2 - x: 400 - y: 260 + x: 970 + y: 315 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 400 - y: 270 + x: 970 + y: 325 width: 10 height: 10 selectedTrue: 0 @@ -651,11 +643,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 550 - y: 185 + x: 1120 + y: 240 width: 150 height: 62 - positionRect: {x: 550, y: 185} + positionRect: {x: 1120, y: 240} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1} @@ -667,7 +659,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: 7927421991537792917} - isValid: 0 + isValid: 1 validated: 0 trueState: {fileID: -312774025800194259} falseState: {fileID: 0} @@ -678,14 +670,14 @@ MonoBehaviour: parentState: {fileID: -2904979146780567904} trueRect: serializedVersion: 2 - x: 540 - y: 215 + x: 1110 + y: 270 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 700 - y: 225 + x: 1270 + y: 280 width: 10 height: 10 selectedTrue: 0 @@ -813,11 +805,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 250 - y: 170 + x: 820 + y: 225 width: 150 height: 30 - positionRect: {x: 250, y: 170} + positionRect: {x: 820, y: 225} rectWidth: 150 editingName: 0 nodeColor: {r: 0, g: 1, b: 0, a: 1} @@ -889,11 +881,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 55 - y: 640 + x: 625 + y: 695 width: 150 height: 150 - positionRect: {x: 55, y: 640} + positionRect: {x: 625, y: 695} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1} @@ -920,14 +912,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 205 - y: 670 + x: 775 + y: 725 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 205 - y: 680 + x: 775 + y: 735 width: 10 height: 10 selectedTrue: 0 @@ -952,14 +944,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 205 - y: 692 + x: 775 + y: 747 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 205 - y: 702 + x: 775 + y: 757 width: 10 height: 10 selectedTrue: 0 @@ -992,14 +984,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 45 - y: 714 + x: 615 + y: 769 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 205 - y: 724 + x: 775 + y: 779 width: 10 height: 10 selectedTrue: 0 @@ -1028,14 +1020,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 205 - y: 736 + x: 775 + y: 791 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 205 - y: 746 + x: 775 + y: 801 width: 10 height: 10 selectedTrue: 0 @@ -1060,14 +1052,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 205 - y: 758 + x: 775 + y: 813 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 205 - y: 768 + x: 775 + y: 823 width: 10 height: 10 selectedTrue: 0 @@ -1128,7 +1120,7 @@ MonoBehaviour: - {fileID: 2986668563461644515} - {fileID: 762670965814380212} - {fileID: 2691300596403639167} - panOffset: {x: -415, y: 325} + panOffset: {x: 155, y: 380} overNode: 0 actions: - {fileID: 0} @@ -1212,11 +1204,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 1070 - y: 870 + x: 1640 + y: 925 width: 150 height: 62 - positionRect: {x: 1070, y: 870} + positionRect: {x: 1640, y: 925} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1235,14 +1227,14 @@ MonoBehaviour: parentState: {fileID: 762670965814380212} trueRect: serializedVersion: 2 - x: 1060 - y: 900 + x: 1630 + y: 955 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1220 - y: 910 + x: 1790 + y: 965 width: 10 height: 10 selectedTrue: 0 @@ -1331,11 +1323,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 860 - y: 870 + x: 1430 + y: 925 width: 150 height: 62 - positionRect: {x: 860, y: 870} + positionRect: {x: 1430, y: 925} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1354,14 +1346,14 @@ MonoBehaviour: parentState: {fileID: 2691300596403639167} trueRect: serializedVersion: 2 - x: 850 - y: 900 + x: 1420 + y: 955 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1010 - y: 910 + x: 1580 + y: 965 width: 10 height: 10 selectedTrue: 0 @@ -1398,14 +1390,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 1 + isSelected: 0 nodeRect: serializedVersion: 2 - x: 605 - y: 590 + x: 1175 + y: 645 width: 150 height: 84 - positionRect: {x: 605, y: 590} + positionRect: {x: 1175, y: 645} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -1428,14 +1420,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 595 - y: 620 + x: 1165 + y: 675 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 755 - y: 630 + x: 1325 + y: 685 width: 10 height: 10 selectedTrue: 0 @@ -1460,14 +1452,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 595 - y: 642 + x: 1165 + y: 697 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 755 - y: 652 + x: 1325 + y: 707 width: 10 height: 10 selectedTrue: 0 diff --git a/Assets/AI/Gigant/Giant.prefab b/Assets/AI/Gigant/Giant.prefab index 4b88f3699..30571e381 100644 --- a/Assets/AI/Gigant/Giant.prefab +++ b/Assets/AI/Gigant/Giant.prefab @@ -4330,7 +4330,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.89749706, z: 0, w: 0.4410204} m_LocalPosition: {x: 29.489, y: 39.805, z: -73.207} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalScale: {x: 1.4, y: 1.4, z: 1.4} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1068312318837538154} diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena.unity b/Assets/Scenes/Fight_Arena/Fight_Arena.unity index 5035dbf62..f1d3698ed 100644 --- a/Assets/Scenes/Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/Fight_Arena/Fight_Arena.unity @@ -4275,6 +4275,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &578080577 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8317937118480752073, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + m_PrefabInstance: {fileID: 861395855} + m_PrefabAsset: {fileID: 0} --- !u!4 &579328270 stripped Transform: m_CorrespondingSourceObject: {fileID: 5278190478906961760, guid: dbf14178717e1164086bd444126f4446, @@ -14597,6 +14603,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4686021680198530386, guid: fe3f8cbdaa5d03147a0de1c74712d32b, + type: 3} + propertyPath: openCloseWindow + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4791573857600969483, guid: fe3f8cbdaa5d03147a0de1c74712d32b, type: 3} propertyPath: m_AnchorMax.x @@ -17099,7 +17110,7 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26 + value: -26.000061 objectReference: {fileID: 0} - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -23081,6 +23092,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2267343374276098611, guid: 05db168aa73c6d7489b4930e8ac0f2ce, + type: 3} + propertyPath: targetIcon + value: + objectReference: {fileID: 578080577} - target: {fileID: 7295495070482139567, guid: 05db168aa73c6d7489b4930e8ac0f2ce, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Scenes/Fight_Arena/Fight_Arena/NavMesh-Navmesh.asset b/Assets/Scenes/Fight_Arena/Fight_Arena/NavMesh-Navmesh.asset index 2a224a752..570e8c750 100644 Binary files a/Assets/Scenes/Fight_Arena/Fight_Arena/NavMesh-Navmesh.asset and b/Assets/Scenes/Fight_Arena/Fight_Arena/NavMesh-Navmesh.asset differ