diff --git a/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta b/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta new file mode 100644 index 0000000..e474937 --- /dev/null +++ b/Assets/Plugins/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 81dbcde0f90df4e9ba9ca2794490e57a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta b/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta new file mode 100644 index 0000000..eebd079 --- /dev/null +++ b/Assets/Plugins/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fd02c799f3f5c4c83b2fc26c105a3821 +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/Scenes/勍/InteractTest.unity b/Assets/Scenes/勍/InteractTest.unity index 4cb3432..b19c534 100644 --- a/Assets/Scenes/勍/InteractTest.unity +++ b/Assets/Scenes/勍/InteractTest.unity @@ -149,7 +149,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5352854} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -9.530919, y: 0.4, z: 0} + m_LocalPosition: {x: -8.47, y: 0.4, z: 0} m_LocalScale: {x: 1.54, y: 1.54, z: 1.26} m_Children: [] m_Father: {fileID: 288199589} @@ -246,7 +246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15582731} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 8.5778265, y: 0, z: 0} + m_LocalPosition: {x: 7.623, y: 0, z: 0} m_LocalScale: {x: 0.66, y: 0.66, z: 0.66} m_Children: [] m_Father: {fileID: 2122669497} @@ -317,6 +317,36 @@ MonoBehaviour: m_EditorClassIdentifier: moveRate: 0.9 startPoint: 0 +--- !u!1 &29782800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 29782801} + m_Layer: 0 + m_Name: "\u5BF9\u8BDD\u89E6\u53D1\u70B9" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &29782801 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29782800} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.5, y: 1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1750262982} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &56909002 GameObject: m_ObjectHideFlags: 0 @@ -459,7 +489,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &110133615 Transform: m_ObjectHideFlags: 0 @@ -487,8 +517,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inputDir: 0 + bone: {fileID: 0} groundCheck: {fileID: 0} weapon: {fileID: 0} + weaponTrans: {fileID: 0} weaponPos: {x: 0, y: 0, z: 0} isRight: 1 isGround: 0 @@ -707,7 +739,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 226789349} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.530919, y: -0.6770234, z: -10} + m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -966,6 +998,745 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &470232328 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1800855454} + m_Modifications: + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8472028 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9990805 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.04287368 + objectReference: {fileID: 0} + - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2251129 + objectReference: {fileID: 0} + - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7046301 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1775742 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.09949586 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.08266038 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.9965778 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.571297 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000006439765 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9862338 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.1653573 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.08779 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000001088842 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999409 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.01087318 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1814797 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1108834 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0816908 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.9966578 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8077052 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000001721674 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9857183 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.168403 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.276312 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.03781857 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7080904 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7061218 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9989145 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.04658162 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.z + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.12 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.88 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8779536 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000003723409 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9992116 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.03970221 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.386071 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1275305 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.3770569 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.9261902 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000001338032 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9997447 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.02259521 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 5184585291826125097, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Name + value: cangjie + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000001408897 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999777 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.006681608 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000000559481 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9824338 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.1866114 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 7882857787574193221, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 2.269244 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000002166282 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9998721 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.01599354 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8385037936056148123, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.12175 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000002713931 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.999678 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.02537676 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: -2.002787 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -2.963103 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8800381 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.47490305 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 56.706 + objectReference: {fileID: 0} + - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} +--- !u!4 &470232329 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 470232328} + m_PrefabAsset: {fileID: 0} +--- !u!4 &470232330 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 470232328} + m_PrefabAsset: {fileID: 0} +--- !u!1 &470232331 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 470232328} + m_PrefabAsset: {fileID: 0} +--- !u!95 &470232332 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470232331} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1ba7e0ac06fb77d46a4671461667d828, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &487690318 GameObject: m_ObjectHideFlags: 0 @@ -1118,7 +1889,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661209885} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 7.6247354, y: 0, z: 0} + m_LocalPosition: {x: 6.7760005, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -1189,6 +1960,30 @@ MonoBehaviour: m_EditorClassIdentifier: moveRate: 0.8 startPoint: 0 +--- !u!1 &735573359 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -3441162082082616320, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + m_PrefabInstance: {fileID: 1379223723} + m_PrefabAsset: {fileID: 0} +--- !u!95 &735573360 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 735573359} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b238dbddb679e1147b056096607e7bdb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &781772278 GameObject: m_ObjectHideFlags: 0 @@ -1226,7 +2021,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 110133615} + m_Follow: {fileID: 1800855454} m_Lens: FieldOfView: 60 OrthographicSize: 5 @@ -1250,7 +2045,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 781772278} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.53, y: -0.8800001, z: -10} + m_LocalPosition: {x: 8.47, y: 0.34000003, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 903864635} @@ -1274,6 +2069,36 @@ MonoBehaviour: m_BoundingShape2D: {fileID: 1206926897} m_ConfineScreenEdges: 1 m_Damping: 0 +--- !u!1 &807558668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807558669} + m_Layer: 0 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &807558669 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807558668} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1800855454} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &843077162 GameObject: m_ObjectHideFlags: 0 @@ -1319,15 +2144,16 @@ MonoBehaviour: m_EditorClassIdentifier: contentList: - {fileID: 21300000, guid: c5247c64a49f62b4eac48ee3d1043ef5, type: 3} + - {fileID: 21300000, guid: 1fe3d52b0444bee4ea17d4d1cfd70a70, type: 3} - {fileID: 21300000, guid: 49135acf8ddf6ba4093b9b41d816ce1b, type: 3} - speakerList: 0000000001000000 + speakerList: 000000000100000001000000 conversationName: "\u9EC4\u5E1D\u7591\u60D1" timePerSpeak: 3 P1Background: {fileID: 21300000, guid: e607823a00e274a48bef895b49e595be, type: 3} P2Background: {fileID: 21300000, guid: 4c2e83e347d617a4bbf4901c20a3e98c, type: 3} - P1Pos: {fileID: 110133615} - P2Pos: {fileID: 1750262982} - offset: {x: 2.5, y: 2} + P1Pos: {fileID: 1800855454} + P2Pos: {fileID: 29782801} + offset: {x: 2.5, y: 2.5} --- !u!1 &900617625 GameObject: m_ObjectHideFlags: 0 @@ -1941,6 +2767,208 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: type: 3 +--- !u!1001 &1379223723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1750262982} + m_Modifications: + - target: {fileID: -7826449195252727647, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7826449195252727647, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -7417146146244226684, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -7417146146244226684, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -6483101927383172023, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -6483101927383172023, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -5468031369214683292, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -5468031369214683292, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -4327408422459508995, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4327408422459508995, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -4026235220867378125, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -4026235220867378125, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -3441162082082616320, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_Name + value: huangdi + objectReference: {fileID: 0} + - target: {fileID: -3306943965816460615, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -3306943965816460615, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -2806930230050269747, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2806930230050269747, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -2496750792598281777, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2496750792598281777, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -2022896778201711020, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -2022896778201711020, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -924100769623447778, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -924100769623447778, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalScale.x + value: -0.46 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalScale.y + value: 0.46 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4310833014864813460, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4310833014864813460, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 4702045375478449417, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4702045375478449417, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 4964763354758961383, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalPosition.x + value: -0.20198166 + objectReference: {fileID: 0} + - target: {fileID: 4964763354758961383, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_LocalPosition.y + value: -0.009896722 + objectReference: {fileID: 0} + - target: {fileID: 6427885096795190670, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6427885096795190670, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + - target: {fileID: 7126605664288653854, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7126605664288653854, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + propertyPath: m_SortingLayerID + value: 126049849 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: -3570737420674881527, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} +--- !u!4 &1379223724 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -171024103478765687, guid: 29cd2504c0122de46ad7814aaba2b245, type: 3} + m_PrefabInstance: {fileID: 1379223723} + m_PrefabAsset: {fileID: 0} --- !u!1 &1442756488 GameObject: m_ObjectHideFlags: 0 @@ -1999,7 +3027,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449312143} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.7654595, y: 0, z: 0} + m_LocalPosition: {x: 4.235, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -2163,9 +3191,9 @@ MonoBehaviour: timePerSpeak: 3 P1Background: {fileID: 21300000, guid: e607823a00e274a48bef895b49e595be, type: 3} P2Background: {fileID: 21300000, guid: 4c2e83e347d617a4bbf4901c20a3e98c, type: 3} - P1Pos: {fileID: 110133615} - P2Pos: {fileID: 1750262982} - offset: {x: 2.5, y: 2} + P1Pos: {fileID: 1800855454} + P2Pos: {fileID: 29782801} + offset: {x: 2.5, y: 2.5} --- !u!1 &1558198558 GameObject: m_ObjectHideFlags: 0 @@ -2480,9 +3508,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750262981} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.14, y: -0.45, z: 0} + m_LocalPosition: {x: 10.49, y: -2.04, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 29782801} + - {fileID: 1379223724} m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2499,7 +3529,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -6.33, y: -2.05} + m_Offset: {x: -1.44, y: 0.11} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -2567,7 +3597,7 @@ SpriteRenderer: m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: 3cb7c35a750699348a04840d1ae1be5e, type: 3} - m_Color: {r: 0.8880594, g: 1, b: 0, a: 1} + m_Color: {r: 0.8880594, g: 1, b: 0, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -2577,6 +3607,164 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1800855449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1800855454} + - component: {fileID: 1800855453} + - component: {fileID: 1800855452} + - component: {fileID: 1800855451} + - component: {fileID: 1800855450} + m_Layer: 0 + m_Name: Player (1) + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1800855450 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800855449} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &1800855451 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800855449} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 2 + m_Material: {fileID: 6200000, guid: 2a806147463d9e148aef5c04f75c281d, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &1800855452 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800855449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94a70686225bbcc40a44a76ac05951e0, type: 3} + m_Name: + m_EditorClassIdentifier: + inputDir: 0 + bone: {fileID: 470232331} + groundCheck: {fileID: 807558669} + weapon: {fileID: 0} + weaponTrans: {fileID: 470232329} + weaponPos: {x: 1, y: 0, z: 0} + isRight: 1 + isGround: 0 + speed: 5 + jumpForce: 10 + flipDuration: 0.3 +--- !u!212 &1800855453 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800855449} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1320200709 + m_SortingLayer: 3 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 280dd2a14df942246955c1936e6114bd, type: 3} + m_Color: {r: 0.9339623, g: 0.9109201, b: 0.7636169, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1800855454 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1800855449} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.47, y: -1.66, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 470232330} + - {fileID: 807558669} + - {fileID: 1921134448} + m_Father: {fileID: 0} + m_RootOrder: 17 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1835952800 GameObject: m_ObjectHideFlags: 0 @@ -2800,7 +3988,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1918365588} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9061838, y: 0, z: 0} + m_LocalPosition: {x: 1.6940001, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2122669497} @@ -2871,6 +4059,36 @@ MonoBehaviour: m_EditorClassIdentifier: moveRate: 0.2 startPoint: 0 +--- !u!1 &1921134447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1921134448} + m_Layer: 0 + m_Name: "\u6B66\u5668\u4F4D\u7F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1921134448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921134447} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.4099998, y: 2.9299994, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1800855454} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1965616928 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/勍/场景3.unity b/Assets/Scenes/勍/场景3.unity index 646dba5..0425d81 100644 --- a/Assets/Scenes/勍/场景3.unity +++ b/Assets/Scenes/勍/场景3.unity @@ -123,6 +123,70 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &39548310 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 566865784} + m_PrefabAsset: {fileID: 0} +--- !u!4 &39548311 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 566865784} + m_PrefabAsset: {fileID: 0} +--- !u!95 &39548312 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39548310} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1ba7e0ac06fb77d46a4671461667d828, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!4 &52329460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + m_PrefabInstance: {fileID: 566865784} + m_PrefabAsset: {fileID: 0} +--- !u!1 &143837087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 143837088} + m_Layer: 0 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &143837088 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143837087} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.56, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1801910678} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &245386978 GameObject: m_ObjectHideFlags: 0 @@ -142,7 +206,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!61 &245386979 BoxCollider2D: m_ObjectHideFlags: 0 @@ -203,8 +267,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: inputDir: 0 + bone: {fileID: 0} groundCheck: {fileID: 1319377547} weapon: {fileID: 0} + weaponTrans: {fileID: 0} weaponPos: {x: 1, y: 0, z: 0} isRight: 1 isGround: 0 @@ -304,7 +370,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 520470564} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.983469, y: 1.36, z: 0} + m_LocalPosition: {x: -13.98476, y: 1.36, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 771707216} @@ -375,6 +441,711 @@ MonoBehaviour: m_EditorClassIdentifier: moveRate: 0.7 startPoint: 0 +--- !u!1001 &566865784 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1801910678} + m_Modifications: + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8472028 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9990805 + objectReference: {fileID: 0} + - target: {fileID: 304536019053117079, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.04287368 + objectReference: {fileID: 0} + - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 544852659734527807, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2251129 + objectReference: {fileID: 0} + - target: {fileID: 1292480115956132516, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7046301 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1775742 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.09949586 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.08266038 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.9965778 + objectReference: {fileID: 0} + - target: {fileID: 1654381636955567146, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.571297 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000006439765 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9862338 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.1653573 + objectReference: {fileID: 0} + - target: {fileID: 1784419579736956512, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.08779 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000001088842 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999409 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.01087318 + objectReference: {fileID: 0} + - target: {fileID: 1846892064846128359, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1814797 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1108834 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.0816908 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.9966578 + objectReference: {fileID: 0} + - target: {fileID: 1961593623400083510, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8077052 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000001721674 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9857183 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.168403 + objectReference: {fileID: 0} + - target: {fileID: 1976783136563832379, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2067093148863414012, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.276312 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.03781857 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7080904 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7061218 + objectReference: {fileID: 0} + - target: {fileID: 2104614593684718240, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9989145 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.04658162 + objectReference: {fileID: 0} + - target: {fileID: 2359386823812917229, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.z + value: 0.46199042 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.12 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.88 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2459659136356866404, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8779536 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00000003723409 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9992116 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.03970221 + objectReference: {fileID: 0} + - target: {fileID: 2969912924545724622, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3139476684695217710, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3518558182975132334, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.386071 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1275305 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.3770569 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.9261902 + objectReference: {fileID: 0} + - target: {fileID: 3868614081746239455, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000001338032 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9997447 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.02259521 + objectReference: {fileID: 0} + - target: {fileID: 3908551293858388168, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4258863831937463669, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 5184585291826125097, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5230711790005625717, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 5253916272546461107, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Name + value: cangjie + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000001408897 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999777 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.006681608 + objectReference: {fileID: 0} + - target: {fileID: 6041871679610611535, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6312314422838805471, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000000559481 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9824338 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.1866114 + objectReference: {fileID: 0} + - target: {fileID: 6432170173735761726, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6601027411502806696, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6717728856294287736, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6787023872785350082, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6802631931743417492, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6895216320908761780, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7271643883544001200, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 7882857787574193221, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 2.269244 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.0000002166282 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9998721 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.01599354 + objectReference: {fileID: 0} + - target: {fileID: 7930584689839984714, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8046125051025425614, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8306866507882796210, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8385037936056148123, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8526898341661258944, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8678235576725192488, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.12175 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0000002713931 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.999678 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.02537676 + objectReference: {fileID: 0} + - target: {fileID: 8732880236209583034, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.x + value: -2.002787 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalPosition.y + value: -2.963103 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8800381 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalRotation.z + value: 0.47490305 + objectReference: {fileID: 0} + - target: {fileID: 8812174924304114638, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 56.706 + objectReference: {fileID: 0} + - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9097020254388595172, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} + propertyPath: m_SortingLayerID + value: 1320200709 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46cec9e1f4de2434c88570db9ebeaffa, type: 3} --- !u!1 &630093754 GameObject: m_ObjectHideFlags: 0 @@ -578,7 +1349,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 758554695} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -17.978746, y: 1.75, z: 0} + m_LocalPosition: {x: -17.980406, y: 1.75, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_Children: [] m_Father: {fileID: 771707216} @@ -720,7 +1491,7 @@ MonoBehaviour: m_Priority: 10 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 245386983} + m_Follow: {fileID: 1801910678} m_Lens: FieldOfView: 60 OrthographicSize: 5 @@ -744,7 +1515,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 775402495} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -21.1, y: -0.56999993, z: -10} + m_LocalPosition: {x: -21.72, y: 0.14999998, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2079299524} @@ -876,7 +1647,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963605171} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 19.976385, y: 1.6, z: 0} + m_LocalPosition: {x: 19.97823, y: 1.6, z: 0} m_LocalScale: {x: 1.7, y: 1.7, z: 2} m_Children: [] m_Father: {fileID: 675942874} @@ -974,7 +1745,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1067217490} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.6652775, y: -0.52, z: 0} + m_LocalPosition: {x: -12.665646, y: -0.52, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 630093755} @@ -1064,6 +1835,36 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1069666171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1069666172} + m_Layer: 0 + m_Name: "\u6B66\u5668\u4F4D\u7F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1069666172 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069666171} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.4099998, y: 2.9299994, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1801910678} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1148879750 GameObject: m_ObjectHideFlags: 0 @@ -1173,8 +1974,8 @@ PolygonCollider2D: m_Points: m_Paths: - - {x: 28.879782, y: -2.5493548} - - {x: 28.85, y: 2} - - {x: 10.2, y: 2} + - {x: 28.911602, y: 2.539213} + - {x: 10.003847, y: 2.4114685} - {x: 5.7, y: 0.5} - {x: -29.045456, y: 0.5} - {x: -28.78177, y: -2.4249005} @@ -1452,7 +2253,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1754304753} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.976385, y: -0.5665839, z: -10} + m_LocalPosition: {x: -19.97823, y: 0.040209174, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1525,6 +2326,164 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1 &1801910673 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1801910678} + - component: {fileID: 1801910677} + - component: {fileID: 1801910676} + - component: {fileID: 1801910675} + - component: {fileID: 1801910674} + m_Layer: 0 + m_Name: Player (1) + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1801910674 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801910673} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &1801910675 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801910673} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 2 + m_Material: {fileID: 6200000, guid: 2a806147463d9e148aef5c04f75c281d, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &1801910676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801910673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94a70686225bbcc40a44a76ac05951e0, type: 3} + m_Name: + m_EditorClassIdentifier: + inputDir: 0 + bone: {fileID: 39548310} + groundCheck: {fileID: 143837088} + weapon: {fileID: 0} + weaponTrans: {fileID: 52329460} + weaponPos: {x: 1, y: 0, z: 0} + isRight: 1 + isGround: 0 + speed: 5 + jumpForce: 10 + flipDuration: 0.3 +--- !u!212 &1801910677 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801910673} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1320200709 + m_SortingLayer: 3 + m_SortingOrder: 10 + m_Sprite: {fileID: 21300000, guid: 280dd2a14df942246955c1936e6114bd, type: 3} + m_Color: {r: 0.9339623, g: 0.9109201, b: 0.7636169, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1801910678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801910673} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -21.72, y: -1.85, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 39548311} + - {fileID: 143837088} + - {fileID: 1069666172} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1968277246 GameObject: m_ObjectHideFlags: 0 @@ -1595,7 +2554,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 126049849 m_SortingLayer: 2 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 40232f9d64891f949bb91bac66d79897, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1633,7 +2592,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2049596583} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -13.983469, y: -0.98, z: 0} + m_LocalPosition: {x: -13.98476, y: -0.98, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 771707216} diff --git a/Assets/Scripts/勍/对话框架/AConversation.cs b/Assets/Scripts/勍/对话框架/AConversation.cs index 408ce1f..266f3f7 100644 --- a/Assets/Scripts/勍/对话框架/AConversation.cs +++ b/Assets/Scripts/勍/对话框架/AConversation.cs @@ -22,7 +22,7 @@ public class AConversation : MonoBehaviour public Transform P1Pos; public Transform P2Pos; [Header("对话框到说话者中心的偏移量")] - public Vector2 offset = new Vector2(1.5f, 1.5f); + public Vector2 offset = new Vector2(3.5f, 2.5f); diff --git a/Assets/Scripts/勍/播片系统.meta b/Assets/Scripts/勍/播片系统.meta new file mode 100644 index 0000000..2191b4a --- /dev/null +++ b/Assets/Scripts/勍/播片系统.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 759f25e63542fe94fa862bb70622f7e1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/播片系统/ACG.cs b/Assets/Scripts/勍/播片系统/ACG.cs new file mode 100644 index 0000000..e43aee3 --- /dev/null +++ b/Assets/Scripts/勍/播片系统/ACG.cs @@ -0,0 +1,30 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + //写一个类，代表一个CG，里面保存CG需要的内容 + public class ACG : MonoBehaviour + { + [Tooltip("名字，同时也是唯一调用标识，别吐槽我用中文，这里是中国")] + public string CGName; + [Tooltip("这个CG要显示的东西，据说视频也可以？")] + public Texture texture; + [Tooltip("这个CG要显示多长时间")] + public float time; + [Tooltip("CG播放结束时要触发什么事件？")] + public Event onEnded; + + public void OnEnded() + { + try + { + onEnded.OnCall();//触发结束事件，不同CG事件不一样，所以用public自己拖 + } + catch(System.Exception e) + { + Debug.Log("要么是这个CG没有结束事件，要么是你这个结束事件里面出错了。什么错？我咋知道（摆烂\n" + + e.ToString()); + } + } + } + diff --git a/Assets/Scripts/勍/播片系统/ACG.cs.meta b/Assets/Scripts/勍/播片系统/ACG.cs.meta new file mode 100644 index 0000000..8ae2301 --- /dev/null +++ b/Assets/Scripts/勍/播片系统/ACG.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d1cc526f2420065428c7ff9dcc3b51ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/播片系统/CGAdministrator.cs b/Assets/Scripts/勍/播片系统/CGAdministrator.cs new file mode 100644 index 0000000..d65e39b --- /dev/null +++ b/Assets/Scripts/勍/播片系统/CGAdministrator.cs @@ -0,0 +1,94 @@ +// using System.Collections; +// using System.Collections.Generic; +// using UnityEngine; +// using UnityEngine.UI; +// using UnityEditor; +// using UnityEngine.Video; +// using UnityEngine.InputSystem; + +// public class CGAdministrator : MonoBehaviour +// { +// // Start is called before the first frame update +// //CG管理员相关代码 + +// private RawImage rawImage; +// [Tooltip("记录这个场景中的所有CG，要加的话直接扩容数组，并往新的CG里面加内容")][SerializeField] +// private ACG[] CGs; +// private IndexRecoder indexRecoder; +// private ACG playingCG;//正在播放的CG，因为invoke无法传参而存在 +// void Start() +// { +// rawImage = GetComponent(); +// indexRecoder = FindObjectOfType(); +// rawImage.CrossFadeAlpha(0,0,true);//为了淡入显示，必须先把它的阿尔法值降到0，对吧？ + +// //好像可以让它自己找到所有CG +// CGs = new ACG[transform.childCount]; +// for(int i = 0; i < transform.childCount; i++) +// { +// CGs[i] = transform.GetChild(i).GetComponent(); +// } +// // + +// // +// //CallACG("暂用"); +// // +// } + +// // Update is called once per frame +// void Update() +// { +// } + + +// //外部呼叫CG用，传入你要调用的CG名 +// public　void　CallACG(string CGName) +// { +// //当外面叫了一个CG，传入CG名 +// foreach(ACG CG in CGs) +// { +// //找到这个CG +// if(CG.CGName.Equals(CGName)) +// { +// Debug.Log("正在显示CG："+CG.name); +// rawImage.texture = CG.texture;//把CG的内容装载上 +// rawImage.CrossFadeAlpha(1,indexRecoder.CGFadeTime,true);//淡入显示CG +// playingCG = CG; +// try +// { +// CG.GetComponent().Play();//开始播放这个CG +// FindObjectOfType().SwitchCurrentActionMap("NullMap");//使玩家无法操作 +// } +// catch(System.NullReferenceException) +// { +// Debug.Log("播放CG失败，看看赋值对不对"); +// } +// Invoke("StopIt",CG.time); +// } +// } +// } + +// //改变标记，使管理员意识到CG该停了 +// private void StopIt(){rawImage.CrossFadeAlpha(0f,indexRecoder.CGFadeTime,true);//淡出CG +// playingCG.OnEnded();}//告诉这个CG它结束了，然后触发它的结束事件 + +// // //制造一个只读的变量，不要动这些 +// // public class ReadOnlyAttribute : PropertyAttribute{} +// // [CustomPropertyDrawer(typeof(ReadOnlyAttribute))] +// // public class ReadOnlyDrawer : PropertyDrawer +// // { +// // public override float GetPropertyHeight(SerializedProperty property, GUIContent label) +// // { +// // return EditorGUI.GetPropertyHeight(property, label, true); +// // } + +// // public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) +// // { +// // GUI.enabled = false; +// // EditorGUI.PropertyField(position, property, label, true); +// // GUI.enabled = true; +// // } +// // } +// // // + +// } diff --git a/Assets/Scripts/勍/播片系统/CGAdministrator.cs.meta b/Assets/Scripts/勍/播片系统/CGAdministrator.cs.meta new file mode 100644 index 0000000..a8eeaf2 --- /dev/null +++ b/Assets/Scripts/勍/播片系统/CGAdministrator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b3954127e8ca6e448e4f5e6d742e054 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/勍/演出/HuangdiAsk.cs b/Assets/Scripts/勍/演出/HuangdiAsk.cs index 5c51a99..de95ce5 100644 --- a/Assets/Scripts/勍/演出/HuangdiAsk.cs +++ b/Assets/Scripts/勍/演出/HuangdiAsk.cs @@ -11,6 +11,8 @@ public class HuangdiAsk : Stage { //触发对话：黄帝提需求 ConversationController.Instance.OnCall("黄帝提需求"); + //触发黄帝指向左边的动画 + FindObjectOfType().Behavior("Point"); //等待对话结束 yield return new WaitForSeconds(3f); //黄帝手指左方，但是目前没有动画 diff --git a/Assets/Scripts/勍/演出/HuangdiConfused.cs b/Assets/Scripts/勍/演出/HuangdiConfused.cs index 6e3546d..657361f 100644 --- a/Assets/Scripts/勍/演出/HuangdiConfused.cs +++ b/Assets/Scripts/勍/演出/HuangdiConfused.cs @@ -9,6 +9,8 @@ public class HuangdiConfused : Stage Debug.Log("黄帝疑惑"); //触发对话：黄帝疑惑 ConversationController.Instance.OnCall("黄帝疑惑"); + //触发黄帝点头的动画 + FindObjectOfType().Behavior("Node"); //等待对话结束 yield return new WaitForSeconds(9f); //标记黄帝状态为End diff --git a/Assets/Scripts/勍/绳结/KnotMediator.cs b/Assets/Scripts/勍/绳结/KnotMediator.cs index 5eb81fd..d6ff789 100644 --- a/Assets/Scripts/勍/绳结/KnotMediator.cs +++ b/Assets/Scripts/勍/绳结/KnotMediator.cs @@ -19,7 +19,7 @@ public class KnotMediator : UnitySingleton /// /// 当前记录的绳结类型 /// - [Header("当前记录的绳结类型")][SerializeField][ReadOnly][EnumPaging] + [Header("当前记录的绳结类型")][SerializeField][EnumPaging] private KnotType currentKnotType; public void RecordKnotType(KnotType knotType) diff --git a/Assets/Scripts/勍/角色/HuangDi.cs b/Assets/Scripts/勍/角色/HuangDi.cs index 807e1f5..1dd53f4 100644 --- a/Assets/Scripts/勍/角色/HuangDi.cs +++ b/Assets/Scripts/勍/角色/HuangDi.cs @@ -11,6 +11,9 @@ public class HuangDi : EntryTrigger [SerializeField][EnumPaging] private KnotMediator.KnotType neededType = KnotMediator.KnotType.编成麻花的绳结; + //自身状态机 + private Animator animator; + public enum HuangDiState { None, @@ -19,6 +22,16 @@ public class HuangDi : EntryTrigger End } + + void Start(){ + animator = GetComponentInChildren(); + //如果没找到，则报错 + if (animator == null) + { + Debug.LogError("没有找到Animator组件"); + } + } + public HuangDiState state = HuangDiState.None; public override void OnCall() @@ -51,4 +64,22 @@ public class HuangDi : EntryTrigger { neededType = type; } + + /// + /// 控制黄帝的动画 + /// + /// 触发的动画名 + public void Behavior(string behaviorName) + { + try{ + //触发动画 + animator.SetTrigger(behaviorName); + } + catch(System.Exception e) + { + e.ToString(); + Debug.LogError("没有找到触发器" + behaviorName); + } + + } } diff --git a/Assets/Scripts/勍/角色/PlayerControl.cs b/Assets/Scripts/勍/角色/PlayerControl.cs index c7faace..0003aea 100644 --- a/Assets/Scripts/勍/角色/PlayerControl.cs +++ b/Assets/Scripts/勍/角色/PlayerControl.cs @@ -18,6 +18,8 @@ public class PlayerControl : MonoBehaviour protected int inputDir; protected PlayerInteract playerInteract; + protected Animator animator; + protected virtual void Start() { playerC = new PlayerC(); @@ -47,6 +49,13 @@ public class PlayerControl : MonoBehaviour checker.GetComponent().size = new Vector2(1f, 1f);//设置碰撞盒大小 checker.transform.localPosition = Vector3.zero;//设置碰撞盒位置 + //找到动画机 + animator = GetComponentInChildren(); + if (animator == null) + { + Debug.LogError("玩家动画机丢失！"); + } + } /// @@ -122,4 +131,23 @@ public class PlayerControl : MonoBehaviour playerC.Normal.Disable(); playerC.Null.Disable(); } + + + /// + /// 触发玩家用触发器触发的动画 + /// + /// 触发器名 + public void Behavior(string behaviorName) + { + try{ + //触发动画 + animator.SetTrigger(behaviorName); + } + catch(System.Exception e) + { + e.ToString(); + Debug.LogError("没有找到触发器" + behaviorName); + } + + } } diff --git a/Assets/动画/huangdi.controller b/Assets/动画/huangdi.controller index 4bc4709..4cd756e 100644 --- a/Assets/动画/huangdi.controller +++ b/Assets/动画/huangdi.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-5148448635645685566 +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: Node + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6838413671657620931} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4101692906760797252 AnimatorState: serializedVersion: 6 @@ -10,7 +35,9 @@ AnimatorState: m_Name: "\u9EC4\u5E1D\u5F85\u673A" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -3375428003934504853} + - {fileID: -5148448635645685566} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -26,6 +53,75 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3375428003934504853 +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: Point + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3334851738953319100} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2853219905132771913 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6838413671657620931} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1022691711078637238 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4101692906760797252} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.46374893 + m_TransitionOffset: 0 + m_ExitTime: 0.8404255 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 1 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -34,7 +130,19 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: huangdi serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Point + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Node + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -58,7 +166,8 @@ AnimatorState: m_Name: "\u9EC4\u5E1D\u4F38\u624B" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -1022691711078637238} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -74,6 +183,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4535415101878901832 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4101692906760797252} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.875 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &6838413671657620931 AnimatorState: serializedVersion: 6 @@ -84,7 +215,8 @@ AnimatorState: m_Name: "\u9EC4\u5E1D\u70B9\u5934" m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 4535415101878901832} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -111,13 +243,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -4101692906760797252} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: 3334851738953319100} - m_Position: {x: 235, y: 65, z: 0} + m_Position: {x: 490, y: 40, z: 0} - serializedVersion: 1 m_State: {fileID: 6838413671657620931} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 550, y: 190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/动画/黄帝伸手.anim b/Assets/动画/黄帝伸手.anim index d0d9c74..e744c2e 100644 --- a/Assets/动画/黄帝伸手.anim +++ b/Assets/动画/黄帝伸手.anim @@ -197,6 +197,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 3 + value: {x: 0, y: 0, z: -2.739} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -231,6 +240,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2.9833333 + value: {x: 0, y: 0, z: -91.282} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -265,6 +283,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2.9833333 + value: {x: 0, y: 0, z: 9.429} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -299,6 +326,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2.9833333 + value: {x: 0, y: 0, z: 1.819} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -370,22 +406,6 @@ AnimationClip: m_RotationOrder: 4 path: bone_1/bone_2/bone_3/bone_7/bone_8/bone_9 m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.2019817, y: -0.009896722, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: bone_1 - curve: serializedVersion: 2 m_Curve: @@ -941,13 +961,6 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 - - serializedVersion: 2 - path: 377759540 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 3980913656 attribute: 1 @@ -1234,7 +1247,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5666667 + m_StopTime: 3 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -1250,63 +1263,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.2019817 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: bone_1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.009896722 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: bone_1 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: bone_1 - classID: 4 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -2903,6 +2859,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2940,6 +2905,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -2977,6 +2951,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 3 + value: -2.739 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3128,6 +3111,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3165,6 +3157,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3202,6 +3203,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: -91.282 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3353,6 +3363,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3390,6 +3409,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3427,6 +3455,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 9.429 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3578,6 +3615,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3615,6 +3661,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -3652,6 +3707,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.9833333 + value: 1.819 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -4291,7 +4355,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_4 classID: 4 script: {fileID: 0} - curve: @@ -4301,7 +4365,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_4 classID: 4 script: {fileID: 0} - curve: @@ -4311,7 +4375,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 + path: bone_1/bone_2/bone_3/bone_4 classID: 4 script: {fileID: 0} - curve: @@ -4321,7 +4385,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_4/bone_5 + path: bone_1/bone_2/bone_3/bone_16 classID: 4 script: {fileID: 0} - curve: @@ -4331,7 +4395,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_4/bone_5 + path: bone_1/bone_2/bone_3/bone_16 classID: 4 script: {fileID: 0} - curve: @@ -4341,7 +4405,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_4/bone_5 + path: bone_1/bone_2/bone_3/bone_16 classID: 4 script: {fileID: 0} - curve: @@ -4651,7 +4715,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_4 + path: bone_1/bone_2/bone_3/bone_4/bone_5 classID: 4 script: {fileID: 0} - curve: @@ -4661,7 +4725,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_4 + path: bone_1/bone_2/bone_3/bone_4/bone_5 classID: 4 script: {fileID: 0} - curve: @@ -4671,7 +4735,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_4 + path: bone_1/bone_2/bone_3/bone_4/bone_5 classID: 4 script: {fileID: 0} - curve: @@ -4741,7 +4805,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: bone_1/bone_2/bone_3/bone_16 + path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 classID: 4 script: {fileID: 0} - curve: @@ -4751,7 +4815,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: bone_1/bone_2/bone_3/bone_16 + path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 classID: 4 script: {fileID: 0} - curve: @@ -4761,7 +4825,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: bone_1/bone_2/bone_3/bone_16 + path: bone_1/bone_2/bone_3/bone_4/bone_5/bone_6 classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/美术素材/场景1/问号.png b/Assets/美术素材/场景1/问号.png new file mode 100644 index 0000000..2dcc7c7 Binary files /dev/null and b/Assets/美术素材/场景1/问号.png differ diff --git a/Assets/美术素材/场景1/问号.png.meta b/Assets/美术素材/场景1/问号.png.meta new file mode 100644 index 0000000..19ea9da --- /dev/null +++ b/Assets/美术素材/场景1/问号.png.meta @@ -0,0 +1,144 @@ +fileFormatVersion: 2 +guid: 1fe3d52b0444bee4ea17d4d1cfd70a70 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 400 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt index 53bb8fd..e537d4c 100644 --- a/Logs/ApiUpdaterCheck.txt +++ b/Logs/ApiUpdaterCheck.txt @@ -162,3 +162,13 @@ C# parse time : -1ms candidates check time : -1ms console write time : -1ms +[api-updater (non-obsolete-error-filter)] 2022/4/1 23:01:40 : Starting D:/unity/Editor/2020.3.30f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe +[api-updater (non-obsolete-error-filter)] +---------------------------------- +jit/startup time : 783.3485ms +moved types parse time: 58ms +candidates parse time : 1ms +C# parse time : -1ms +candidates check time : -1ms +console write time : -1ms + diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 55a12d9..1974449 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,25 +6,25 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021 flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021 + value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 + value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d + value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d + value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0