diff --git a/Assets/2D_Destruction/Demo/Demo Scripts/ExplosionForce.cs b/Assets/2D_Destruction/Demo/Demo Scripts/ExplosionForce.cs
index b02e04b..2a0b700 100644
--- a/Assets/2D_Destruction/Demo/Demo Scripts/ExplosionForce.cs
+++ b/Assets/2D_Destruction/Demo/Demo Scripts/ExplosionForce.cs
@@ -13,7 +13,7 @@ public class ExplosionForce : MonoBehaviour {
///
/// location of the explosion
public void doExplosion(Vector3 position){
- transform.localPosition = position;
+ //transform.localPosition = position;
StartCoroutine(waitAndExplode());
}
diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset
new file mode 100644
index 0000000..4393db1
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset
@@ -0,0 +1,136 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 772478971, guid: a4865f1ab4504ed8a368670db22f409c, type: 3}
+ m_Name: ColorPaletteManager
+ m_EditorClassIdentifier:
+ colorPalettes:
+ - name: Country
+ showAlpha: 0
+ colors:
+ - {r: 0.776, g: 0.651, b: 0.349, a: 1}
+ - {r: 0.863, g: 0.761, b: 0.631, a: 1}
+ - {r: 0.91, g: 0.831, b: 0.686, a: 1}
+ - {r: 0.961, g: 0.902, b: 0.788, a: 1}
+ - {r: 0.753, g: 0.714, b: 0.667, a: 1}
+ - {r: 0.478, g: 0.573, b: 0.431, a: 1}
+ - {r: 0.314, g: 0.427, b: 0.31, a: 1}
+ - {r: 0.596, g: 0.345, b: 0.235, a: 1}
+ - {r: 0.545, g: 0.329, b: 0.318, a: 1}
+ - {r: 0.647, g: 0.204, b: 0.227, a: 1}
+ - {r: 0.435, g: 0.161, b: 0.063, a: 1}
+ - {r: 0.357, g: 0.333, b: 0.278, a: 1}
+ - {r: 0.976, g: 0.98, b: 0.961, a: 1}
+ - {r: 0.165, g: 0.271, b: 0.11, a: 1}
+ - name: Beach
+ showAlpha: 0
+ colors:
+ - {r: 0.996, g: 0.906, b: 0.459, a: 1}
+ - {r: 0.314, g: 0.592, b: 0.035, a: 1}
+ - {r: 0.486, g: 0.953, b: 0.875, a: 1}
+ - {r: 0.996, g: 0.82, b: 0.212, a: 1}
+ - {r: 1, g: 0.769, b: 0.165, a: 1}
+ - {r: 0.804, g: 0.835, b: 0.753, a: 1}
+ - {r: 1, g: 0.769, b: 0.165, a: 1}
+ - {r: 1, g: 0.702, b: 0.063, a: 1}
+ - {r: 1, g: 0.898, b: 0.569, a: 1}
+ - name: Fall
+ showAlpha: 0
+ colors:
+ - {r: 0.82, g: 0.722, b: 0.318, a: 1}
+ - {r: 0.537, g: 0.192, b: 0.153, a: 1}
+ - {r: 0.996, g: 0.812, b: 0.012, a: 1}
+ - {r: 1, g: 0.431, b: 0.02, a: 1}
+ - {r: 0.937, g: 0.267, b: 0.094, a: 1}
+ - {r: 0.42, g: 0.212, b: 0.18, a: 1}
+ - {r: 0.992, g: 0.651, b: 0.004, a: 1}
+ - {r: 0.89, g: 0.353, b: 0.086, a: 1}
+ - {r: 1, g: 0.443, b: 0.004, a: 1}
+ - {r: 0.682, g: 0.275, b: 0.137, a: 1}
+ - {r: 0.306, g: 0.231, b: 0.114, a: 1}
+ - {r: 0.384, g: 0.416, b: 0.082, a: 1}
+ - {r: 0.165, g: 0.157, b: 0.008, a: 1}
+ - {r: 0.906, g: 0.635, b: 0.227, a: 1}
+ - {r: 0.82, g: 0.722, b: 0.318, a: 1}
+ - {r: 0.745, g: 0.435, b: 0.031, a: 1}
+ - {r: 0.765, g: 0.682, b: 0.569, a: 1}
+ - {r: 0.18, g: 0.149, b: 0.075, a: 1}
+ - {r: 0.702, g: 0.451, b: 0.059, a: 1}
+ - name: Passion
+ showAlpha: 0
+ colors:
+ - {r: 0.925, g: 0.682, b: 0.624, a: 1}
+ - {r: 0.188, g: 0.114, b: 0.224, a: 1}
+ - {r: 0.349, g: 0.11, b: 0.231, a: 1}
+ - {r: 0.435, g: 0.267, b: 0.357, a: 1}
+ - name: Sepia
+ showAlpha: 0
+ colors:
+ - {r: 0.353, g: 0.098, b: 0.02, a: 1}
+ - {r: 0.663, g: 0.188, b: 0.114, a: 1}
+ - {r: 0.906, g: 0.643, b: 0.082, a: 1}
+ - {r: 0.996, g: 0.839, b: 0.322, a: 1}
+ - {r: 0.486, g: 0.392, b: 0.02, a: 1}
+ - {r: 0.294, g: 0.235, b: 0.012, a: 1}
+ - name: Floral
+ showAlpha: 0
+ colors:
+ - {r: 0.855, g: 0.518, b: 0.412, a: 1}
+ - {r: 0.827, g: 0.294, b: 0.333, a: 1}
+ - {r: 0.737, g: 0.118, b: 0.208, a: 1}
+ - {r: 0.549, g: 0.149, b: 0.235, a: 1}
+ - {r: 0.949, g: 0.925, b: 0.784, a: 1}
+ - {r: 0.945, g: 0.882, b: 0.69, a: 1}
+ - {r: 0.871, g: 0.812, b: 0.698, a: 1}
+ - {r: 0.4, g: 0.196, b: 0.243, a: 1}
+ - {r: 0.271, g: 0.157, b: 0.227, a: 1}
+ - name: Underwater
+ showAlpha: 0
+ colors:
+ - {r: 0.663, g: 0.416, b: 0.733, a: 1}
+ - {r: 0.2, g: 0.6, b: 0.698, a: 1}
+ - {r: 0.11, g: 0.49, b: 0.698, a: 1}
+ - {r: 0.439, g: 0.627, b: 0.227, a: 1}
+ - {r: 0, g: 0.357, b: 0.604, a: 1}
+ - {r: 0.067, g: 0.271, b: 0.353, a: 1}
+ - name: Breeze
+ showAlpha: 0
+ colors:
+ - {r: 0.706, g: 1, b: 0, a: 1}
+ - {r: 0.651, g: 1, b: 0.404, a: 1}
+ - {r: 0.122, g: 1, b: 0.514, a: 1}
+ - {r: 0.216, g: 0.894, b: 0.961, a: 1}
+ - {r: 0.4, g: 1, b: 0.882, a: 1}
+ - {r: 0.027, g: 0.792, b: 0.8, a: 1}
+ - name: Clovers
+ showAlpha: 0
+ colors:
+ - {r: 0.431, g: 0.549, b: 0.102, a: 1}
+ - {r: 0.671, g: 0.714, b: 0.071, a: 1}
+ - {r: 0.969, g: 0.949, b: 0.831, a: 1}
+ - {r: 0.886, g: 0.902, b: 0.702, a: 1}
+ - {r: 0.753, g: 0.824, b: 0.627, a: 1}
+ - {r: 0.404, g: 0.6, b: 0.4, a: 1}
+ - name: Tropical
+ showAlpha: 0
+ colors:
+ - {r: 0.953, g: 0.647, b: 0.804, a: 1}
+ - {r: 0.965, g: 0.741, b: 0.871, a: 1}
+ - {r: 0.949, g: 0.549, b: 0.643, a: 1}
+ - {r: 0.992, g: 0.659, b: 0.498, a: 1}
+ - {r: 0.976, g: 0.792, b: 0.729, a: 1}
+ - {r: 0.984, g: 0.855, b: 0.725, a: 1}
+ - {r: 0.259, g: 0.882, b: 0.663, a: 1}
+ - {r: 0.349, g: 0.753, b: 0.78, a: 1}
+ - {r: 0.725, g: 0.976, b: 0.91, a: 1}
+ - {r: 0.647, g: 0.745, b: 0.957, a: 1}
+ - {r: 0.725, g: 0.863, b: 0.973, a: 1}
+ - {r: 0.89, g: 0.945, b: 0.996, a: 1}
diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta
new file mode 100644
index 0000000..c154e0f
--- /dev/null
+++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/ColorPaletteManager.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2102a5658babd344094609ce109a6b96
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/勍/场景/0813中期提交.unity b/Assets/勍/场景/0813中期提交.unity
index 42a0107..9f4af9d 100644
--- a/Assets/勍/场景/0813中期提交.unity
+++ b/Assets/勍/场景/0813中期提交.unity
@@ -123,6 +123,302 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1001 &45508662
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 48796378}
+ m_Modifications:
+ - target: {fileID: 732071823048636758, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.59
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.65
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2324768266243309530, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3114661540994365121, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3691817253011569053, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3879710674375253124, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3883856911099638413, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.5982367
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.016374707
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9940965
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0.10849917
+ objectReference: {fileID: 0}
+ - target: {fileID: 3963806242261111788, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 12.458
+ objectReference: {fileID: 0}
+ - target: {fileID: 4014612231575383940, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4201477671987755766, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4892953436698048767, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5195027621502174166, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5224253197253543846, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5283127036198560489, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5475110716148461370, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 5527814547122011720, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6149805179577662044, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6255862672327117897, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6341361452781082161, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6751511567952709409, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_SortingOrder
+ value: 22
+ objectReference: {fileID: 0}
+ - target: {fileID: 6871177380209087572, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6964666523161058068, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.9470601
+ objectReference: {fileID: 0}
+ - target: {fileID: 6964666523161058068, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6964666523161058068, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6964666523161058068, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.3210565
+ objectReference: {fileID: 0}
+ - target: {fileID: 6964666523161058068, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -37.454
+ objectReference: {fileID: 0}
+ - target: {fileID: 7343341259706352423, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 7803424139135389034, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8369606145024512326, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8570262817812391550, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 8737431140179654392, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Name
+ value: "\u4EBA\u554A"
+ objectReference: {fileID: 0}
+ - target: {fileID: 8737431140179654392, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ propertyPath: m_Layer
+ value: 3
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+--- !u!4 &45508663 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 2291030504108078617, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ m_PrefabInstance: {fileID: 45508662}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &48796377
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 48796378}
+ - component: {fileID: 48796379}
+ - component: {fileID: 48796380}
+ - component: {fileID: 48796381}
+ m_Layer: 3
+ m_Name: "\u4EBA"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &48796378
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 48796377}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.05, y: 7.54, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 45508663}
+ m_Father: {fileID: 802761533}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &48796379
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 48796377}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 23580e9fc55ead34682dc4798ca5d9ca, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ state: 0
+ walkSpeed: 5
+ throwingSpeed: {x: 8, y: 16}
+ jumpSpeed: {x: 5, y: 5}
+ deadFlyVeloctiy: {x: 10, y: 10}
+ deadFlyRotateSpeed: 200
+--- !u!70 &48796380
+CapsuleCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 48796377}
+ m_Enabled: 1
+ m_Density: 0
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_Size: {x: 1.4, y: 5.21}
+ m_Direction: 0
+--- !u!50 &48796381
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 48796377}
+ m_BodyType: 0
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 1
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
--- !u!1 &73873033
GameObject:
m_ObjectHideFlags: 0
@@ -267,7 +563,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 0
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &154978989
GameObject:
@@ -298,7 +594,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 1
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &161938576
GameObject:
@@ -360,7 +656,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &173852566
GameObject:
@@ -555,7 +851,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 17
+ m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &360901111
MonoBehaviour:
@@ -692,7 +988,7 @@ Transform:
m_Children:
- {fileID: 529618156}
m_Father: {fileID: 1628803666}
- m_RootOrder: 27
+ m_RootOrder: 29
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &494634835
MonoBehaviour:
@@ -820,7 +1116,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 3
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &545861036
PolygonCollider2D:
@@ -1045,7 +1341,7 @@ Transform:
m_Children:
- {fileID: 1620219698}
m_Father: {fileID: 1628803666}
- m_RootOrder: 26
+ m_RootOrder: 28
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &554882431
MonoBehaviour:
@@ -1110,7 +1406,7 @@ Transform:
m_Children:
- {fileID: 1255727778}
m_Father: {fileID: 1628803666}
- m_RootOrder: 23
+ m_RootOrder: 25
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &564045024
MonoBehaviour:
@@ -1367,7 +1663,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 25
+ m_RootOrder: 27
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &663672399
GameObject:
@@ -1480,7 +1776,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 8
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &713652360
MonoBehaviour:
@@ -1586,7 +1882,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 18
+ m_RootOrder: 20
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &728963518
MonoBehaviour:
@@ -1690,7 +1986,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 24
+ m_RootOrder: 26
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &749612608
GameObject:
@@ -1723,7 +2019,7 @@ Transform:
m_Children:
- {fileID: 1388915630}
m_Father: {fileID: 1628803666}
- m_RootOrder: 20
+ m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &749612610
MonoBehaviour:
@@ -1872,7 +2168,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &792774107
MonoBehaviour:
@@ -1991,6 +2287,7 @@ Transform:
- {fileID: 1970633072}
- {fileID: 452174143}
- {fileID: 1628803666}
+ - {fileID: 48796378}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2109,7 +2406,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 4
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &885435517
MonoBehaviour:
@@ -2215,7 +2512,7 @@ Transform:
m_Children:
- {fileID: 663672400}
m_Father: {fileID: 1628803666}
- m_RootOrder: 21
+ m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &918315316
MonoBehaviour:
@@ -2395,7 +2692,7 @@ Transform:
m_Children:
- {fileID: 113975523}
m_Father: {fileID: 1628803666}
- m_RootOrder: 22
+ m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &972352259
MonoBehaviour:
@@ -2608,7 +2905,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 9
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1036579612
MonoBehaviour:
@@ -2714,7 +3011,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 12
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1044722289
MonoBehaviour:
@@ -3154,7 +3451,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 11
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1128287998
PolygonCollider2D:
@@ -3387,6 +3684,37 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.1, y: 0.1}
m_EdgeRadius: 0
+--- !u!1 &1257474686
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1257474687}
+ m_Layer: 3
+ m_Name: "\u4EBA\u7684\u9ED8\u8BA4\u4F4D\u7F6E\uFF08\u4E0D\u53EF\u6539\u540D\uFF09"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1257474687
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1257474686}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.05, y: 7.54, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1628803666}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1266862302
GameObject:
m_ObjectHideFlags: 0
@@ -3810,7 +4138,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 5
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1441444618
MonoBehaviour:
@@ -3909,7 +4237,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1509123237}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 57.5, y: -17.4, z: 10}
+ m_LocalPosition: {x: 73.3, y: -17.4, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -3947,7 +4275,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 14
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1550785011
MonoBehaviour:
@@ -4053,7 +4381,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 13
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1587584714
MonoBehaviour:
@@ -4128,6 +4456,31 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &1601474491 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8737431140179654392, guid: 45890d9396a884c479929a6bec7277a3, type: 3}
+ m_PrefabInstance: {fileID: 45508662}
+ m_PrefabAsset: {fileID: 0}
+--- !u!95 &1601474492
+Animator:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1601474491}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &1616626317
GameObject:
m_ObjectHideFlags: 0
@@ -4226,6 +4579,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 1723829470}
+ - {fileID: 1257474687}
- {fileID: 135797382}
- {fileID: 154978990}
- {fileID: 164518512}
@@ -4304,6 +4659,7 @@ MonoBehaviour:
tailSpeed: 50
horseTailRotationRange: {x: -163, y: -291}
tailControlPoint: {fileID: 529618156}
+ footInputCharge: 0
--- !u!114 &1628803668
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4533,6 +4889,64 @@ Transform:
m_Father: {fileID: 1890369891}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 22.006}
+--- !u!1 &1723829469
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1723829470}
+ - component: {fileID: 1723829471}
+ m_Layer: 0
+ m_Name: "\u63A5\u6536\u4EBA\u7528\u7684\u9A6C\u80CC\uFF08\u4E0D\u53EF\u6539\u540D\uFF09"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1723829470
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1723829469}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 6.44, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1628803666}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1723829471
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1723829469}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: -0.5287304, y: 0.5148165}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 4.1723824, y: 2.029633}
+ m_EdgeRadius: 0
--- !u!1 &1731290658
GameObject:
m_ObjectHideFlags: 0
@@ -4596,7 +5010,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 10
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!60 &1740924918
PolygonCollider2D:
@@ -4826,7 +5240,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 7
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1803543687
MonoBehaviour:
@@ -5027,7 +5441,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 15
+ m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1877103434
MonoBehaviour:
@@ -5221,7 +5635,7 @@ Transform:
- {fileID: 1808073623}
- {fileID: 1616626318}
m_Father: {fileID: 1628803666}
- m_RootOrder: 19
+ m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1966191472
GameObject:
@@ -5427,7 +5841,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1628803666}
- m_RootOrder: 16
+ m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2035493587
MonoBehaviour:
@@ -5537,6 +5951,7 @@ MonoBehaviour:
- {fileID: 6827269441704216089, guid: d460728737b3fc644b19b9e623909c0c, type: 3}
- {fileID: 8394613398838939711, guid: 75b1c8a243bb035469aff9f38d0a6fe1, type: 3}
- {fileID: 4733579343245745137, guid: 5105e5f9d6ad7704aa9b441190288f9e, type: 3}
+ - {fileID: 4441868543418798964, guid: ffee4636d6bae044eb2fc767d986f12e, type: 3}
creatObstaclesTimeInterval: 10
obstacleCreatPostion: {fileID: 1509123238}
--- !u!114 &2061318610
diff --git a/Assets/勍/脚本/CameraManager.cs b/Assets/勍/脚本/CameraManager.cs
index d62d898..ef3250c 100644
--- a/Assets/勍/脚本/CameraManager.cs
+++ b/Assets/勍/脚本/CameraManager.cs
@@ -68,7 +68,7 @@ public class CameraManager : MonoBehaviour
}
void OnTriggerExit2D(Collider2D other) {
- Debug.Log("出去了一个：" + other.name);
+ //Debug.Log("出去了一个：" + other.name);
switch(other.tag)
{
case "Fragment":
diff --git a/Assets/勍/脚本/GameController.cs b/Assets/勍/脚本/GameController.cs
index 737ff4e..c33a575 100644
--- a/Assets/勍/脚本/GameController.cs
+++ b/Assets/勍/脚本/GameController.cs
@@ -7,35 +7,36 @@ public class GameController : UnitySingleton
{
public struct Death{
- public enum DeadReason { Camera , UpDown }
+ public enum DeadReason { Camera , PersonFall }
public DeadReason deadReason;
}
private Horse horse;
private CameraManager cameraManager;
+ private Person person;
- void Start()
- {
+ void Start(){
FindSth();
}
void Update(){
- //当同时按下左右扳机，触发重开
- if(Gamepad.current.leftTrigger.isPressed && Gamepad.current.rightTrigger.isPressed){
+ //当同时按下左右扳机，触发重开,仅调试用
+ if(Gamepad.current != null && Gamepad.current.leftTrigger.isPressed && Gamepad.current.rightTrigger.isPressed){
UnityEngine.SceneManagement.SceneManager.LoadScene(UnityEngine.SceneManagement.SceneManager.GetActiveScene().name);
}
}
- void FindSth()
- {
+ void FindSth(){
horse = FindObjectOfType();
cameraManager = FindObjectOfType();
+ person = FindObjectOfType();
}
- public void GameOver(Death deathInfo)
- {
+ public void GameOver(Death deathInfo){
//触发马的死亡功能
horse.Death(deathInfo);
+ //触发人的死亡功能
+ person.Death(deathInfo);
//告诉相机马死了
cameraManager.Death(deathInfo);
}
diff --git a/Assets/勍/脚本/Horse.cs b/Assets/勍/脚本/Horse.cs
index 5edc575..2e90850 100644
--- a/Assets/勍/脚本/Horse.cs
+++ b/Assets/勍/脚本/Horse.cs
@@ -316,7 +316,7 @@ public class Horse : MonoBehaviour
///
/// 本帧中，累计的充能值
///
- private float footInputCharge = 0;
+ public float footInputCharge = 0;
///
/// 马头控制点的Pos应同步于此
@@ -601,7 +601,7 @@ public class Horse : MonoBehaviour
RaycastHit2D hit = Physics2D.Raycast(
foots[i].footRealTransform.position,
Vector2.down,
- 1000f,
+ 1000f,
LayerMask.NameToLayer("foot")
);
//如果击中物体的距离已经超过了有效范围，则不贡献速度
@@ -664,8 +664,19 @@ public class Horse : MonoBehaviour
for(int i = 0; i < 4; i++) oriFootOffestOfInput[i] = footOffestOfInput[i];
horseState = HorseState.Stand;
footInputChargeQueue = new Queue();
+
+ //初始化马背接收系统
+ GameObject.Find("接收人用的马背（不可改名）").AddComponent();
}
+ private class HoseBack : MonoBehaviour{
+ private void OnTriggerEnter2D(Collider2D other) {
+ //当马背接受到人，触发人的Recover();
+ if(other.TryGetComponent(out Person person) && person.state == Person.PersonState.FallingOff) person.Recover();
+ }
+ }
+
+
void FindSth()
{
diff --git a/Assets/勍/脚本/Person.cs b/Assets/勍/脚本/Person.cs
new file mode 100644
index 0000000..efa5e72
--- /dev/null
+++ b/Assets/勍/脚本/Person.cs
@@ -0,0 +1,159 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+using Sirenix.OdinInspector;
+
+///
+/// 马背上人的控制类
+///
+public class Person : MonoBehaviour
+{
+ public enum PersonState{
+ Normal,//骑在马背
+ Shoot,//从发射到着地平台
+ Walk,//在平台行走
+ FallingOff,//下落，从脱离平台到判定有结果前
+ Recover,//判定成功到恢复到Normal的过程态
+ Dead//判定失败后均为此态
+ }
+
+ ///
+ /// 人此时的状态
+ ///
+ [Header("信息显示")]
+ [Title("人此时的状态")]
+ [EnumPaging()]
+ public PersonState state;
+
+ ///
+ /// 人在人马分离障碍的平台上时的行走速度
+ ///
+ [FoldoutGroup("主要参数",true)]
+ [Title("人在人马分离障碍的平台上时的行走速率")]
+ public float walkSpeed = 1f;
+
+
+ ///
+ /// 人在人马分离障碍前，被抛出的速度
+ ///
+ [FoldoutGroup("附加参数",false)]
+ [Title("人在人马分离障碍前，被抛出的速度")]
+ public Vector2 throwingSpeed;
+
+ [FoldoutGroup("附加参数",false)]
+ [Title("人在离开平台时起跳的速度")]
+ public Vector2 jumpSpeed;
+
+ [FoldoutGroup("附加参数")][Title("人死后的飞出速度")]
+ public Vector2 deadFlyVeloctiy;
+
+ [FoldoutGroup("附加参数")][Title("人死后的飞出的旋转的角速度")]
+ public float deadFlyRotateSpeed;
+
+ ///
+ /// 默认状态下的追踪点
+ ///
+ private Transform defaultTrackingPoint;
+
+ private Rigidbody2D m_rigidbody2D;
+
+
+ void Start(){
+ //Init
+ //Init
+ //Find
+ defaultTrackingPoint = GameObject.Find("人的默认位置（不可改名）").transform;
+ m_rigidbody2D = GetComponent();
+ //Find
+ }
+ void Update(){
+ //默认状态下的Update
+ if(state == PersonState.Normal){
+ //同步人和马的位置和旋转
+ transform.position = defaultTrackingPoint.position;
+ transform.rotation = defaultTrackingPoint.rotation;
+ }
+ //行走状态下的Update
+ else if(state == PersonState.Walk){
+ //让人向右移动
+ transform.position += (Vector3.right * walkSpeed * Time.deltaTime);
+ }
+ }
+
+ ///
+ /// 人发射的瞬间触发，由人马分离障碍物触发
+ ///
+ public void Shoot(){
+ Debug.Log("人发射");
+ state = PersonState.Shoot;
+ //给与刚体一个右上角的速度，使其刚好能抛到平台上
+ m_rigidbody2D.velocity = throwingSpeed;
+ //1秒内修正人的旋转
+ transform.DORotate(new Vector3(0,0,0),1).OnComplete(
+ //旋转修正结束后，锁定刚体Z轴旋转
+ () => m_rigidbody2D.constraints = RigidbodyConstraints2D.FreezeRotation
+ );
+ }
+
+ ///
+ /// 人接触到平台的瞬间触发，由人马分离障碍物触发
+ ///
+ public void Walk(){
+ Debug.Log("人行走");
+ state = PersonState.Walk;
+ }
+
+ ///
+ /// 人离开平台的瞬间触发，由人马分离障碍物触发
+ ///
+ public void FallingOff(){
+ Debug.Log("人降落");
+ state = PersonState.FallingOff;
+ //给刚体一个右上的速度，模拟一下起跳
+ m_rigidbody2D.velocity = jumpSpeed;
+ }
+
+ public void Recover(){
+ Debug.Log("人成功降落到马背");
+ state = PersonState.Recover;
+ //1秒内修正人的位置和旋转，与defaultTrackingPoint同步
+ //后发现，由于追踪的动画终点是定好了的，但是马在这一秒还是会运动，会导致问题，所以这里把时间改短
+ transform.DOMove(defaultTrackingPoint.position,0.2f);
+ transform.DORotate(defaultTrackingPoint.rotation.eulerAngles,0.2f).OnComplete(
+ () => state = PersonState.Normal
+ );
+
+ }
+
+ ///
+ /// 由GameController触发，用于控制人死后的动作
+ ///
+ public void Death(GameController.Death deathInfo){
+ state = PersonState.Dead;
+ //让人和马一样，旋转着飞出去，同时关闭自身的碰撞体
+ GetComponent().enabled = false;
+ Rigidbody2D rigidbody2D = GetComponent();
+ rigidbody2D.velocity = deadFlyVeloctiy;
+ rigidbody2D.angularVelocity = deadFlyRotateSpeed;
+ }
+
+ private void OnCollisionEnter2D(Collision2D other) {
+ //如果创到地面，且是在降落状态，则判定为游戏失败
+ if(other.gameObject.tag == "Ground" && state == PersonState.FallingOff){
+ GameController.Death death = new GameController.Death();
+ death.deadReason = GameController.Death.DeadReason.PersonFall;
+ GameController.Instance.GameOver(death);
+ Debug.Log("人掉落到地面");
+ }
+ }
+
+
+
+
+
+
+
+
+
+}
diff --git a/Assets/勍/脚本/Person.cs.meta b/Assets/勍/脚本/Person.cs.meta
new file mode 100644
index 0000000..0a3b42e
--- /dev/null
+++ b/Assets/勍/脚本/Person.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 23580e9fc55ead34682dc4798ca5d9ca
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/勍/脚本/障碍物系统/BreakAbleObstacle.cs b/Assets/勍/脚本/障碍物系统/BreakAbleObstacle.cs
index 067f617..24cbc8e 100644
--- a/Assets/勍/脚本/障碍物系统/BreakAbleObstacle.cs
+++ b/Assets/勍/脚本/障碍物系统/BreakAbleObstacle.cs
@@ -48,7 +48,8 @@ public class BreakAbleObstacle : Obstacle
void BreakObstacle(Transform horse)
{
explodable.explode();
- float force = (horse.GetComponent().velocity.x + 1) * breakForce + 1;
+ float force = horse.GetComponent().footInputCharge * breakForce;
+ Debug.Log("Force:" + force);
explosionForce.force = force;
explosionForce.doExplosion(explosionForce.transform.position);
GetComponent().enabled = false;
diff --git a/Assets/勍/脚本/障碍物系统/HumanHorseBreakObstacle.cs b/Assets/勍/脚本/障碍物系统/HumanHorseBreakObstacle.cs
index d7b5ed3..3c359e6 100644
--- a/Assets/勍/脚本/障碍物系统/HumanHorseBreakObstacle.cs
+++ b/Assets/勍/脚本/障碍物系统/HumanHorseBreakObstacle.cs
@@ -2,17 +2,25 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
-public class HumanHorseBreakObstacle : MonoBehaviour
+///
+/// 人马分离障碍物类
+///
+public class HumanHorseBreakObstacle : Obstacle
{
- // Start is called before the first frame update
- void Start()
- {
-
+ bool hasShoot = false;
+ private void OnTriggerEnter2D(Collider2D other) {
+ //如果人进入了人马分离的触发器,触发人的发射函数
+ if(other.TryGetComponent(out Person person) && !hasShoot) {person.Shoot();hasShoot = true;}
}
- // Update is called once per frame
- void Update()
- {
-
+ private void OnCollisionEnter2D(Collision2D other) {
+ //如果人到了平台上，触发Walk
+ if(other.gameObject.TryGetComponent(out Person person) && person.state == Person.PersonState.Shoot) {person.Walk();}
}
+
+ private void OnCollisionExit2D(Collision2D other) {
+ //如果人离开了平台上，触发FallingOff
+ if(other.gameObject.TryGetComponent(out Person person) && person.state == Person.PersonState.Walk) {person.FallingOff();}
+ }
+
}
diff --git a/Assets/勍/脚本/障碍物系统/Obstacle.cs b/Assets/勍/脚本/障碍物系统/Obstacle.cs
index 822f018..7a07766 100644
--- a/Assets/勍/脚本/障碍物系统/Obstacle.cs
+++ b/Assets/勍/脚本/障碍物系统/Obstacle.cs
@@ -9,12 +9,6 @@ public enum ObstacleType { low, high, breakable, humanHorseBreak }
///
public class Obstacle : MonoBehaviour
{
- ///
- /// 记忆Y，代表障碍物生成时需要的的Y坐标
- ///
- [Header("障碍物生成时的Y坐标")]
- public float remanberY;
-
protected ObstacleType obstacleType;
virtual protected void Start() {
diff --git a/Assets/勍/脚本/障碍物系统/ObstacleManager.cs b/Assets/勍/脚本/障碍物系统/ObstacleManager.cs
index 60f81bb..1c2a33c 100644
--- a/Assets/勍/脚本/障碍物系统/ObstacleManager.cs
+++ b/Assets/勍/脚本/障碍物系统/ObstacleManager.cs
@@ -28,12 +28,14 @@ public class ObstacleManager : UnitySingleton
{
float randomT = Random.Range(0f,1f);
GameObject obstacle;
- if(randomT < 0.33f)
+ if(randomT < 0.25f)
obstacle = obstacles[0];
- else if(randomT < 0.66f)
+ else if(randomT < 0.5f)
obstacle = obstacles[1];
- else
+ else if(randomT < 0.75f)
obstacle = obstacles[2];
+ else
+ obstacle = obstacles[3];
Vector3 xz = obstacleCreatPostion.position;
Vector3 pos = new Vector3(xz.x,obstacle.transform.position.y,xz.z);
GameObject.Instantiate(obstacle, pos, Quaternion.identity);
diff --git a/Assets/勍/预制体/障碍物/BreakableObstacle.prefab b/Assets/勍/预制体/障碍物/BreakableObstacle.prefab
index eb0ae80..9a5b7d8 100644
--- a/Assets/勍/预制体/障碍物/BreakableObstacle.prefab
+++ b/Assets/勍/预制体/障碍物/BreakableObstacle.prefab
@@ -218,9 +218,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0670d29f3d3c3834e959894d59615b48, type: 3}
m_Name:
m_EditorClassIdentifier:
- remanberY: 3.21
- breakSpeedThreshold: 15
- breakForce: 50
+ breakSpeedThreshold: 18
+ breakForce: 1000
--- !u!61 &4733579343245745139
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -312,6 +311,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b57070c18171a2448bd93ce4df9e8ff5, type: 3}
m_Name:
m_EditorClassIdentifier:
- force: 25
+ force: 1000
radius: 30
- upliftModifer: 1
+ upliftModifer: 0.29
diff --git a/Assets/勍/预制体/障碍物/人马分离.prefab b/Assets/勍/预制体/障碍物/人马分离.prefab
new file mode 100644
index 0000000..17ee620
--- /dev/null
+++ b/Assets/勍/预制体/障碍物/人马分离.prefab
@@ -0,0 +1,153 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4441868543418798964
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4441868543418798961}
+ - component: {fileID: 4441868543418798966}
+ - component: {fileID: 4441868543418798967}
+ - component: {fileID: 4441868543418798960}
+ - component: {fileID: 4441868543418798963}
+ m_Layer: 2
+ m_Name: "\u4EBA\u9A6C\u5206\u79BB"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4441868543418798961
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441868543418798964}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 41.9, y: 5.35, z: 0}
+ m_LocalScale: {x: 3, y: 3, z: 3}
+ m_ConstrainProportionsScale: 1
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &4441868543418798966
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441868543418798964}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ 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: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 752537facf9de2643ab90760902f35f0, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 12.42, y: 7.83}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!61 &4441868543418798967
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441868543418798964}
+ 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.05386538}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 12.42, y: 7.83}
+ newSize: {x: 12.42, y: 7.83}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 12.42, y: 0.5402066}
+ m_EdgeRadius: 0
+--- !u!61 &4441868543418798960
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441868543418798964}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: -8.84, y: 4.14}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 12.42, y: 7.83}
+ newSize: {x: 12.42, y: 7.83}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.5, y: 19.66}
+ m_EdgeRadius: 0
+--- !u!114 &4441868543418798963
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4441868543418798964}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ba0eb96f9e766ed4e8052cca3a89700d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/勍/预制体/障碍物/人马分离.prefab.meta b/Assets/勍/预制体/障碍物/人马分离.prefab.meta
new file mode 100644
index 0000000..0b709eb
--- /dev/null
+++ b/Assets/勍/预制体/障碍物/人马分离.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ffee4636d6bae044eb2fc767d986f12e
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/待实装美术素材/骨骼/donghua/人啊 1.controller b/Assets/待实装美术素材/骨骼/donghua/人啊 1.controller
index 9bafbea..f0f2a7c 100644
--- a/Assets/待实装美术素材/骨骼/donghua/人啊 1.controller
+++ b/Assets/待实装美术素材/骨骼/donghua/人啊 1.controller
@@ -14,19 +14,19 @@ AnimatorStateMachine:
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: -1732533684113504211}
- m_Position: {x: 235, y: 65, z: 0}
+ m_Position: {x: 300, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -3972426342428604086}
- m_Position: {x: 270, y: 130, z: 0}
+ m_Position: {x: 330, y: 170, z: 0}
- serializedVersion: 1
m_State: {fileID: 6009957003174323377}
- m_Position: {x: 305, y: 195, z: 0}
+ m_Position: {x: 370, y: 240, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_AnyStatePosition: {x: 0, y: -70, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
diff --git a/Assets/待实装美术素材/骨骼/人啊.prefab b/Assets/待实装美术素材/骨骼/人啊.prefab
index 853c4b0..b44ac84 100644
--- a/Assets/待实装美术素材/骨骼/人啊.prefab
+++ b/Assets/待实装美术素材/骨骼/人啊.prefab
@@ -28,6 +28,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.425, y: 1.925, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 10
@@ -43,6 +44,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -99,10 +101,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 71195372885482877}
m_Bounds:
- m_Center: {x: -0.00018507242, y: 0.00172019, z: 0}
- m_Extent: {x: 0.776155, y: 0.5691601, z: 0}
+ m_Center: {x: -0.41889167, y: -0.36768, z: 0}
+ m_Extent: {x: 0.4280709, y: 0.8588856, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &2324768266243309530
GameObject:
m_ObjectHideFlags: 0
@@ -129,6 +132,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0.6710053, w: 0.7414526}
m_LocalPosition: {x: -0.8789859, y: 2.0619247, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4985117214529420154}
- {fileID: 71195372885482877}
@@ -164,6 +168,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.485, y: 3.59, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 5
@@ -179,6 +184,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -239,6 +245,7 @@ MonoBehaviour:
m_Extent: {x: 0.6981402, y: 0.9427601, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &3691817253011569053
GameObject:
m_ObjectHideFlags: 0
@@ -265,6 +272,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0.61875635, w: 0.785583}
m_LocalPosition: {x: 0.5968662, y: 0.000000115491304, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9117889202030542723}
m_RootOrder: 0
@@ -292,14 +300,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3879710674375253124}
- m_LocalRotation: {x: 0, y: -0, z: -0.9004463, w: 0.43496728}
+ m_LocalRotation: {x: -0, y: -0, z: -0.62346935, w: 0.7818478}
m_LocalPosition: {x: 0.85443604, y: -0.11792855, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6964666523161058068}
m_Father: {fileID: 4985117214529420154}
m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -77.14}
--- !u!1 &3883856911099638413
GameObject:
m_ObjectHideFlags: 0
@@ -326,6 +335,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: -0.22587147, w: 0.97415715}
m_LocalPosition: {x: 0.9855932, y: 0.000000011933739, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1254630201737825273}
- {fileID: 7800426174789447822}
@@ -361,6 +371,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.32499993, y: 4.655, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 4
@@ -376,6 +387,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -436,6 +448,7 @@ MonoBehaviour:
m_Extent: {x: 0.48231512, y: 0.50262016, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &4201477671987755766
GameObject:
m_ObjectHideFlags: 0
@@ -464,6 +477,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.38, y: 0.845, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 9
@@ -479,6 +493,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -535,10 +550,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 3611613864923072977}
m_Bounds:
- m_Center: {x: -0.000049948692, y: -0.00078999996, z: 0}
- m_Extent: {x: 0.70510006, y: 0.83928, z: 0}
+ m_Center: {x: -1.4183025, y: 0.3474734, z: 0}
+ m_Extent: {x: 0.902447, y: 0.49653655, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &4892953436698048767
GameObject:
m_ObjectHideFlags: 0
@@ -565,6 +581,7 @@ Transform:
m_LocalRotation: {x: 0, y: -0, z: -0.83883333, w: 0.54438835}
m_LocalPosition: {x: 0.048791632, y: 0.042786647, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3435519444870175884}
m_Father: {fileID: 3219357296809171570}
@@ -593,13 +610,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195027621502174166}
- m_LocalRotation: {x: 0, y: 0, z: -0.8068548, w: 0.5907499}
+ m_LocalRotation: {x: -0, y: -0, z: -0.14621894, w: 0.98925227}
m_LocalPosition: {x: 1.2772324, y: 0.0000003081594, z: 0}
m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1141825283428001493}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -16.816}
--- !u!1 &5224253197253543846
GameObject:
m_ObjectHideFlags: 0
@@ -628,6 +646,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.425, y: 1.925, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 3
@@ -643,6 +662,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -703,6 +723,7 @@ MonoBehaviour:
m_Extent: {x: 0.7763801, y: 0.57392, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &5283127036198560489
GameObject:
m_ObjectHideFlags: 0
@@ -729,6 +750,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0.63804173, w: 0.77000177}
m_LocalPosition: {x: 0.6251803, y: 0.00000019421279, z: 0}
m_LocalScale: {x: 0.99999976, y: 0.99999976, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7800426174789447822}
m_RootOrder: 0
@@ -756,14 +778,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5475110716148461370}
- m_LocalRotation: {x: 0, y: -0, z: -0.8374311, w: 0.54654306}
+ m_LocalRotation: {x: -0, y: -0, z: -0.9998816, w: -0.015389621}
m_LocalPosition: {x: 0.04954257, y: 0.035280325, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3611613864923072977}
m_Father: {fileID: 3219357296809171570}
m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -181.764}
--- !u!1 &5527814547122011720
GameObject:
m_ObjectHideFlags: 0
@@ -792,6 +815,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.38, y: 0.845, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 2
@@ -807,6 +831,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -863,10 +888,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 3435519444870175884}
m_Bounds:
- m_Center: {x: -0.0007599592, y: -0.0014349818, z: 0}
- m_Extent: {x: 0.7058102, y: 0.8387252, z: 0}
+ m_Center: {x: 1.2142884, y: 0.06956214, z: 0}
+ m_Extent: {x: 0.8411101, y: 0.69933975, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &6149805179577662044
GameObject:
m_ObjectHideFlags: 0
@@ -895,6 +921,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.46500003, y: 3.185, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 7
@@ -910,6 +937,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -966,10 +994,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 3963806242261111788}
m_Bounds:
- m_Center: {x: 0.0045498013, y: 0.004925251, z: 0}
- m_Extent: {x: 0.62045014, y: 0.21007508, z: 0}
+ m_Center: {x: -0.1573661, y: -0.09589422, z: 0}
+ m_Extent: {x: 0.62909925, y: 0.20346871, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &6255862672327117897
GameObject:
m_ObjectHideFlags: 0
@@ -998,6 +1027,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.14499998, y: 3.465, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 8
@@ -1013,6 +1043,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1069,10 +1100,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 9117889202030542723}
m_Bounds:
- m_Center: {x: 0.00032499433, y: -0.0013444424, z: 0}
- m_Extent: {x: 0.29216486, y: 0.47949493, z: 0}
+ m_Center: {x: -0.06899993, y: -0.02687347, z: 0}
+ m_Extent: {x: 0.24380593, y: 0.4977293, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &6341361452781082161
GameObject:
m_ObjectHideFlags: 0
@@ -1096,14 +1128,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6341361452781082161}
- m_LocalRotation: {x: 0, y: -0, z: -0.89669675, w: 0.44264543}
+ m_LocalRotation: {x: -0, y: -0, z: -0.9494155, w: 0.31402257}
m_LocalPosition: {x: 0.84802103, y: -0.121904515, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3963806242261111788}
m_Father: {fileID: 4985117214529420154}
m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -143.396}
--- !u!1 &6871177380209087572
GameObject:
m_ObjectHideFlags: 0
@@ -1130,6 +1163,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: -0.08219418, w: 0.9966164}
m_LocalPosition: {x: 1.4737588, y: 0.00000028021867, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4985117214529420154}
m_RootOrder: 0
@@ -1162,6 +1196,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.14499998, y: 3.465, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 1
@@ -1177,6 +1212,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1233,10 +1269,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 7800426174789447822}
m_Bounds:
- m_Center: {x: -0.00033006072, y: 0.0008905232, z: 0}
- m_Extent: {x: 0.29242998, y: 0.47792014, z: 0}
+ m_Center: {x: 0.17337397, y: 0.19669256, z: 0}
+ m_Extent: {x: 0.4831939, y: 0.30400968, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &7803424139135389034
GameObject:
m_ObjectHideFlags: 0
@@ -1265,6 +1302,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.73, y: 2.67, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 6
@@ -1280,6 +1318,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1340,6 +1379,7 @@ MonoBehaviour:
m_Extent: {x: 0.4980551, y: 0.826815, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &8369606145024512326
GameObject:
m_ObjectHideFlags: 0
@@ -1368,6 +1408,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.46500003, y: 3.185, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2291030504108078617}
m_RootOrder: 0
@@ -1383,6 +1424,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -1439,10 +1481,11 @@ MonoBehaviour:
m_BoneTransforms:
- {fileID: 6964666523161058068}
m_Bounds:
- m_Center: {x: 0.004090011, y: 0.0023100674, z: 0}
- m_Extent: {x: 0.6209099, y: 0.20951995, z: 0}
+ m_Center: {x: 0.09771186, y: 0.7491999, z: 0}
+ m_Extent: {x: 0.39038265, y: 0.5730499, z: 0}
m_UseBatching: 1
m_AlwaysUpdate: 1
+ m_AutoRebind: 0
--- !u!1 &8570262817812391550
GameObject:
m_ObjectHideFlags: 0
@@ -1469,6 +1512,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: -0.79962534, w: 0.6004993}
m_LocalPosition: {x: 1.273505, y: 0.00000018587112, z: 0}
m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 71195372885482877}
m_RootOrder: 0
@@ -1499,6 +1543,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.44, y: -2.04, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7037795414651828671}
- {fileID: 318539431359005334}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 09b06a1..d910826 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -24,13 +24,13 @@ EditorUserSettings:
value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
flags: 0
RecentlyUsedSceneGuid-6:
- value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c
+ value: 05080302550c580e080c092712740644154f19737e7872697d284a64b4e2663e
flags: 0
RecentlyUsedSceneGuid-7:
value: 02070656525008025e595f23132659444f4e4178787c756679784f35e3b8373e
flags: 0
RecentlyUsedSceneGuid-8:
- value: 05080302550c580e080c092712740644154f19737e7872697d284a64b4e2663e
+ value: 5603015e5556080c0b585e27167308444f4e1c2e7c7f7132797e1f31b4b76c3c
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
index c2ec864..8e3c4ba 100644
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -14,9 +14,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
- - {fileID: 7}
- - {fileID: 9}
- - {fileID: 11}
+ - {fileID: 8}
+ - {fileID: 10}
+ - {fileID: 12}
m_Position:
serializedVersion: 2
x: 0
@@ -26,7 +26,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
- controlID: 30694
+ controlID: 29633
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -48,9 +48,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 342.4
- width: 639.8
- height: 433
+ y: 462.4
+ width: 590.2
+ height: 313
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -61,7 +61,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 799.75, y: 450}
+ m_TargetSize: {x: 649, y: 365}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -76,10 +76,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -319.9
- m_HBaseRangeMax: 319.9
- m_VBaseRangeMin: -180
- m_VBaseRangeMax: 180
+ m_HBaseRangeMin: -259.6
+ m_HBaseRangeMax: 259.6
+ m_VBaseRangeMin: -146
+ m_VBaseRangeMax: 146
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -97,23 +97,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 639.8
- height: 412
+ width: 590.2
+ height: 292
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 319.9, y: 206}
+ m_Translation: {x: 295.1, y: 146}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -319.9
- y: -206
- width: 639.8
- height: 412
+ x: -295.1
+ y: -146
+ width: 590.2
+ height: 292
m_MinimalGUI: 1
m_defaultScale: 1
- m_LastWindowPixelSize: {x: 799.75, y: 541.25}
+ m_LastWindowPixelSize: {x: 737.75, y: 391.25}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
@@ -133,17 +133,17 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Children:
- {fileID: 4}
- - {fileID: 6}
+ - {fileID: 7}
m_Position:
serializedVersion: 2
x: 0
y: 0
- width: 640.8
+ width: 591.2
height: 722.8
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
- controlID: 30695
+ controlID: 29614
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -161,15 +161,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 640.8
- height: 268.8
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ width: 591.2
+ height: 388.8
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 5}
m_Panes:
- {fileID: 5}
+ - {fileID: 6}
m_Selected: 0
- m_LastSelected: 0
+ m_LastSelected: 1
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -192,8 +193,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73.6
- width: 639.8
- height: 247.79999
+ width: 590.2
+ height: 367.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -203,7 +204,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: -100, y: -25.600006}
+ snapOffset: {x: -101, y: -26}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
id: Tool Settings
@@ -214,7 +215,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: -141, y: -191.79999}
+ snapOffset: {x: -141, y: -194.20001}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 3
id: unity-grid-and-snap-toolbar
@@ -269,7 +270,7 @@ MonoBehaviour:
floating: 0
collapsed: 0
displayed: 1
- snapOffset: {x: 0, y: 0}
+ snapOffset: {x: 0, y: 24.8}
snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0
id: unity-transform-toolbar
@@ -417,9 +418,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 0.82052743, y: 2.4240866, z: 0.2796313}
+ m_Target: {x: 13.682084, y: 5.7280016, z: -0.48869893}
speed: 2
- m_Value: {x: 0.82052743, y: 2.4240866, z: 0.2796313}
+ m_Value: {x: 13.682084, y: 5.7280016, z: -0.48869893}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -470,9 +471,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 41.3705
+ m_Target: 20.502565
speed: 2
- m_Value: 41.3705
+ m_Value: 20.502565
m_Ortho:
m_Target: 1
speed: 2
@@ -498,6 +499,70 @@ MonoBehaviour:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &6
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 100, y: 100}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_TitleContent:
+ m_Text: "\u52A8\u753B\u5668"
+ m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 0
+ y: 73.6
+ width: 487
+ height: 259
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+ m_ViewTransforms:
+ m_KeySerializationHelper:
+ - {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_ValueSerializationHelper:
+ - e00: 0.98381555
+ e01: 0
+ e02: 0
+ e03: -100.0116
+ e10: 0
+ e11: 0.98381555
+ e12: 0
+ e13: 115.50764
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_PreviewAnimator: {fileID: 0}
+ m_AnimatorController: {fileID: 9100000, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_BreadCrumbs:
+ - m_Target: {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_ScrollPosition: {x: 0, y: 0}
+ stateMachineGraph: {fileID: 0}
+ stateMachineGraphGUI: {fileID: 0}
+ blendTreeGraph: {fileID: 0}
+ blendTreeGraphGUI: {fileID: 0}
+ m_AutoLiveLink: 1
+ m_MiniTool: 0
+ m_LockTracker:
+ m_IsLocked: 0
+ m_CurrentEditor: 0
+ m_LayerEditor:
+ m_SelectedLayerIndex: 0
+--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -513,17 +578,17 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 268.8
- width: 640.8
- height: 454
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ y: 388.8
+ width: 591.2
+ height: 334
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 2}
m_Panes:
- {fileID: 2}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -538,18 +603,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 640.8
+ x: 591.2
y: 0
- width: 168.79999
+ width: 203.20001
height: 722.8
- m_MinSize: {x: 202, y: 221}
- m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 8}
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 9}
m_Panes:
- - {fileID: 8}
+ - {fileID: 9}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -569,9 +634,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 640.8
+ x: 591.2
y: 73.6
- width: 166.79999
+ width: 201.20001
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -582,7 +647,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 5697feff90e9feff9c1bffff4457ffff2458ffff825cffffc65dffff8e5effff6e5fffff5a60ffff9c66ffff3e79ffffacb9ffffeeb9fffff6b9ffff18baffff1abaffff32bbffff28bcffff08bdffffe8bdffffcebeffff7ac3fffffec6ffff58edffff0efbfffff876000016770000e6790000fe79000018de00001cde000070de00000e2401003c2501001c4c0100
+ m_ExpandedIDs: 50a6feff40b6feffcec1feffc6dffeffe424ffff409bffffa4b7ffffdaddffffd8e0ffff0efbffff58b600007cb600000ab7000094b700009eee000090ef00008ec80200
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -598,7 +663,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 7}
+ m_ClientGUIView: {fileID: 8}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -606,7 +671,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 2e41307eb01faed4e87abe86bae87f81
---- !u!114 &9
+--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -621,18 +686,18 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 809.6
+ x: 794.4
y: 0
- width: 347.20007
+ width: 362.40002
height: 722.8
m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000}
- m_ActualView: {fileID: 10}
+ m_ActualView: {fileID: 11}
m_Panes:
- - {fileID: 10}
+ - {fileID: 11}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -652,9 +717,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 809.60004
+ x: 794.4
y: 73.6
- width: 345.20007
+ width: 360.40002
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -673,22 +738,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - "Assets/\u52CD/\u573A\u666F"
+ - "Assets/\u52CD/\u9884\u5236\u4F53/\u969C\u788D\u7269"
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - "Assets/\u52CD/\u573A\u666F"
+ - "Assets/\u52CD/\u9884\u5236\u4F53/\u969C\u788D\u7269"
m_LastFoldersGridSize: -1
m_LastProjectPath: "C:\\Users\\13259\\Desktop\\\u8D5B\u9A6C"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 2c7b0000
- m_LastClickedID: 31532
- m_ExpandedIDs: 00000000f67a0000f87a0000fa7a0000fc7a0000fe7a0000007b0000027b0000
+ m_SelectedIDs: 4a7a0000
+ m_LastClickedID: 31306
+ m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -704,7 +769,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 9}
+ m_ClientGUIView: {fileID: 10}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -716,7 +781,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000f67a0000f87a0000fa7a0000fc7a0000fe7a0000007b0000027b0000
+ m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -741,9 +806,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 02d30000
- m_LastClickedInstanceID: 54018
- m_HadKeyboardFocusLastEvent: 1
+ m_SelectedInstanceIDs: 4eb60000
+ m_LastClickedInstanceID: 46670
+ m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: ee770000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -760,7 +825,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 9}
+ m_ClientGUIView: {fileID: 10}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -771,8 +836,8 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 142.40002
---- !u!114 &11
+ m_DirectoriesAreaWidth: 164
+--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -791,14 +856,14 @@ MonoBehaviour:
y: 0
width: 379.19995
height: 722.8
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 12}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_ActualView: {fileID: 13}
m_Panes:
- - {fileID: 12}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -832,7 +897,7 @@ MonoBehaviour:
m_CachedPref: -160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
- m_LastInspectedObjectInstanceID: 54018
+ m_LastInspectedObjectInstanceID: 46670
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
index c77a2ea..c57e525 100644
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1536
height: 772.8
m_ShowMode: 4
- m_Title: "\u6E38\u620F"
+ m_Title: "\u5C42\u7EA7"
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -121,7 +121,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
- controlID: 78
+ controlID: 20
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -141,12 +141,12 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 609.6
+ width: 488
height: 722.8
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
- controlID: 16
+ controlID: 115
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -164,15 +164,16 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 609.6
- height: 386.4
+ width: 488
+ height: 584
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 13}
+ m_ActualView: {fileID: 14}
m_Panes:
- - {fileID: 13}
+ - {fileID: 14}
+ - {fileID: 12}
m_Selected: 0
- m_LastSelected: 0
+ m_LastSelected: 1
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -189,14 +190,14 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
- y: 386.4
- width: 609.6
- height: 336.4
+ y: 584
+ width: 488
+ height: 138.79999
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 12}
+ m_ActualView: {fileID: 13}
m_Panes:
- - {fileID: 12}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &9
@@ -214,15 +215,15 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 609.6
+ x: 488
y: 0
- width: 376.80005
+ width: 276
height: 722.8
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
- m_ActualView: {fileID: 14}
+ m_ActualView: {fileID: 15}
m_Panes:
- - {fileID: 14}
+ - {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &10
@@ -240,15 +241,15 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 986.4
+ x: 764
y: 0
- width: 170.40002
+ width: 392.80005
height: 722.8
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
- m_ActualView: {fileID: 15}
+ m_ActualView: {fileID: 16}
m_Panes:
- - {fileID: 15}
+ - {fileID: 16}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &11
@@ -272,12 +273,76 @@ MonoBehaviour:
height: 722.8
m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 16}
+ m_ActualView: {fileID: 17}
m_Panes:
- - {fileID: 16}
+ - {fileID: 17}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &12
+MonoBehaviour:
+ m_ObjectHideFlags: 52
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_MinSize: {x: 100, y: 100}
+ m_MaxSize: {x: 4000, y: 4000}
+ m_TitleContent:
+ m_Text: "\u52A8\u753B\u5668"
+ m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0}
+ m_Tooltip:
+ m_Pos:
+ serializedVersion: 2
+ x: 0
+ y: 73.6
+ width: 487
+ height: 259
+ m_ViewDataDictionary: {fileID: 0}
+ m_OverlayCanvas:
+ m_LastAppliedPresetName: Default
+ m_SaveData: []
+ m_ViewTransforms:
+ m_KeySerializationHelper:
+ - {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_ValueSerializationHelper:
+ - e00: 0.98381555
+ e01: 0
+ e02: 0
+ e03: -100.0116
+ e10: 0
+ e11: 0.98381555
+ e12: 0
+ e13: 115.50764
+ e20: 0
+ e21: 0
+ e22: 1
+ e23: 0
+ e30: 0
+ e31: 0
+ e32: 0
+ e33: 1
+ m_PreviewAnimator: {fileID: 0}
+ m_AnimatorController: {fileID: 9100000, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_BreadCrumbs:
+ - m_Target: {fileID: -4858452638209796299, guid: 167c464036054f94aa70e6c7b4457afd, type: 2}
+ m_ScrollPosition: {x: 0, y: 0}
+ stateMachineGraph: {fileID: 0}
+ stateMachineGraphGUI: {fileID: 0}
+ blendTreeGraph: {fileID: 0}
+ blendTreeGraphGUI: {fileID: 0}
+ m_AutoLiveLink: 1
+ m_MiniTool: 0
+ m_LockTracker:
+ m_IsLocked: 0
+ m_CurrentEditor: 0
+ m_LayerEditor:
+ m_SelectedLayerIndex: 0
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -298,9 +363,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 460
- width: 608.6
- height: 315.4
+ y: 657.60004
+ width: 487
+ height: 117.79999
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -311,7 +376,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 654, y: 368}
+ m_TargetSize: {x: 215, y: 120.999985}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -326,10 +391,10 @@ MonoBehaviour:
m_VRangeLocked: 0
hZoomLockedByDefault: 0
vZoomLockedByDefault: 0
- m_HBaseRangeMin: -261.6
- m_HBaseRangeMax: 261.6
- m_VBaseRangeMin: -147.2
- m_VBaseRangeMax: 147.2
+ m_HBaseRangeMin: -86
+ m_HBaseRangeMax: 86
+ m_VBaseRangeMin: -48.399994
+ m_VBaseRangeMax: 48.399994
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -347,29 +412,29 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 608.6
- height: 294.4
+ width: 487
+ height: 96.79999
m_Scale: {x: 1, y: 1}
- m_Translation: {x: 304.3, y: 147.2}
+ m_Translation: {x: 243.5, y: 48.399994}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -304.3
- y: -147.2
- width: 608.6
- height: 294.4
+ x: -243.5
+ y: -48.399994
+ width: 487
+ height: 96.79999
m_MinimalGUI: 1
m_defaultScale: 1
- m_LastWindowPixelSize: {x: 760.75, y: 394.25}
+ m_LastWindowPixelSize: {x: 608.75, y: 147.24998}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
m_XRRenderMode: 0
m_RenderTexture: {fileID: 0}
---- !u!114 &13
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -391,8 +456,8 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 73.6
- width: 608.6
- height: 365.4
+ width: 487
+ height: 563
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@@ -403,7 +468,7 @@ MonoBehaviour:
collapsed: 0
displayed: 1
snapOffset: {x: 0, y: 0}
- snapOffsetDelta: {x: -100, y: -25.600006}
+ snapOffsetDelta: {x: -100, y: -25.599976}
snapCorner: 3
id: Tool Settings
index: 0
@@ -607,7 +672,7 @@ MonoBehaviour:
index: 10
layout: 4
m_WindowGUID: 932fa420110f25f488f2a7bbcd1fb02a
- m_Gizmos: 1
+ m_Gizmos: 0
m_OverrideSceneCullingMask: 6917529027641081856
m_SceneIsLit: 1
m_SceneLighting: 1
@@ -616,9 +681,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: -6.1093216, y: 0.54522, z: -0.19162053}
+ m_Target: {x: -16.314135, y: 1.2690217, z: 0.10704366}
speed: 2
- m_Value: {x: -6.1093216, y: 0.54522, z: -0.19162053}
+ m_Value: {x: -16.314135, y: 1.2690217, z: 0.10704366}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -669,9 +734,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
- m_Target: 7.219205
+ m_Target: 6.7788815
speed: 2
- m_Value: 7.219205
+ m_Value: 6.7788815
m_Ortho:
m_Target: 1
speed: 2
@@ -696,7 +761,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &14
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -716,9 +781,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 609.60004
+ x: 488
y: 73.6
- width: 374.80005
+ width: 274
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -726,10 +791,10 @@ MonoBehaviour:
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
- scrollPos: {x: 0, y: 87.20001}
- m_SelectedIDs: 7e790000
- m_LastClickedID: 31102
- m_ExpandedIDs: 00f4ffff0efbffff0e7700007a7900007e790000c6790000ce790000de790000
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: 0efbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -745,7 +810,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 7}
+ m_ClientGUIView: {fileID: 9}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
@@ -753,7 +818,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 2e41307eb01faed4e87abe86bae87f81
---- !u!114 &15
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -773,9 +838,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 986.4
+ x: 764
y: 73.6
- width: 168.40002
+ width: 390.80005
height: 701.8
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
@@ -794,22 +859,22 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/New Folder
+ - "Assets/\u52CD/\u811A\u672C"
m_Globs: []
m_OriginalText:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/New Folder
+ - "Assets/\u52CD/\u811A\u672C"
m_LastFoldersGridSize: -1
m_LastProjectPath: "C:\\Users\\13259\\Desktop\\\u8D5B\u9A6C"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 067b0000
- m_LastClickedID: 31494
- m_ExpandedIDs: 00000000d67a0000d87a0000da7a0000dc7a0000de7a0000e07a0000e27a0000
+ m_SelectedIDs: 4e7a0000
+ m_LastClickedID: 31310
+ m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000567a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -837,7 +902,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000d67a0000d87a0000da7a0000dc7a0000de7a0000e07a0000e27a0000
+ m_ExpandedIDs: 00000000087a00000a7a00000c7a00000e7a0000107a0000127a0000147a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -892,8 +957,8 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_SkipHiddenPackages: 0
- m_DirectoriesAreaWidth: 118.400024
---- !u!114 &16
+ m_DirectoriesAreaWidth: 164
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -928,7 +993,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 1350
+ m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker: