diff --git a/Assets/AI/FSM/FSM_Archer_Skeleton.asset b/Assets/AI/FSM/FSM_Archer_Skeleton.asset index a59f73156..490dd55e3 100644 --- a/Assets/AI/FSM/FSM_Archer_Skeleton.asset +++ b/Assets/AI/FSM/FSM_Archer_Skeleton.asset @@ -196,11 +196,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 345 - y: 150 + x: 310 + y: 155 width: 150 height: 62 - positionRect: {x: 345, y: 150} + positionRect: {x: 310, y: 155} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 1, a: 1} @@ -227,14 +227,14 @@ MonoBehaviour: parentState: {fileID: -6568372008305276654} trueRect: serializedVersion: 2 - x: 495 - y: 180 + x: 460 + y: 185 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 495 - y: 190 + x: 460 + y: 195 width: 10 height: 10 selectedTrue: 0 @@ -332,11 +332,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 385 - y: 305 + x: 350 + y: 310 width: 150 height: 106 - positionRect: {x: 385, y: 305} + positionRect: {x: 350, y: 310} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -363,14 +363,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 535 - y: 335 + x: 500 + y: 340 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 535 - y: 345 + x: 500 + y: 350 width: 10 height: 10 selectedTrue: 0 @@ -391,14 +391,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 535 - y: 357 + x: 500 + y: 362 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 535 - y: 367 + x: 500 + y: 372 width: 10 height: 10 selectedTrue: 0 @@ -427,14 +427,14 @@ MonoBehaviour: parentState: {fileID: -6144582714324757854} trueRect: serializedVersion: 2 - x: 535 - y: 379 + x: 500 + y: 384 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 535 - y: 389 + x: 500 + y: 394 width: 10 height: 10 selectedTrue: 0 @@ -603,11 +603,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 630 - y: 155 + x: 595 + y: 160 width: 150 height: 62 - positionRect: {x: 630, y: 155} + positionRect: {x: 595, y: 160} rectWidth: 150 editingName: 1 nodeColor: {r: 0.10323405, g: 1, b: 0, a: 1} @@ -626,14 +626,14 @@ MonoBehaviour: parentState: {fileID: -3177478727897100882} trueRect: serializedVersion: 2 - x: 780 - y: 185 + x: 745 + y: 190 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 780 - y: 195 + x: 745 + y: 200 width: 10 height: 10 selectedTrue: 0 @@ -672,11 +672,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 930 - y: 115 + x: 895 + y: 120 width: 150 height: 62 - positionRect: {x: 930, y: 115} + positionRect: {x: 895, y: 120} rectWidth: 150 editingName: 1 nodeColor: {r: 0, g: 1, b: 0.004989147, a: 1} @@ -688,7 +688,7 @@ MonoBehaviour: - decisions: - trueValue: 0 decision: {fileID: 7927421991537792917} - isValid: 1 + isValid: 0 validated: 0 trueState: {fileID: -312774025800194259} falseState: {fileID: 0} @@ -699,14 +699,14 @@ MonoBehaviour: parentState: {fileID: -2904979146780567904} trueRect: serializedVersion: 2 - x: 920 - y: 145 + x: 885 + y: 150 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1080 - y: 155 + x: 1045 + y: 160 width: 10 height: 10 selectedTrue: 0 @@ -843,11 +843,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 630 - y: 100 + x: 595 + y: 105 width: 150 height: 30 - positionRect: {x: 630, y: 100} + positionRect: {x: 595, y: 105} rectWidth: 150 editingName: 0 nodeColor: {r: 0, g: 1, b: 0, a: 1} @@ -916,14 +916,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 0 + isSelected: 1 nodeRect: serializedVersion: 2 - x: 455 - y: 550 + x: 420 + y: 555 width: 150 height: 150 - positionRect: {x: 455, y: 550} + positionRect: {x: 420, y: 555} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0.95132554, b: 0, a: 1} @@ -950,14 +950,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 605 - y: 580 + x: 570 + y: 585 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 605 - y: 590 + x: 570 + y: 595 width: 10 height: 10 selectedTrue: 0 @@ -982,14 +982,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 605 - y: 602 + x: 570 + y: 607 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 605 - y: 612 + x: 570 + y: 617 width: 10 height: 10 selectedTrue: 0 @@ -1022,14 +1022,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 445 - y: 624 + x: 410 + y: 629 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 605 - y: 634 + x: 570 + y: 639 width: 10 height: 10 selectedTrue: 0 @@ -1058,14 +1058,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 605 - y: 646 + x: 570 + y: 651 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 605 - y: 656 + x: 570 + y: 661 width: 10 height: 10 selectedTrue: 0 @@ -1090,14 +1090,14 @@ MonoBehaviour: parentState: {fileID: -312774025800194259} trueRect: serializedVersion: 2 - x: 605 - y: 668 + x: 570 + y: 673 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 605 - y: 678 + x: 570 + y: 683 width: 10 height: 10 selectedTrue: 0 @@ -1144,7 +1144,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a5fc604039227434d8b4e63ebc5e74a5, type: 3} m_Name: FSM_Archer_Skeleton m_EditorClassIdentifier: - selectedNode: {fileID: 2986668563461644515} + selectedNode: {fileID: -312774025800194259} wantConnection: 0 connectionNode: {fileID: 0} showProperties: 1 @@ -1158,7 +1158,7 @@ MonoBehaviour: - {fileID: 2986668563461644515} - {fileID: 762670965814380212} - {fileID: 2691300596403639167} - panOffset: {x: 400, y: 30} + panOffset: {x: 595, y: 105} overNode: 0 actions: - {fileID: 0} @@ -1244,11 +1244,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 1450 - y: 780 + x: 1415 + y: 785 width: 150 height: 62 - positionRect: {x: 1450, y: 780} + positionRect: {x: 1415, y: 785} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1267,14 +1267,14 @@ MonoBehaviour: parentState: {fileID: 762670965814380212} trueRect: serializedVersion: 2 - x: 1440 - y: 810 + x: 1405 + y: 815 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1600 - y: 820 + x: 1565 + y: 825 width: 10 height: 10 selectedTrue: 0 @@ -1363,11 +1363,11 @@ MonoBehaviour: isSelected: 0 nodeRect: serializedVersion: 2 - x: 1240 - y: 780 + x: 1205 + y: 785 width: 150 height: 62 - positionRect: {x: 1240, y: 780} + positionRect: {x: 1205, y: 785} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 1, b: 1, a: 1} @@ -1386,14 +1386,14 @@ MonoBehaviour: parentState: {fileID: 2691300596403639167} trueRect: serializedVersion: 2 - x: 1230 - y: 810 + x: 1195 + y: 815 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1390 - y: 820 + x: 1355 + y: 825 width: 10 height: 10 selectedTrue: 0 @@ -1430,14 +1430,14 @@ MonoBehaviour: canEditName: 1 canEditColor: 1 isOpen: 1 - isSelected: 1 + isSelected: 0 nodeRect: serializedVersion: 2 - x: 985 - y: 500 + x: 950 + y: 505 width: 150 height: 84 - positionRect: {x: 985, y: 500} + positionRect: {x: 950, y: 505} rectWidth: 150 editingName: 1 nodeColor: {r: 1, g: 0, b: 0, a: 1} @@ -1460,14 +1460,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 975 - y: 530 + x: 940 + y: 535 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1135 - y: 540 + x: 1100 + y: 545 width: 10 height: 10 selectedTrue: 0 @@ -1492,14 +1492,14 @@ MonoBehaviour: parentState: {fileID: 2986668563461644515} trueRect: serializedVersion: 2 - x: 975 - y: 552 + x: 940 + y: 557 width: 10 height: 10 falseRect: serializedVersion: 2 - x: 1135 - y: 562 + x: 1100 + y: 567 width: 10 height: 10 selectedTrue: 0 diff --git a/Assets/AI/Summons/Summoner_Barghest.prefab b/Assets/AI/Summons/Summoner_Barghest.prefab index e275f1995..4b9ffbc7a 100644 --- a/Assets/AI/Summons/Summoner_Barghest.prefab +++ b/Assets/AI/Summons/Summoner_Barghest.prefab @@ -538,8 +538,8 @@ MonoBehaviour: useRootMotion: 0 freeSpeed: rotationSpeed: 2 - walkSpeed: 1 - runningSpeed: 1 + walkSpeed: 4 + runningSpeed: 4 sprintSpeed: 1 crouchSpeed: 1 strafeSpeed: diff --git a/Packages/manifest.json b/Packages/manifest.json index 7944dd6e5..0db4e0e6a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -9,6 +9,7 @@ "com.unity.postprocessing": "3.5.0", "com.unity.render-pipelines.universal": "17.0.4", "com.unity.timeline": "1.8.9", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 47b2d77d4..9fae3176f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -215,6 +215,22 @@ "com.unity.searcher": "4.9.3" } }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.5.1", "depth": 1, @@ -247,6 +263,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "2.0.0", "depth": 1,