From ba0d2a2d740b07434e01acfbdf7d56a36b3e65e3 Mon Sep 17 00:00:00 2001 From: SmallPig1997 <664235822@qq.com> Date: Mon, 7 Mar 2022 20:12:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=8C=E6=96=B9=E6=9C=BA?= =?UTF-8?q?=E5=99=A8=E4=BA=BA=E8=B5=B0=E8=B7=AF=E6=96=B9=E5=90=91=E9=94=99?= =?UTF-8?q?=E8=AF=AFbug=EF=BC=8Cy=E8=BD=B4=E6=8C=89=E9=92=AE=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=98=B2=E5=BE=A1=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Gizmos/MoveAction.cs | 7 +-- Assets/Scenes/GameScene.unity | 26 +++++----- Packages/manifest.json | 10 ++-- Packages/packages-lock.json | 18 ++----- ProjectSettings/InputManager.asset | 4 +- ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 4 +- UserSettings/Layouts/default-2021.dwlt | 68 +++++++++++++------------- 8 files changed, 67 insertions(+), 72 deletions(-) diff --git a/Assets/Gizmos/MoveAction.cs b/Assets/Gizmos/MoveAction.cs index 669dab26..f90a819f 100644 --- a/Assets/Gizmos/MoveAction.cs +++ b/Assets/Gizmos/MoveAction.cs @@ -17,13 +17,14 @@ public override TaskStatus OnUpdate() float distance = Vector3.Distance(transform.position, target.Value.position); if (distance <= maxDistance.Value && distance > minDistance.Value) { - transform.Translate((target.Value.position - transform.position).normalized * speed.Value * Time.deltaTime); - GetComponent().anim.SetFloat("forward",1); + transform.position += (target.Value.position - transform.position).normalized * speed.Value * Time.deltaTime; + transform.LookAt(target.Value); + GetComponent().anim.SetFloat("forward", 1); return TaskStatus.Running; } else { - GetComponent().anim.SetFloat("forward",0); + GetComponent().anim.SetFloat("forward", 0); return TaskStatus.Failure; } } diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 37685831..064a4f1b 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -49921,7 +49921,7 @@ GameObject: - component: {fileID: 533505704} - component: {fileID: 533505703} m_Layer: 5 - m_Name: Defense + m_Name: Defence m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -49960,7 +49960,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3} m_Name: m_EditorClassIdentifier: - Name: AttackLeft + Name: Defence --- !u!114 &533505704 MonoBehaviour: m_ObjectHideFlags: 0 @@ -188809,7 +188809,6 @@ MonoBehaviour: - BehaviorDesigner.Runtime.Tasks.EntryTask - BehaviorDesigner.Runtime.Tasks.Selector - BehaviorDesigner.Runtime.Tasks.Sequence - - BehaviorDesigner.Runtime.Tasks.Unity.UnityTransform.LookAt - MoveAction - BehaviorDesigner.Runtime.Tasks.Wait - BehaviorDesigner.Runtime.Tasks.Sequence @@ -188819,24 +188818,22 @@ MonoBehaviour: - AttackAction - StopAttackAction - StopAttackAction - parentIndex: ffffffff000000000100000002000000020000000200000001000000060000000600000006000000060000000600000001000000 - startIndex: 000000000a000000160000002200000039000000530000006d0000007900000093000000a5000000bc000000ca000000d4000000 + parentIndex: ffffffff0000000001000000020000000200000001000000050000000500000005000000050000000500000001000000 + startIndex: 000000000a00000016000000220000003c00000056000000620000007c0000008e000000a5000000b3000000bd000000 variableStartIndex: JSONSerialization: fieldSerializationData: typeName: [] - fieldNameHash: 2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9012944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901a6beff969f7d55edf06852edc9778c0b07483ab60007900c51f28c0c2a01c72a7838177571f76ccbc2e269cb8c4f46c10f79b97c2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f90162cdf66d5b8c4cc4ac7749c47cc0dc415000964549bfeb9b9aaae89b6af37b19f0767560e935cbb63a21c8b60a6a5b34d86b6262d12ab8b82216b5b8c850c58a2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e973825867956c6dd48e2bc32adf16c02a81a8551003ac852ffc6adb854d56d8851d9f6b0315ab852f0e6adb855f55d8852f9e6b032944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e973825867956c6dd48e2bc32adf16c02a81a8551003ac852ffc6adb854d56d8851d9f6b0315ab852f0e6adb855f55d8852f9e6b032944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9016c85049665445aecb62f57ec8678ea69d86b6262d12ab8b82216b5b8c850c58a2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901a6beff969f7d55edf06852edc9778c0b07483ab60007900c51f28c0c2a01c72a7838177571f76ccbc2e269cb8c4f46c10f79b97c2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e9738258672944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9012944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901 - startIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002a0000002b0000002c0000002d0000002d0000002e0000002f00000030000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003e0000003f000000400000004100000041000000420000004300000044000000440000004500000046000000470000004700000048000000490000004a0000004b0000004c0000004d0000004e0000004f0000005000000051000000520000005300000054000000540000005500000056000000570000005700000058000000590000005a0000005a0000005b0000005c0000005d0000005d0000005e0000005f000000600000006100000062000000630000006400000065000000660000006700000068000000690000006a0000006a0000006b0000006c0000006d0000006e0000006f0000007000000071000000720000007300000074000000750000007500000076000000770000007800000078000000790000007a0000007b0000007b0000007c0000007d0000007e0000007e0000007f000000800000008100000082000000830000008400000085000000860000008700000088000000890000008a0000008b0000008b0000008c0000008d0000008e0000008e0000008f000000900000009100000092000000930000009400000095000000960000009700000098000000990000009a0000009b0000009b0000009c0000009d0000009e0000009e0000009f000000a0000000a1000000a1000000a2000000a3000000a4000000a5000000a6000000a7000000a8000000a9000000aa000000ab000000ac000000ad000000ae000000af000000af000000b0000000b1000000b2000000b3000000b4000000b5000000b6000000b7000000b8000000b9000000ba000000bb000000bc000000bd000000be000000bf000000c0000000c1000000c2000000c3000000c4000000c5000000 - dataPosition: 0000000004000000090000000a0000000b00000013000000130000001400000015000000190000001d00000021000000290000002a0000002b00000033000000330000003400000035000000390000003d00000041000000450000004d0000004e0000004f000000570000005700000058000000590000005d0000006100000065000000690000007000000071000000720000007a0000007a0000007b0000007c0000008000000084000000ad000000ad000000b1000000da000000da000000de0000000401000004010000100100001c010000200100002b0100002c0100002d010000350100003501000036010000370100003b0100003f0100006301000063010000670100008b0100008b0100008f010000b3010000b3010000b7010000df010000df010000e3010000e7010000eb010000ec010000ed010000f5010000f5010000f6010000f7010000fb010000ff0100002302000023020000270200004a0200004a0200004b0200006f0200006f0200007302000097020000970200009b0200009f020000a7020000a8020000a9020000b1020000b1020000b2020000b3020000b7020000bb020000bf020000c3020000c7020000c8020000c9020000d1020000d1020000d2020000d3020000d7020000db020000ff020000ff020000030300002603000026030000270300004b0300004b0300004f0300007303000073030000770300007b0300008f030000900300009103000099030000990300009a0300009b0300009f030000a3030000c7030000c7030000cb030000f3030000f3030000f7030000fb0300000204000003040000040400000c0400000c0400000d0400000e04000012040000160400003f0400003f040000430400006c0400006c040000700400009604000096040000a2040000ae040000b2040000bf040000c0040000c1040000c9040000c9040000ca040000cb040000cf040000d3040000f7040000f7040000fb040000ff0400001105000012050000130500001b0500001b0500001c0500001d0500002105000025050000290500003b0500003c0500003d050000450500004505000046050000470500004b050000 + fieldNameHash: 2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9012944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f90162cdf66d5b8c4cc4ac7749c47cc0dc415000964549bfeb9b9aaae89b6af37b19f0767560e935cbb63a21c8b60a6a5b34d86b6262d12ab8b82216b5b8c850c58a2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e973825867956c6dd48e2bc32adf16c02a81a8551003ac852ffc6adb854d56d8851d9f6b0315ab852f0e6adb855f55d8852f9e6b032944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9018690b4b290adcd7b2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e973825867956c6dd48e2bc32adf16c02a81a8551003ac852ffc6adb854d56d8851d9f6b0315ab852f0e6adb855f55d8852f9e6b032944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9016c85049665445aecb62f57ec8678ea69d86b6262d12ab8b82216b5b8c850c58a2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901a6beff969f7d55edf06852edc9778c0b07483ab60007900c51f28c0c2a01c72a7838177571f76ccbc2e269cb8c4f46c10f79b97c2944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901598f7293524ec8e9a339c5e9738258672944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f9012944782b951203e811c37978c4a37522ae07a096e44d14616fd219c3a5f3b63149269a1caac4f901 + startIndex: 000000000100000002000000030000000400000005000000060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000001f000000200000002100000022000000230000002400000025000000260000002700000028000000290000002a0000002a0000002b0000002c0000002d0000002d0000002e0000002f0000003000000030000000310000003200000033000000330000003400000035000000360000003700000038000000390000003a0000003b0000003c0000003d0000003e0000003f00000040000000400000004100000042000000430000004300000044000000450000004600000046000000470000004800000049000000490000004a0000004b0000004c0000004d0000004e0000004f00000050000000510000005200000053000000540000005500000056000000560000005700000058000000590000005a0000005b0000005c0000005d0000005e0000005f000000600000006100000061000000620000006300000064000000640000006500000066000000670000006700000068000000690000006a0000006a0000006b0000006c0000006d0000006e0000006f00000070000000710000007200000073000000740000007500000076000000770000007700000078000000790000007a0000007a0000007b0000007c0000007d0000007e0000007f00000080000000810000008200000083000000840000008500000086000000870000008700000088000000890000008a0000008a0000008b0000008c0000008d0000008d0000008e0000008f000000900000009100000092000000930000009400000095000000960000009700000098000000990000009a0000009b0000009b0000009c0000009d0000009e0000009f000000a0000000a1000000a2000000a3000000a4000000a5000000a6000000a7000000a8000000a9000000aa000000ab000000ac000000ad000000ae000000af000000b0000000b1000000 + dataPosition: 0000000004000000090000000a0000000b00000013000000130000001400000015000000190000001d00000021000000290000002a0000002b00000033000000330000003400000035000000390000003d00000041000000450000004d0000004e0000004f000000570000005700000058000000590000005d0000006100000065000000690000007400000075000000760000007e0000007e0000007f000000800000008400000088000000ac000000ac000000b0000000d4000000d4000000d8000000fc000000fc0000000001000028010000280100002c010000300100003401000035010000360100003e0100003e0100003f0100004001000044010000480100006c0100006c01000070010000930100009301000094010000b8010000b8010000bc010000e0010000e0010000e4010000e8010000f0010000f1010000f2010000fa010000fa010000fb010000fc0100000002000004020000080200000c0200001002000011020000120200001a0200001a0200001b0200001c020000200200002402000048020000480200004c0200006f0200006f02000070020000940200009402000098020000bc020000bc020000c0020000c4020000d8020000d9020000da020000e2020000e2020000e3020000e4020000e8020000ec0200001003000010030000140300003c0300003c03000040030000440300004b0300004c0300004d030000550300005503000056030000570300005b0300005f03000088030000880300008c030000b5030000b5030000b9030000df030000df030000eb030000f7030000fb03000008040000090400000a04000012040000120400001304000014040000180400001c040000400400004004000044040000480400005a0400005b0400005c040000640400006404000065040000660400006a0400006e040000720400008404000085040000860400008e0400008e0400008f0400009004000094040000 unityObjects: - - {fileID: 2015541191} - - {fileID: 314222333254393094} - {fileID: 314222333254393095} - {fileID: 314222333254393095} - {fileID: 2015541191} - {fileID: 314222333254393094} - byteData: 00000000456e747279010000008143000000c1000000000000000000000100000053656c6563746f720100000000000000024300000000000000000000000000000200000053657175656e6365010056351cc4aaaa2c430000000000000000000000000000030000004c6f6f6b2041740100000002c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374010000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f00000000040000004d6f766520416374696f6e01000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000020414265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000080404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d02000000050000005761697401000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0600000053657175656e636501000000000000002a430000000000000000000000000000070000005761697401000000a5c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0800000044697374616e636520436f6e646974696f6e616c0100000020c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d03000000090000004c6f6f6b20417401000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374040000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374050000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f000000000a00000041747461636b20416374696f6e01000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000400b00000053746f702041747461636b20416374696f6e010000008c4300003443000000000000000000000c00000053746f702041747461636b20416374696f6e010054959f43aaaa254300000000000000000000 - byteDataArray: 00000000456e747279010000008143000000c1000000000000000000000100000053656c6563746f720100000000000000024300000000000000000000000000000200000053657175656e6365010056351cc4aaaa2c430000000000000000000000000000030000004c6f6f6b2041740100000002c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374010000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f00000000040000004d6f766520416374696f6e01000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000020414265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000080404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d02000000050000005761697401000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0600000053657175656e636501000000000000002a430000000000000000000000000000070000005761697401000000a5c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0800000044697374616e636520436f6e646974696f6e616c0100000020c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d03000000090000004c6f6f6b20417401000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374040000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374050000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f000000000a00000041747461636b20416374696f6e01000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000400b00000053746f702041747461636b20416374696f6e010000008c4300003443000000000000000000000c00000053746f702041747461636b20416374696f6e010054959f43aaaa254300000000000000000000 + byteData: 00000000456e747279010000008143000000c1000000000000000000000100000053656c6563746f720100000000000000024300000000000000000000000000000200000053657175656e6365010056351cc4aaaa2c430000000000000000000000000000030000004d6f766520416374696f6e010000008cc200003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000020414265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000080404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d000000000400000057616974010000008c4200003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0500000053657175656e636501000000000000002a430000000000000000000000000000060000005761697401000000a5c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0700000044697374616e636520436f6e646974696f6e616c0100000020c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d01000000080000004c6f6f6b20417401000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374020000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374030000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f000000000900000041747461636b20416374696f6e01000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000400a00000053746f702041747461636b20416374696f6e010000008c4300003443000000000000000000000b00000053746f702041747461636b20416374696f6e010054959f43aaaa254300000000000000000000 + byteDataArray: 00000000456e747279010000008143000000c1000000000000000000000100000053656c6563746f720100000000000000024300000000000000000000000000000200000053657175656e6365010056351cc4aaaa2c430000000000000000000000000000030000004d6f766520416374696f6e010000008cc200003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000020414265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000080404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d000000000400000057616974010000008c4200003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0500000053657175656e636501000000000000002a430000000000000000000000000000060000005761697401000000a5c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e536861726564426f6f6c004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f4265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f61740000803f0700000044697374616e636520436f6e646974696f6e616c0100000020c300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000404265686176696f7244657369676e65722e52756e74696d652e5368617265645472616e73666f726d01000000080000004c6f6f6b20417401000000000000003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374020000004265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374030000004265686176696f7244657369676e65722e52756e74696d652e536861726564566563746f7233000000000000803f00000000000000000000803f000000000900000041747461636b20416374696f6e01000000024300003443000000000000000000004265686176696f7244657369676e65722e52756e74696d652e536861726564466c6f6174000000400a00000053746f702041747461636b20416374696f6e010000008c4300003443000000000000000000000b00000053746f702041747461636b20416374696f6e010054959f43aaaa254300000000000000000000 Version: 1.6.6 gizmoViewMode: 2 showBehaviorDesignerGizmo: 1 @@ -201655,6 +201652,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2815293917414502668, guid: fd72e14764cae4769a347ff20fde3921, + type: 3} + propertyPath: leftIsShield + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2815293917414502669, guid: fd72e14764cae4769a347ff20fde3921, type: 3} propertyPath: m_Name diff --git a/Packages/manifest.json b/Packages/manifest.json index ad76a4b5..4e184ea2 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.7", - "com.unity.ide.rider": "3.0.9", - "com.unity.ide.visualstudio": "2.0.12", - "com.unity.ide.vscode": "1.2.4", + "com.unity.collab-proxy": "1.15.12", + "com.unity.ide.rider": "3.0.12", + "com.unity.ide.visualstudio": "2.0.14", + "com.unity.ide.vscode": "1.2.5", "com.unity.postprocessing": "3.2.0", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.3", + "com.unity.timeline": "1.6.4", "com.unity.ugui": "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 d67f3c36..a73365ed 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,10 @@ { "dependencies": { "com.unity.collab-proxy": { - "version": "1.15.7", + "version": "1.15.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0", "com.unity.services.core": "1.0.1" }, "url": "https://packages.unity.cn" @@ -18,7 +17,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.rider": { - "version": "3.0.9", + "version": "3.0.12", "depth": 0, "source": "registry", "dependencies": { @@ -27,7 +26,7 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.visualstudio": { - "version": "2.0.12", + "version": "2.0.14", "depth": 0, "source": "registry", "dependencies": { @@ -36,19 +35,12 @@ "url": "https://packages.unity.cn" }, "com.unity.ide.vscode": { - "version": "1.2.4", + "version": "1.2.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.cn" }, - "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.cn" - }, "com.unity.postprocessing": { "version": "3.2.0", "depth": 0, @@ -88,7 +80,7 @@ "url": "https://packages.unity.cn" }, "com.unity.timeline": { - "version": "1.6.3", + "version": "1.6.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index d18dc4a8..788010c3 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:093292a4224aa3908a4b866c3e02f80d6842d52ab735cd4ebddb56e00e4c2dde -size 4810 +oid sha256:62fe374a380eedf46e8e11e7ccb57928132d9252aeec6a4a0227e20ddaeff233 +size 4833 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ae4df71b..702966dc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7a8aa52f020ae99dc8464ea813b66a9e5f61de0a0df7d53d29c43a208e3de0a +oid sha256:83c1857d7b09ede339e05577b56cb41bf014b4816776a4f0c61ebf98d31e14d3 size 24547 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 96ed5525..03134d1d 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.9f1c1 -m_EditorVersionWithRevision: 2021.2.9f1c1 (4627e78ce1f7) +m_EditorVersion: 2021.2.14f1c1 +m_EditorVersionWithRevision: 2021.2.14f1c1 (7c06c4af091b) diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ae6f04c5..a8ad4a3f 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2560 height: 1349.3334 m_ShowMode: 4 - m_Title: Game + m_Title: Hierarchy m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 16 + controlID: 26 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 17 + controlID: 16 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -248,7 +248,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 18 + controlID: 17 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -259,7 +259,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -270,12 +270,12 @@ MonoBehaviour: height: 770.6667 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -331,9 +331,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 16a90000 - m_LastClickedID: 43286 - m_ExpandedIDs: 0000000098a8000000ca9a3b + m_SelectedIDs: 48a90000 + m_LastClickedID: 43336 + m_ExpandedIDs: 0000000094a8000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,7 +361,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000098a80000 + m_ExpandedIDs: 0000000094a80000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -388,7 +388,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -405,7 +405,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -453,7 +453,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 1374 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -491,8 +491,8 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 568f0000 - m_LastClickedID: 36694 + m_SelectedIDs: 86930000 + m_LastClickedID: 37766 m_ExpandedIDs: 0cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -743,9 +743,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 2.428607, y: 0.69992924, z: -45.185333} + m_Target: {x: 1.989234, y: 1.3050522, z: -5.595991} speed: 2 - m_Value: {x: 2.428607, y: 0.69992924, z: -45.185333} + m_Value: {x: 1.9893636, y: 1.3051155, z: -5.5959907} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -784,21 +784,21 @@ MonoBehaviour: m_Fade: m_Target: 0 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0.08717225, y: -0.89959013, z: 0.21045244, w: 0.3726236} m_Size: - m_Target: 2.211893 + m_Target: 1.6971612 speed: 2 - m_Value: 2.211893 + m_Value: 1.6973842 m_Ortho: m_Target: 0 speed: 2 @@ -816,7 +816,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -858,7 +858,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2205, y: 1093} + m_TargetSize: {x: 1470, y: 728.6667} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -873,10 +873,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -735 - m_HBaseRangeMax: 735 - m_VBaseRangeMin: -364.33334 - m_VBaseRangeMax: 364.33334 + m_HBaseRangeMin: -490 + m_HBaseRangeMax: 490 + m_VBaseRangeMin: -242.8889 + m_VBaseRangeMax: 242.8889 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -937,10 +937,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: 0 + y: 843.3334 + width: 1955 + height: 507.6667 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default