From 5d922db6142634cdd20aa7801c0b3c1c4994360c Mon Sep 17 00:00:00 2001 From: Roman <1325980292@qq.com> Date: Wed, 24 Aug 2022 17:59:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=9A=E5=88=B6=E4=BD=9C?= =?UTF-8?q?=E4=BA=BA=E7=89=A9=E5=8A=A8=E7=94=BB=E9=80=BB=E8=BE=91=201.?= =?UTF-8?q?=E5=BD=93=E4=BA=BA=E7=89=A9=E5=A4=84=E4=BA=8ENormal=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E5=A4=8D=E6=92=AD=E6=94=BE=E9=AA=91=E5=9C=A8?= =?UTF-8?q?=E9=A9=AC=E4=B8=8A=E7=9A=84=E5=8A=A8=E7=94=BB=202.=E5=BD=93?= =?UTF-8?q?=E4=BA=BA=E7=89=A9=E8=A2=AB=E5=B0=84=E5=87=BA=EF=BC=8C=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E4=B8=80=E6=AC=A1=E8=B7=B3=E4=B8=8A=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=EF=BC=8C=E4=B9=8B=E5=90=8E=E5=81=9C=E5=9C=A8=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E5=B8=A7=EF=BC=8C=E7=AD=89=E5=BE=85=E8=90=BD=E5=88=B0?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=B8=8A=E3=80=82=203.=E5=BD=93=E4=BA=BA?= =?UTF-8?q?=E7=89=A9=E8=BF=9B=E5=85=A5Walk=E6=80=81=EF=BC=8C=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E9=87=8D=E5=A4=8D=E6=92=AD=E6=94=BE=E8=B7=91=E6=AD=A5?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E3=80=82=204.=E5=BD=93=E4=BA=BA=E7=89=A9?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E9=99=8D=E8=90=BD=EF=BC=8C=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E8=B7=B3=E4=B8=8B=E5=8A=A8=E7=94=BB=EF=BC=8C?= =?UTF-8?q?=E5=81=9C=E5=9C=A8=E6=9C=80=E5=90=8E=E4=B8=80=E5=B8=A7=205.?= =?UTF-8?q?=E5=BD=93Recover=E7=BB=93=E6=9D=9F=EF=BC=8C=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=BANormal=EF=BC=8C=E9=87=8D=E5=9B=9E?= =?UTF-8?q?=E5=88=B0=E9=AA=91=E5=9C=A8=E9=A9=AC=E4=B8=8A=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=20DONE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Built-In Samples.unitypackage.meta | 7 + .../HDRP Samples (Legacy).unitypackage.meta | 7 + .../Examples/HDRP Samples.unitypackage.meta | 7 + .../LWRP Samples (Legacy).unitypackage.meta | 7 + .../Examples/LWRP Samples.unitypackage.meta | 7 + .../Sample Resources.unitypackage.meta | 7 + .../Examples/URP Samples.unitypackage.meta | 7 + .../CustomRTTemplates.unitypackage.meta | 7 + .../HDSRPTemplates.unitypackage.meta | 7 + .../LWSRPTemplates.unitypackage.meta | 7 + .../PPStackTemplates.unitypackage.meta | 7 + ...RPTemplates 3xx (Legacy).unitypackage.meta | 7 + ...RPTemplates 4xx (Legacy).unitypackage.meta | 7 + ...RPTemplates 572 (Legacy).unitypackage.meta | 7 + ...RPTemplates 5xx (Legacy).unitypackage.meta | 7 + ...RPTemplates 6xx (Legacy).unitypackage.meta | 7 + ...lates 718 - 743 (Legacy).unitypackage.meta | 7 + ...lates 7xx - 9xx (Legacy).unitypackage.meta | 7 + ...RPTemplates 3xx (Legacy).unitypackage.meta | 7 + ...RPTemplates 4xx (Legacy).unitypackage.meta | 7 + ...lates 7xx - 9xx (Legacy).unitypackage.meta | 7 + .../Templates/USRPTemplates.unitypackage.meta | 7 + ...tom Attribute Processors.unitypackage.meta | 7 + .../Demos/Custom Drawers.unitypackage.meta | 7 + .../Demos/Editor Windows.unitypackage.meta | 7 + .../Sample - RPG Editor.unitypackage.meta | 7 + Assets/勍/动画.meta | 8 + Assets/勍/动画/动画剪辑.meta | 8 + Assets/勍/动画/动画剪辑/Person.meta | 8 + .../donghua => 勍/动画/动画剪辑/Person}/跑步.anim | 0 .../donghua => 勍/动画/动画剪辑/Person}/跑步.anim.meta | 0 .../donghua => 勍/动画/动画剪辑/Person}/跳上.anim | 2 +- .../donghua => 勍/动画/动画剪辑/Person}/跳上.anim.meta | 0 .../donghua => 勍/动画/动画剪辑/Person}/跳下.anim | 2 +- .../donghua => 勍/动画/动画剪辑/Person}/跳下.anim.meta | 0 .../donghua => 勍/动画/动画剪辑/Person}/骑马.anim | 0 .../donghua => 勍/动画/动画剪辑/Person}/骑马.anim.meta | 0 Assets/勍/动画/状态机.meta | 8 + Assets/勍/动画/状态机/Person.controller | 287 ++++++++++++++++++ Assets/勍/动画/状态机/Person.controller.meta | 8 + Assets/勍/场景/0813中期提交.unity | 2 +- Assets/勍/脚本/Person.cs | 11 +- Assets/勍/预设.meta | 8 + Assets/勍/预设/CameraManager-GamePlay.preset | 31 ++ .../预设/CameraManager-GamePlay.preset.meta | 8 + UserSettings/EditorUserSettings.asset | 29 +- UserSettings/Layouts/default-2021.dwlt | 119 ++++---- 47 files changed, 646 insertions(+), 75 deletions(-) create mode 100644 Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/HDRP Samples (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/LWRP Samples (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/LWRP Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDSRPTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/LWSRPTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/PPStackTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 3xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 4xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 572 (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 5xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 6xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 718 - 743 (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 7xx - 9xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 3xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 4xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/USRPTemplates 7xx - 9xx (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/USRPTemplates.unitypackage.meta create mode 100644 Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta create mode 100644 Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta create mode 100644 Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta create mode 100644 Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta create mode 100644 Assets/勍/动画.meta create mode 100644 Assets/勍/动画/动画剪辑.meta create mode 100644 Assets/勍/动画/动画剪辑/Person.meta rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跑步.anim (100%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跑步.anim.meta (100%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跳上.anim (99%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跳上.anim.meta (100%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跳下.anim (99%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/跳下.anim.meta (100%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/骑马.anim (100%) rename Assets/{待实装美术素材/骨骼/donghua => 勍/动画/动画剪辑/Person}/骑马.anim.meta (100%) create mode 100644 Assets/勍/动画/状态机.meta create mode 100644 Assets/勍/动画/状态机/Person.controller create mode 100644 Assets/勍/动画/状态机/Person.controller.meta create mode 100644 Assets/勍/预设.meta create mode 100644 Assets/勍/预设/CameraManager-GamePlay.preset create mode 100644 Assets/勍/预设/CameraManager-GamePlay.preset.meta diff --git a/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta new file mode 100644 index 0000000..d97f4fc --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Built-In Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e00e6f90ab8233e46a41c5e33917c642 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples (Legacy).unitypackage.meta new file mode 100644 index 0000000..389d622 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dff05fea7446d7b4e9029bfab77455d2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta new file mode 100644 index 0000000..872a1e1 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HDRP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1c0b77896049554fa4b635531caf741 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/LWRP Samples (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/LWRP Samples (Legacy).unitypackage.meta new file mode 100644 index 0000000..3ff83d9 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/LWRP Samples (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f7c4e22642de60d448f4e4809190f7b1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/LWRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/LWRP Samples.unitypackage.meta new file mode 100644 index 0000000..74eb369 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/LWRP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ecbfd0a046659943a69328c98ff0442 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta new file mode 100644 index 0000000..9d94438 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Sample Resources.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c0a0a980c9ba86345bc15411db88d34f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta new file mode 100644 index 0000000..da8ce24 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/URP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9d68dd8913f05d4d9ce75e7b40c6044 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta new file mode 100644 index 0000000..1e0464d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 191365b4aece81443875ae2bb7243b55 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDSRPTemplates.unitypackage.meta new file mode 100644 index 0000000..e51ee6d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/HDSRPTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a5e61a8b3421b944863d0946e32da0a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/LWSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/LWSRPTemplates.unitypackage.meta new file mode 100644 index 0000000..0f3221b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/LWSRPTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c816894a3147d343891060451241bfe +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/PPStackTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/PPStackTemplates.unitypackage.meta new file mode 100644 index 0000000..9d2b4e2 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/PPStackTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f86c907c9d9e85846835ba31e656bd60 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 3xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 3xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..2d96284 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 3xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4dc1afbcc68875c4780502f5e6b80158 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 4xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 4xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..0b10f23 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 4xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5d615bf612f33364e96fb9fd2959ae9c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 572 (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 572 (Legacy).unitypackage.meta new file mode 100644 index 0000000..2d47374 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 572 (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f51b7b861facbc3429fcc5f1f6f91183 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 5xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 5xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..7083290 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 5xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d7fe4f7c19e90f41b893bc01fc17230 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 6xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 6xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..f7aaed2 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 6xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e137dba02f4d0f542ab09dcedea27314 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 718 - 743 (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 718 - 743 (Legacy).unitypackage.meta new file mode 100644 index 0000000..feb50e9 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 718 - 743 (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38b4bfd7c725505409f8f4d944961db4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 7xx - 9xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 7xx - 9xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..e9df68f --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/HDSRPTemplates 7xx - 9xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3aeabe705b70b154ea99893f91351100 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 3xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 3xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..8a216b9 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 3xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b53d2f3b156ff104f90d4d7693d769c8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 4xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 4xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..c249887 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/LWSRPTemplates 4xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e8eabcfae1e5aa4397de89fedeb48db +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/USRPTemplates 7xx - 9xx (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/USRPTemplates 7xx - 9xx (Legacy).unitypackage.meta new file mode 100644 index 0000000..c751f13 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP (Legacy)/USRPTemplates 7xx - 9xx (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f54faaaf4faf8784183ede7f87dfeb23 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/USRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/USRPTemplates.unitypackage.meta new file mode 100644 index 0000000..04c4f88 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/USRPTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57fcea0ed8b5eb347923c4c21fa31b57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 0000000..1eadf09 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 0000000..f073d2a --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 0000000..130722a --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 0000000..f9b8ed8 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/动画.meta b/Assets/勍/动画.meta new file mode 100644 index 0000000..eefdbdd --- /dev/null +++ b/Assets/勍/动画.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce6d0212948ea2048ba46c1bdcdd0f3b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/动画/动画剪辑.meta b/Assets/勍/动画/动画剪辑.meta new file mode 100644 index 0000000..0022825 --- /dev/null +++ b/Assets/勍/动画/动画剪辑.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 33d5e85b29fee4b429a3f65e044faffa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/动画/动画剪辑/Person.meta b/Assets/勍/动画/动画剪辑/Person.meta new file mode 100644 index 0000000..3dff07a --- /dev/null +++ b/Assets/勍/动画/动画剪辑/Person.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8c1f0ffbfa11e5c45a6b01cc608d07c7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/待实装美术素材/骨骼/donghua/跑步.anim b/Assets/勍/动画/动画剪辑/Person/跑步.anim similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/跑步.anim rename to Assets/勍/动画/动画剪辑/Person/跑步.anim diff --git a/Assets/待实装美术素材/骨骼/donghua/跑步.anim.meta b/Assets/勍/动画/动画剪辑/Person/跑步.anim.meta similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/跑步.anim.meta rename to Assets/勍/动画/动画剪辑/Person/跑步.anim.meta diff --git a/Assets/待实装美术素材/骨骼/donghua/跳上.anim b/Assets/勍/动画/动画剪辑/Person/跳上.anim similarity index 99% rename from Assets/待实装美术素材/骨骼/donghua/跳上.anim rename to Assets/勍/动画/动画剪辑/Person/跳上.anim index fc8682a..7a3ea06 100644 --- a/Assets/待实装美术素材/骨骼/donghua/跳上.anim +++ b/Assets/勍/动画/动画剪辑/Person/跳上.anim @@ -966,7 +966,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/待实装美术素材/骨骼/donghua/跳上.anim.meta b/Assets/勍/动画/动画剪辑/Person/跳上.anim.meta similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/跳上.anim.meta rename to Assets/勍/动画/动画剪辑/Person/跳上.anim.meta diff --git a/Assets/待实装美术素材/骨骼/donghua/跳下.anim b/Assets/勍/动画/动画剪辑/Person/跳下.anim similarity index 99% rename from Assets/待实装美术素材/骨骼/donghua/跳下.anim rename to Assets/勍/动画/动画剪辑/Person/跳下.anim index 81df946..aa1bef3 100644 --- a/Assets/待实装美术素材/骨骼/donghua/跳下.anim +++ b/Assets/勍/动画/动画剪辑/Person/跳下.anim @@ -1884,7 +1884,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/待实装美术素材/骨骼/donghua/跳下.anim.meta b/Assets/勍/动画/动画剪辑/Person/跳下.anim.meta similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/跳下.anim.meta rename to Assets/勍/动画/动画剪辑/Person/跳下.anim.meta diff --git a/Assets/待实装美术素材/骨骼/donghua/骑马.anim b/Assets/勍/动画/动画剪辑/Person/骑马.anim similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/骑马.anim rename to Assets/勍/动画/动画剪辑/Person/骑马.anim diff --git a/Assets/待实装美术素材/骨骼/donghua/骑马.anim.meta b/Assets/勍/动画/动画剪辑/Person/骑马.anim.meta similarity index 100% rename from Assets/待实装美术素材/骨骼/donghua/骑马.anim.meta rename to Assets/勍/动画/动画剪辑/Person/骑马.anim.meta diff --git a/Assets/勍/动画/状态机.meta b/Assets/勍/动画/状态机.meta new file mode 100644 index 0000000..87dea78 --- /dev/null +++ b/Assets/勍/动画/状态机.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d87e579fbbceebe44b8092d02a1ebc48 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/动画/状态机/Person.controller b/Assets/勍/动画/状态机/Person.controller new file mode 100644 index 0000000..afcc6a1 --- /dev/null +++ b/Assets/勍/动画/状态机/Person.controller @@ -0,0 +1,287 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6913236416213459593 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u8DF3\u4E0B" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3850173581317506463} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: fd157e96da9a4da4e99ad7daa1a52d78, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-4096346097913221015 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: "\u8DF3\u4E0A" + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6594892425091100676} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3850173581317506463 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: "\u6062\u590D" + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6975214334558861883} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.74137926 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2275247553076332143 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6975214334558861883} + m_Position: {x: 428.50726, y: 280.52188, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2435686109045578021} + m_Position: {x: 1080, y: 290, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6594892425091100676} + m_Position: {x: 770, y: 450, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6913236416213459593} + m_Position: {x: 760, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 1210, y: 10, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6975214334558861883} +--- !u!1101 &-97807564453593535 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: "\u8DF3\u4E0B" + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6913236416213459593} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Person + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: "\u8DF3\u4E0A" + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: "\u8DD1\u6B65" + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: "\u8DF3\u4E0B" + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: "\u6062\u590D" + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2275247553076332143} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1441641163184114074 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: "\u8DD1\u6B65" + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2435686109045578021} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2435686109045578021 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u8DD1\u6B65" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -97807564453593535} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5dfa534851f555c49b96103256b8a73d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6594892425091100676 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u8DF3\u4E0A" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1441641163184114074} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 95121ea975adefe4bb1862454b177e0c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &6975214334558861883 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u9A91\u9A6C" + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4096346097913221015} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f197a7a429b311b4e83c0a4b23d19dad, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/勍/动画/状态机/Person.controller.meta b/Assets/勍/动画/状态机/Person.controller.meta new file mode 100644 index 0000000..4865e3b --- /dev/null +++ b/Assets/勍/动画/状态机/Person.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81d81004e0092014482053b2c10ed979 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/场景/0813中期提交.unity b/Assets/勍/场景/0813中期提交.unity index 9f4af9d..16e44b0 100644 --- a/Assets/勍/场景/0813中期提交.unity +++ b/Assets/勍/场景/0813中期提交.unity @@ -4471,7 +4471,7 @@ Animator: m_GameObject: {fileID: 1601474491} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} + m_Controller: {fileID: 9100000, guid: 81d81004e0092014482053b2c10ed979, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/Assets/勍/脚本/Person.cs b/Assets/勍/脚本/Person.cs index 41795d1..bf8054a 100644 --- a/Assets/勍/脚本/Person.cs +++ b/Assets/勍/脚本/Person.cs @@ -85,7 +85,7 @@ public class Person : MonoBehaviour } /// - /// 人发射的瞬间触发，由人马分离障碍物触发 + /// 人发射的瞬间触发一次，由人马分离障碍物触发 /// public void Shoot(){ Debug.Log("人发射"); @@ -97,6 +97,8 @@ public class Person : MonoBehaviour //旋转修正结束后，锁定刚体Z轴旋转 () => m_rigidbody2D.constraints = RigidbodyConstraints2D.FreezeRotation ); + //动画 + m_animator.SetTrigger("跳上"); } /// @@ -105,6 +107,8 @@ public class Person : MonoBehaviour public void Walk(){ Debug.Log("人行走"); state = PersonState.Walk; + //动画 + m_animator.SetTrigger("跑步"); } /// @@ -115,6 +119,8 @@ public class Person : MonoBehaviour state = PersonState.FallingOff; //给刚体一个右上的速度，模拟一下起跳 m_rigidbody2D.velocity = jumpSpeed; + //动画 + m_animator.SetTrigger("跳下"); } public void Recover(){ @@ -126,7 +132,8 @@ public class Person : MonoBehaviour transform.DORotate(defaultTrackingPoint.rotation.eulerAngles,0.2f).OnComplete( () => state = PersonState.Normal ); - + //动画 + m_animator.SetTrigger("恢复"); } /// diff --git a/Assets/勍/预设.meta b/Assets/勍/预设.meta new file mode 100644 index 0000000..dab7ca4 --- /dev/null +++ b/Assets/勍/预设.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb8a9f9168db46646a0f1e0d1ae7bc3a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/预设/CameraManager-GamePlay.preset b/Assets/勍/预设/CameraManager-GamePlay.preset new file mode 100644 index 0000000..20ff7f6 --- /dev/null +++ b/Assets/勍/预设/CameraManager-GamePlay.preset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!181963792 &2655988077585873504 +Preset: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CameraManager-GamePlay + m_TargetType: + m_NativeTypeID: 114 + m_ManagedTypePPtr: {fileID: 11500000, guid: 27aac20fffb2f4046bf09430bb01f2a7, type: 3} + m_ManagedTypeFallback: + m_Properties: + - target: {fileID: 0} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_EditorHideFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_EditorClassIdentifier + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: speed + value: 6 + objectReference: {fileID: 0} + m_ExcludedProperties: [] diff --git a/Assets/勍/预设/CameraManager-GamePlay.preset.meta b/Assets/勍/预设/CameraManager-GamePlay.preset.meta new file mode 100644 index 0000000..deca81b --- /dev/null +++ b/Assets/勍/预设/CameraManager-GamePlay.preset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecb6b920b3e2d3945849158fb5802bc9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2655988077585873504 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8f92d89..d2afb50 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,43 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 0204525104005f5f5e5d5526117b0b44424e4073752d2536747c1b31e7b3673c + value: 5550060701065c085e5c5924162609444f4f4b297e70226674284564b1b8326d flags: 0 RecentlyUsedSceneGuid-1: - value: 02020157070050580c5b582340215c44464f4b297f7d7e64792d1c62b1e16269 + value: 0204525104005f5f5e5d5526117b0b44424e4073752d2536747c1b31e7b3673c flags: 0 RecentlyUsedSceneGuid-2: - value: 54000c5304065f580b5d5f7045730c444315197c75797f317f714a60b2b6323d + value: 02020157070050580c5b582340215c44464f4b297f7d7e64792d1c62b1e16269 flags: 0 RecentlyUsedSceneGuid-3: - value: 05080302550c580e080c092712740644154f19737e7872697d284a64b4e2663e + value: 54000c5304065f580b5d5f7045730c444315197c75797f317f714a60b2b6323d flags: 0 RecentlyUsedSceneGuid-4: value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a flags: 0 RecentlyUsedSceneGuid-5: - value: 02070656525008025e595f23132659444f4e4178787c756679784f35e3b8373e + value: 05080302550c580e080c092712740644154f19737e7872697d284a64b4e2663e flags: 0 RecentlyUsedSceneGuid-6: - value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c + value: 02070656525008025e595f23132659444f4e4178787c756679784f35e3b8373e flags: 0 RecentlyUsedSceneGuid-7: - value: 0155065451575c020b575877137b5a4414161c2b287e2068792b4a67e3e4326d - flags: 0 - RecentlyUsedSceneGuid-8: - value: 0057010504575e595c085a7b46200f4417161a797a7f24667e704966b5b3643e - flags: 0 - RecentlyUsedSceneGuid-9: value: 5655070504530a090f080a7616730e44144e417e7d2b22687d284a37e6e56039 flags: 0 - UnityEditor.ShaderGraph.Blackboard: - value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 + RecentlyUsedSceneGuid-8: + value: 0155065451575c020b575877137b5a4414161c2b287e2068792b4a67e3e4326d flags: 0 - UnityEditor.ShaderGraph.FloatingWindowsLayout2: - value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf - flags: 0 - UnityEditor.ShaderGraph.InspectorWindow: - value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf + RecentlyUsedSceneGuid-9: + value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 360a6a2..accfbf2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 772.8 m_ShowMode: 4 - m_Title: "\u5C42\u7EA7" + m_Title: "\u9879\u76EE" m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -121,7 +121,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 124 + controlID: 18 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -141,12 +141,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 591.2 + width: 652.8 height: 722.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 113 + controlID: 85 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -157,23 +157,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 591.2 + width: 652.8 height: 388.8 - m_MinSize: {x: 201, y: 221} + m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 13} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -191,7 +191,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 388.8 - width: 591.2 + width: 652.8 height: 334 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -215,12 +215,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 591.2 + x: 652.8 y: 0 - width: 203.20001 + width: 186.40002 height: 722.8 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -241,9 +241,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 794.4 + x: 839.2 y: 0 - width: 362.40002 + width: 317.60004 height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -300,7 +300,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 462.4 - width: 590.2 + width: 651.8 height: 313 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -348,23 +348,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 590.2 + width: 651.8 height: 292 m_Scale: {x: 1, y: 1} - m_Translation: {x: 295.1, y: 146} + m_Translation: {x: 325.9, y: 146} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -295.1 + x: -325.9 y: -146 - width: 590.2 + width: 651.8 height: 292 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 737.75, y: 391.25} + m_LastWindowPixelSize: {x: 814.75, y: 391.25} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -617,9 +617,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -18.450768, y: 3.2206218, z: -0.041112717} + m_Target: {x: -20.304573, y: 1.8744967, z: -0.06822538} speed: 2 - m_Value: {x: -18.450768, y: 3.2206218, z: -0.041112717} + m_Value: {x: -19.999044, y: 2.0930989, z: -0.06382241} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -670,9 +670,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.513276 + m_Target: 10.22453 speed: 2 - m_Value: 7.513276 + m_Value: 9.78424 m_Ortho: m_Target: 1 speed: 2 @@ -719,8 +719,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 487 - height: 259 + width: 651.8 + height: 367.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -728,15 +728,32 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} + - {fileID: -2275247553076332143, guid: 81d81004e0092014482053b2c10ed979, type: 2} m_ValueSerializationHelper: - - e00: 0.98381555 + - e00: 0.648961 e01: 0 e02: 0 - e03: -100.0116 + e03: -10.855164 e10: 0 - e11: 0.98381555 + e11: 0.648961 e12: 0 - e13: 115.50764 + e13: 104.03407 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.28642696 + e01: 0 + e02: 0 + e03: 13.147555 + e10: 0 + e11: 0.28642696 + e12: 0 + e13: 53.009956 e20: 0 e21: 0 e22: 1 @@ -746,9 +763,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} + m_AnimatorController: {fileID: 9100000, guid: 81d81004e0092014482053b2c10ed979, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2} + - m_Target: {fileID: -2275247553076332143, guid: 81d81004e0092014482053b2c10ed979, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -758,7 +775,7 @@ MonoBehaviour: m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_CurrentEditor: 0 + m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &15 @@ -781,9 +798,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 591.2 + x: 652.8 y: 73.6 - width: 201.20001 + width: 184.40002 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -794,7 +811,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0efbffff + m_ExpandedIDs: 42ecffffd8edffff4ef4ffffc0f5ffff0efbffff587f0000b4ba000064bb0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -838,9 +855,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 794.4 + x: 839.2 y: 73.6 - width: 360.40002 + width: 315.60004 height: 701.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -859,22 +876,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - "Assets/\u52CD" + - "Assets/\u52CD/\u52A8\u753B/\u52A8\u753B\u526A\u8F91/Person" m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - "Assets/\u52CD" + - "Assets/\u52CD/\u52A8\u753B/\u52A8\u753B\u526A\u8F91/Person" m_LastFoldersGridSize: -1 m_LastProjectPath: "C:\\Users\\13259\\Desktop\\\u8D5B\u9A6C" m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2e7a0000 - m_LastClickedID: 31278 - m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a0000 + m_SelectedIDs: bebc0000 + m_LastClickedID: 48318 + m_ExpandedIDs: 000000000a7a00000c7a00000e7a0000107a0000127a00003c7a00003e7a00003c7b0000707b0000b0bc0000b8bc0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -929,22 +946,22 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: ee770000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Person + m_OriginalName: Person m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 48318 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: