diff --git a/Assets/勍/场景/骨骼测试场景.unity b/Assets/勍/场景/骨骼测试场景.unity index d4b24de..40e30b8 100644 --- a/Assets/勍/场景/骨骼测试场景.unity +++ b/Assets/勍/场景/骨骼测试场景.unity @@ -364,7 +364,7 @@ GameObject: - component: {fileID: 875897231} m_Layer: 0 m_Name: "\u5730\u9762" - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -471,11 +471,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 7821055, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.6605224 + value: 0.6617732 objectReference: {fileID: 0} - target: {fileID: 7821055, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: 0.75080633 + value: 0.7497042 objectReference: {fileID: 0} - target: {fileID: 106631853, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_Size.x @@ -503,19 +503,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 566743904, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalPosition.x - value: 2.4512196 + value: 2.859808 objectReference: {fileID: 0} - target: {fileID: 566743904, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalPosition.y - value: 0.15380377 + value: 0.3580982 objectReference: {fileID: 0} - target: {fileID: 685472166, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.98932326 + value: 0.83943605 objectReference: {fileID: 0} - target: {fileID: 685472166, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: 0.14573832 + value: 0.54345846 objectReference: {fileID: 0} - target: {fileID: 719707977, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_Size.x @@ -525,22 +525,62 @@ PrefabInstance: propertyPath: m_Size.y value: 0.1 objectReference: {fileID: 0} + - target: {fileID: 905566467, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5982876 + objectReference: {fileID: 0} + - target: {fileID: 905566467, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.y + value: 0.01839298 + objectReference: {fileID: 0} - target: {fileID: 951836818, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.70312786 + value: 0.6012825 objectReference: {fileID: 0} - target: {fileID: 951836818, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: 0.7110635 + value: 0.7990366 objectReference: {fileID: 0} - target: {fileID: 1084903726, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_Mass value: 1 objectReference: {fileID: 0} + - target: {fileID: 1084903726, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_AngularDrag + value: 0.2 + objectReference: {fileID: 0} - target: {fileID: 1084903726, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_Constraints value: 0 objectReference: {fileID: 0} + - target: {fileID: 1084903726, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_GravityScale + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1219316749, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7656242 + objectReference: {fileID: 0} + - target: {fileID: 1219316749, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.z + value: 0.64328814 + objectReference: {fileID: 0} + - target: {fileID: 1804133629, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.x + value: -2.6643095 + objectReference: {fileID: 0} + - target: {fileID: 1804133629, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.y + value: -0.063942015 + objectReference: {fileID: 0} + - target: {fileID: 2110753430, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.x + value: 1.7506008 + objectReference: {fileID: 0} + - target: {fileID: 2110753430, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalPosition.y + value: 0.13396281 + objectReference: {fileID: 0} - target: {fileID: 50099845796739461, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_RootOrder value: 0 @@ -585,21 +625,29 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 447594391148734010, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9727827 + objectReference: {fileID: 0} + - target: {fileID: 447594391148734010, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.z + value: 0.23171942 + objectReference: {fileID: 0} - target: {fileID: 553410378564238167, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.7951422 + value: 0.7547532 objectReference: {fileID: 0} - target: {fileID: 553410378564238167, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: -0.6064231 + value: -0.65600896 objectReference: {fileID: 0} - target: {fileID: 758927187003403290, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.87740093 + value: 0.99075943 objectReference: {fileID: 0} - target: {fileID: 758927187003403290, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: 0.47975802 + value: 0.13563137 objectReference: {fileID: 0} - target: {fileID: 3283039325717014954, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w @@ -615,11 +663,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3613839984805260814, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.9690672 + value: 0.938889 objectReference: {fileID: 0} - target: {fileID: 3613839984805260814, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: -0.24679716 + value: -0.34422 objectReference: {fileID: 0} - target: {fileID: 4308434985386491136, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_AutoRebind @@ -633,29 +681,37 @@ PrefabInstance: propertyPath: m_Bounds.m_Center.y value: -1.36059 objectReference: {fileID: 0} + - target: {fileID: 4491597922211250125, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5917677 + objectReference: {fileID: 0} + - target: {fileID: 4491597922211250125, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: m_LocalRotation.z + value: -0.80610853 + objectReference: {fileID: 0} - target: {fileID: 5709595267743773255, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.6955986 + value: 0.7788419 objectReference: {fileID: 0} - target: {fileID: 5709595267743773255, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: -0.7184307 + value: -0.6272203 objectReference: {fileID: 0} - target: {fileID: 7553923325119000229, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.8226019 + value: 0.8770435 objectReference: {fileID: 0} - target: {fileID: 7553923325119000229, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: -0.56861776 + value: -0.480411 objectReference: {fileID: 0} - target: {fileID: 8522599996288171628, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.w - value: 0.9999842 + value: 0.9682588 objectReference: {fileID: 0} - target: {fileID: 8522599996288171628, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: m_LocalRotation.z - value: 0.0056177806 + value: -0.24994987 objectReference: {fileID: 0} - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: strength @@ -663,12 +719,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: footForce + value: 7.5 + objectReference: {fileID: 0} + - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: jumpForce value: 5 objectReference: {fileID: 0} - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: effectiveDistance value: 0.25 objectReference: {fileID: 0} + - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} + propertyPath: jumpChargeThreshold + value: 0.8 + objectReference: {fileID: 0} - target: {fileID: 8721403442329396673, guid: c63483674e2db904197c6beaca347645, type: 3} propertyPath: footOffestOfInput.Array.data[2].x value: 0 @@ -741,3 +805,48 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 433c80cc795427f43a06e42eab98aa3f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1802323196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1802323198} + - component: {fileID: 1802323197} + m_Layer: 0 + m_Name: DebugHelper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1802323197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802323196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8122d337274998444bf030d3989f9b9b, type: 3} + m_Name: + m_EditorClassIdentifier: + strength: 0 +--- !u!4 &1802323198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802323196} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.9691615, y: 1.0093685, z: -0.06356081} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/勍/脚本/DebugHelper.cs b/Assets/勍/脚本/DebugHelper.cs new file mode 100644 index 0000000..b640571 --- /dev/null +++ b/Assets/勍/脚本/DebugHelper.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Sirenix.OdinInspector; + +public class DebugHelper : MonoBehaviour +{ + [Header("给多大的力")] + public float strength; + + void Update() + { + // 按下上方向键给马刚体一个右上角的力 + if(Input.GetKeyDown(KeyCode.UpArrow)) + { + Debug.Log("Up"); + GameObject.Find("马").GetComponent().AddForce(new Vector2(1,1) * strength,ForceMode2D.Impulse); + } + + // 按下R重启场景 + if(Input.GetKeyDown(KeyCode.R)) + { + Debug.Log("R"); + UnityEngine.SceneManagement.SceneManager.LoadScene(0); + } + } +} diff --git a/Assets/勍/脚本/DebugHelper.cs.meta b/Assets/勍/脚本/DebugHelper.cs.meta new file mode 100644 index 0000000..5c6420f --- /dev/null +++ b/Assets/勍/脚本/DebugHelper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8122d337274998444bf030d3989f9b9b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/勍/脚本/Horse.cs b/Assets/勍/脚本/Horse.cs index cd94533..5f4d391 100644 --- a/Assets/勍/脚本/Horse.cs +++ b/Assets/勍/脚本/Horse.cs @@ -75,6 +75,30 @@ public class Horse : MonoBehaviour [BoxGroup("马的基本运动信息")][Header("马蹄供力有效范围")] public float effectiveDistance; + public enum FootType { Front, Back } + + /// + /// 马状态，Stand代表无输入，Move为有输入着地行走，Jump为跳跃，当两对足均并拢时进入 + /// + public enum HorseState { Stand, Move, Jump} + + /// + /// 单次跳跃过程中的状态量,Ready表示还没开始累计最终力，Charge表示已经开始蓄力，jump表示已经触发跳跃 + /// + public enum JumpState { Ready, Charging, Jump } + + /// + /// 跳跃判定阈值，只有输入的变化大于该值才会触发跳跃的蓄力 + /// + [BoxGroup("马的基本运动信息")][Header("马跳跃蓄力阈值")] + public float jumpChargeThreshold; + + /// + /// 马跳跃力度 + /// + [BoxGroup("马的基本运动信息")][Header("马跳跃力度")] + public float jumpForce; + @@ -156,6 +180,16 @@ public class Horse : MonoBehaviour /// private Vector2 inputBackVector; + /// + /// 前一帧的前马脚输入向量 + /// + private Vector2 previousInputFrontVector; + + /// + /// 前一帧的后马脚输入向量 + /// + private Vector2 previousInputBackVector; + /// /// 原重力尺度，在Start中通过随意一条腿的刚体获取 @@ -172,6 +206,36 @@ public class Horse : MonoBehaviour /// private Rigidbody2D horseRig; + /// + /// 四条腿分别对输入偏差多少,但是是原始值，不会改变，用于还原并拢的脚 + /// + private Vector2[] oriFootOffestOfInput; + + /// + /// 马此时的状态 + /// + private HorseState horseState; + + /// + /// 此时前腿并拢着吗？ + /// + private bool isFrontFootMerged = false; + + /// + /// 此时后腿并拢着吗？ + /// + private bool isBackFootMerged = false; + + /// + /// 此时的跳跃状态 + /// + private JumpState jumpState = JumpState.Ready; + + /// + /// 跳跃蓄力的速度 + /// + private Vector2 jumpChargeVelocity; + void Start() { @@ -185,14 +249,106 @@ public class Horse : MonoBehaviour void Update() { + //更新一些数据 + UpdateDataEarly(); //计算马脚目标位置 CaculateTargetPosition(); //让马脚朝着目标移动 MoveFoot(); //让马整体运动 MoveHorse(); + //跳跃检测和物理实现 + if(horseState == HorseState.Jump) CheckJump(); //更新一些数据 - UpdateData(); + UpdateDataLate(); + } + + private void Jump() + { + jumpState = JumpState.Jump; + Vector2 jumpVelocity = jumpChargeVelocity * jumpForce * -1 * new Vector2(1.5f,1.5f); + if(jumpVelocity.magnitude > 30f) jumpVelocity *= 0.1f; + + Debug.Log("Jump Velocity: " + jumpVelocity); + horseRig.velocity += jumpVelocity; + jumpChargeVelocity = Vector2.zero; + } + + + /// + /// 在跳跃状态时每帧执行，用于检测跳跃和实现跳跃的物理 + /// + private void CheckJump() + { + //通过本帧输入向量减上一帧输入向量得到一个瞬时速度 + Vector2 frontInstantaneousSpeed = inputFrontVector - previousInputFrontVector; + Vector2 backInstantaneousSpeed = inputBackVector - previousInputBackVector; + //如果任意一组的y大于0，说明在上升，不考虑它的跳跃 + if(frontInstantaneousSpeed.y > 0 || backInstantaneousSpeed.y > 0) return; + else + { + //此时双腿在下降，开始检测跳跃蓄力 + //首先看前后腿输入变化的瞬时速度的模长和是否大于蓄力标准 + if(frontInstantaneousSpeed.magnitude + backInstantaneousSpeed.magnitude > jumpChargeThreshold) + { + //若输入的瞬时速度大于蓄力标准时，看马的跳跃状态，若处于准备态，则转移至蓄力态 + if(jumpState == JumpState.Ready) jumpState = JumpState.Charging; + //若已处于蓄力态，累计力大小 + if(jumpState == JumpState.Charging) + { + jumpChargeVelocity += (frontInstantaneousSpeed + backInstantaneousSpeed); + } + } + else + { + //若输入的瞬时速度小于蓄力标准时，看马的跳跃状态，若处于蓄力态，则触发跳跃 + if(jumpState == JumpState.Charging) Jump(); + } + } + + } + + + + + /// + /// 在Update之前更新一些数据 + /// + private void UpdateDataEarly() + { + //判断是否两腿均并拢，若是，进入跳跃状态，否则设置为Stand状态 + if (isFrontFootMerged && isBackFootMerged) horseState = HorseState.Jump; + else horseState = HorseState.Stand; + + Debug.Log("jumpState = " + jumpState); + + } + + + + /// + /// 使马并拢输入的双腿， + /// + public void MergeFoot(FootType type) + { + //根据输入的组类型，判断需要更改偏移值的是那一个索引下的脚 + int index = type == FootType.Front ? 1 : 3; + footOffestOfInput[index] = Vector2.zero; + if(type == FootType.Front) isFrontFootMerged = true; + else isBackFootMerged = true; + } + + /// + /// 恢复输入的并拢的双腿至有偏移状态 + /// + /// 需要恢复的是哪一组腿 + public void RecoverFoot(FootType type) + { + //根据输入的组类型，判断需要更改偏移值的是那一个索引下的脚 + int index = type == FootType.Front ? 1 : 3; + footOffestOfInput[index] = oriFootOffestOfInput[index]; + if(type == FootType.Front) isFrontFootMerged = false; + else isBackFootMerged = false; } /// @@ -241,7 +397,7 @@ public class Horse : MonoBehaviour //减弱y轴的影响，不要让马在平地上起飞 v *= new Vector2(1,0.2f); - Debug.Log(v); + // Debug.Log(v); //如果模长超过5，那必是触发了什么逆天Bug，会导致马起飞，需要避免这些错误 if(v.magnitude > 10f) v = Vector2.zero; @@ -250,18 +406,25 @@ public class Horse : MonoBehaviour horseRig.velocity += v; } - private void UpdateData() + private void UpdateDataLate() { //更新四足的上帧位置 for(int i = 0; i < 4; i++) foots[i].footPreviousPosition = foots[i].footRealTransform.position; + + //更新上帧输入 + previousInputFrontVector = inputFrontVector; + previousInputBackVector = inputBackVector; } void Init() { foots = new foot[4]; + oriFootOffestOfInput = new Vector2[4]; footBoxColliders = new BoxCollider2D[4]; for(int i = 0; i < 4; i++) foots[i].footPreviousPosition = transform.position; + for(int i = 0; i < 4; i++) oriFootOffestOfInput[i] = footOffestOfInput[i]; + horseState = HorseState.Stand; } @@ -392,5 +555,15 @@ public class Horse : MonoBehaviour public void SetInputBackVector(Vector2 input) => inputBackVector = input; + + //撞击地面后，修改跳跃状态 + void OnCollisionEnter2D(Collision2D collision) + { + if(collision.gameObject.tag == "Ground") + { + jumpState = JumpState.Ready; + } + } + } diff --git a/Assets/勍/脚本/Player.cs b/Assets/勍/脚本/Player.cs index d953b63..4ec8b49 100644 --- a/Assets/勍/脚本/Player.cs +++ b/Assets/勍/脚本/Player.cs @@ -29,11 +29,19 @@ public class Player : MonoBehaviour private void InputBinding() { + //新建了一个操控类的实例，小心多个操控类实例的坑！这个东西不会自动销毁 playerC = new PlayerC(); + //绑定基本移动相关的事件 playerC.GamePlay.MoveFrontFoot.performed += ctx => horse.SetInputFrontVector(ctx.ReadValue()); playerC.GamePlay.MoveBackFoot.performed += ctx => horse.SetInputBackVector(ctx.ReadValue()); playerC.GamePlay.MoveFrontFoot.canceled += ctx => horse.SetInputFrontVector(Vector2.zero); playerC.GamePlay.MoveBackFoot.canceled += ctx => horse.SetInputBackVector(Vector2.zero); + //绑定并拢腿的相关事件 + playerC.GamePlay.MergeBackFoot.started += ctx => horse.MergeFoot(Horse.FootType.Back); + playerC.GamePlay.MergeBackFoot.canceled += ctx => horse.RecoverFoot(Horse.FootType.Back); + playerC.GamePlay.MergeFrontFoot.started += ctx => horse.MergeFoot(Horse.FootType.Front); + playerC.GamePlay.MergeFrontFoot.canceled += ctx => horse.RecoverFoot(Horse.FootType.Front); + playerC.GamePlay.Enable(); } diff --git a/Assets/勍/输入映射/PlayerC.cs b/Assets/勍/输入映射/PlayerC.cs index 6439837..19341f6 100644 --- a/Assets/勍/输入映射/PlayerC.cs +++ b/Assets/勍/输入映射/PlayerC.cs @@ -44,6 +44,24 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": true + }, + { + ""name"": ""MergeBackFoot"", + ""type"": ""Button"", + ""id"": ""8288e092-59fe-4ec2-8cf0-6405751e4d50"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, + { + ""name"": ""MergeFrontFoot"", + ""type"": ""Button"", + ""id"": ""dff57601-4077-445d-880b-15d1f6794338"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -266,6 +284,50 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable ""action"": ""MoveFrontFoot"", ""isComposite"": false, ""isPartOfComposite"": true + }, + { + ""name"": """", + ""id"": ""6473b7f1-d103-4c52-83b5-111733afdc6d"", + ""path"": ""/leftShoulder"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""MergeBackFoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""98454c00-038e-4008-91b0-21098bc7423c"", + ""path"": ""/shift"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""MergeBackFoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""ec93b4c2-ff5d-4c0f-bcf7-ea1788cabb6f"", + ""path"": ""/rightShoulder"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""GamePlay"", + ""action"": ""MergeFrontFoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""615c7cea-f9d0-458c-a7e1-04a9ee39a068"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""GamePlay"", + ""action"": ""MergeFrontFoot"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -293,6 +355,8 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable m_GamePlay = asset.FindActionMap("GamePlay", throwIfNotFound: true); m_GamePlay_MoveBackFoot = m_GamePlay.FindAction("MoveBackFoot", throwIfNotFound: true); m_GamePlay_MoveFrontFoot = m_GamePlay.FindAction("MoveFrontFoot", throwIfNotFound: true); + m_GamePlay_MergeBackFoot = m_GamePlay.FindAction("MergeBackFoot", throwIfNotFound: true); + m_GamePlay_MergeFrontFoot = m_GamePlay.FindAction("MergeFrontFoot", throwIfNotFound: true); } public void Dispose() @@ -354,12 +418,16 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable private IGamePlayActions m_GamePlayActionsCallbackInterface; private readonly InputAction m_GamePlay_MoveBackFoot; private readonly InputAction m_GamePlay_MoveFrontFoot; + private readonly InputAction m_GamePlay_MergeBackFoot; + private readonly InputAction m_GamePlay_MergeFrontFoot; public struct GamePlayActions { private @PlayerC m_Wrapper; public GamePlayActions(@PlayerC wrapper) { m_Wrapper = wrapper; } public InputAction @MoveBackFoot => m_Wrapper.m_GamePlay_MoveBackFoot; public InputAction @MoveFrontFoot => m_Wrapper.m_GamePlay_MoveFrontFoot; + public InputAction @MergeBackFoot => m_Wrapper.m_GamePlay_MergeBackFoot; + public InputAction @MergeFrontFoot => m_Wrapper.m_GamePlay_MergeFrontFoot; public InputActionMap Get() { return m_Wrapper.m_GamePlay; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -375,6 +443,12 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable @MoveFrontFoot.started -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMoveFrontFoot; @MoveFrontFoot.performed -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMoveFrontFoot; @MoveFrontFoot.canceled -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMoveFrontFoot; + @MergeBackFoot.started -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeBackFoot; + @MergeBackFoot.performed -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeBackFoot; + @MergeBackFoot.canceled -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeBackFoot; + @MergeFrontFoot.started -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeFrontFoot; + @MergeFrontFoot.performed -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeFrontFoot; + @MergeFrontFoot.canceled -= m_Wrapper.m_GamePlayActionsCallbackInterface.OnMergeFrontFoot; } m_Wrapper.m_GamePlayActionsCallbackInterface = instance; if (instance != null) @@ -385,6 +459,12 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable @MoveFrontFoot.started += instance.OnMoveFrontFoot; @MoveFrontFoot.performed += instance.OnMoveFrontFoot; @MoveFrontFoot.canceled += instance.OnMoveFrontFoot; + @MergeBackFoot.started += instance.OnMergeBackFoot; + @MergeBackFoot.performed += instance.OnMergeBackFoot; + @MergeBackFoot.canceled += instance.OnMergeBackFoot; + @MergeFrontFoot.started += instance.OnMergeFrontFoot; + @MergeFrontFoot.performed += instance.OnMergeFrontFoot; + @MergeFrontFoot.canceled += instance.OnMergeFrontFoot; } } } @@ -402,5 +482,7 @@ public partial class @PlayerC : IInputActionCollection2, IDisposable { void OnMoveBackFoot(InputAction.CallbackContext context); void OnMoveFrontFoot(InputAction.CallbackContext context); + void OnMergeBackFoot(InputAction.CallbackContext context); + void OnMergeFrontFoot(InputAction.CallbackContext context); } } diff --git a/Assets/勍/输入映射/PlayerC.inputactions b/Assets/勍/输入映射/PlayerC.inputactions index 9df0d65..1875e68 100644 --- a/Assets/勍/输入映射/PlayerC.inputactions +++ b/Assets/勍/输入映射/PlayerC.inputactions @@ -22,6 +22,24 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "MergeBackFoot", + "type": "Button", + "id": "8288e092-59fe-4ec2-8cf0-6405751e4d50", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "MergeFrontFoot", + "type": "Button", + "id": "dff57601-4077-445d-880b-15d1f6794338", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -244,6 +262,50 @@ "action": "MoveFrontFoot", "isComposite": false, "isPartOfComposite": true + }, + { + "name": "", + "id": "6473b7f1-d103-4c52-83b5-111733afdc6d", + "path": "/leftShoulder", + "interactions": "", + "processors": "", + "groups": "", + "action": "MergeBackFoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "98454c00-038e-4008-91b0-21098bc7423c", + "path": "/shift", + "interactions": "", + "processors": "", + "groups": "", + "action": "MergeBackFoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "ec93b4c2-ff5d-4c0f-bcf7-ea1788cabb6f", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": "GamePlay", + "action": "MergeFrontFoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "615c7cea-f9d0-458c-a7e1-04a9ee39a068", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "GamePlay", + "action": "MergeFrontFoot", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..e02ae33 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/BurstAotSettings_WSAPlayer.json b/ProjectSettings/BurstAotSettings_WSAPlayer.json new file mode 100644 index 0000000..64de35e --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WSAPlayer.json @@ -0,0 +1,16 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d5a917a..422b610 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -163,7 +163,8 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.------ buildNumber: Standalone: 0 iPhone: 0 @@ -562,8 +563,8 @@ PlayerSettings: apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 - metroPackageName: 2D_URP - metroPackageVersion: + metroPackageName: 2DURP + metroPackageVersion: 1.0.0.0 metroCertificatePath: metroCertificatePassword: metroCertificateSubject: @@ -571,7 +572,7 @@ PlayerSettings: metroCertificateNotAfter: 0000000000000000 metroApplicationDescription: 2D_URP wsaImages: {} - metroTileShortName: + metroTileShortName: "\u8D5B\u9A6C" metroTileShowName: 0 metroMediumTileShowName: 0 metroLargeTileShowName: 0 @@ -630,7 +631,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 2 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 7c426cd..61d7cf5 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Ground layers: - Default - TransparentFX diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt new file mode 100644 index 0000000..02ed895 --- /dev/null +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -0,0 +1,841 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 7} + - {fileID: 9} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 722.8 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 310 +--- !u!114 &2 +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: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u573A\u666F" + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 73.6 + width: 634.2 + height: 558.2 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -100, y: -25.599976} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 3 + layout: 4 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + m_WindowGUID: 932fa420110f25f488f2a7bbcd1fb02a + m_Gizmos: 1 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 22.567099, y: 7.2557883, z: -0.38658428} + speed: 2 + m_Value: {x: 22.567099, y: 7.2557883, z: -0.38658428} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_ExposureSliderValue: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 34.807396 + speed: 2 + m_Value: 34.807396 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.01 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &3 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 5} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 635.2 + height: 722.8 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 311 +--- !u!114 &4 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 635.2 + height: 579.2 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 2} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 579.2 + width: 635.2 + height: 143.59998 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + m_Selected: 0 + m_LastSelected: 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: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u6E38\u620F" + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 652.8 + width: 634.2 + height: 122.599976 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 226, y: 126.99997} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -90.4 + m_HBaseRangeMax: 90.4 + m_VBaseRangeMin: -50.799988 + m_VBaseRangeMax: 50.799988 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 634.2 + height: 101.599976 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 317.1, y: 50.799988} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -317.1 + y: -50.799988 + width: 634.2 + height: 101.599976 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 792.75, y: 153.24997} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &7 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 635.2 + y: 0 + width: 249.59998 + height: 722.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 8} + m_Panes: + - {fileID: 8} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &8 +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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 635.2 + y: 73.6 + width: 247.59998 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 0efbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 7} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 2e41307eb01faed4e87abe86bae87f81 +--- !u!114 &9 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 884.8 + y: 0 + width: 308.00006 + height: 722.8 + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 10} + m_Panes: + - {fileID: 10} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &10 +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: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 884.8 + y: 73.6 + width: 306.00006 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" + 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: c4770000 + m_LastClickedID: 30660 + m_ExpandedIDs: 00000000987700009a7700009c7700009e770000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000987700009a7700009c7700009e770000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 9} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 133 +--- !u!114 &11 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1192.8 + y: 0 + width: 343.19995 + height: 722.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + 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: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1192.8 + y: 73.6 + width: 342.19995 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 2a9ae18..562f303 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -38,8 +38,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 4} - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -75,33 +75,6 @@ MonoBehaviour: m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: --- !u!114 &4 -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: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 7} - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1536 - height: 722.8 - m_MinSize: {x: 400, y: 200} - m_MaxSize: {x: 32384, y: 16192} - vertical: 0 - controlID: 111 ---- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -122,6 +95,33 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} +--- !u!114 &5 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 9} + - {fileID: 10} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 722.8 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 454 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -135,8 +135,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 11} + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -146,8 +146,60 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 112 + controlID: 455 --- !u!114 &7 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: SceneView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 635.2 + height: 515.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &8 +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: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 515.2 + width: 635.2 + height: 207.59998 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -168,12 +220,12 @@ MonoBehaviour: height: 722.8 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 12} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &8 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -194,12 +246,12 @@ MonoBehaviour: height: 722.8 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -220,394 +272,12 @@ MonoBehaviour: height: 722.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &10 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 635.2 - height: 300.8 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 -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: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 300.8 - width: 635.2 - height: 422 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - 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: 1 - m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: "\u5C42\u7EA7" - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 635.2 - y: 73.6 - width: 247.59998 - height: 701.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SceneHierarchy: - m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 60760000 - m_LastClickedID: 30304 - m_ExpandedIDs: 5efaffff66faffff6efaffff76faffff92faffff0efbffff6e7600007e760000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 7} - m_SearchString: - m_ExpandedScenes: [] - m_CurrenRootInstanceID: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentSortingName: TransformSorting - m_WindowGUID: 2e41307eb01faed4e87abe86bae87f81 ---- !u!114 &13 -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: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: "\u68C0\u67E5\u5668" - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1192.8 - y: 73.6 - width: 342.19995 - height: 701.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0} ---- !u!114 &14 -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: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: "\u9879\u76EE" - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 884.8 - y: 73.6 - width: 306.00006 - height: 701.8 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" - 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: d8770000 - m_LastClickedID: 30680 - m_ExpandedIDs: 00000000a4770000a6770000a8770000aa770000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000a4770000a6770000a8770000aa770000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 8} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 133 ---- !u!114 &15 -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: 1 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: "\u6E38\u620F" - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 374.4 - width: 634.2 - height: 401 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 792.75, y: 446} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -317.1 - m_HBaseRangeMax: 317.1 - m_VBaseRangeMin: -178.40001 - m_VBaseRangeMax: 178.40001 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 634.2 - height: 380 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 317.1, y: 190} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -317.1 - y: -190 - width: 634.2 - height: 380 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 792.75, y: 501.25} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 00000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -630,7 +300,7 @@ MonoBehaviour: x: 0 y: 73.6 width: 634.2 - height: 279.8 + height: 494.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -854,9 +524,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 8.581671, y: 1.2368927, z: 0.09554357} + m_Target: {x: 22.567099, y: 7.2557883, z: -0.38658428} speed: 2 - m_Value: {x: 8.581671, y: 1.2368927, z: 0.09554357} + m_Value: {x: 22.567099, y: 7.2557883, z: -0.38658428} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -907,9 +577,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.847269 + m_Target: 34.807396 speed: 2 - m_Value: 9.847269 + m_Value: 34.807396 m_Ortho: m_Target: 1 speed: 2 @@ -934,3 +604,333 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 +--- !u!114 &13 +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: 1 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u6E38\u620F" + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 588.8 + width: 634.2 + height: 186.59998 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 368, y: 206.99997} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -147.2 + m_HBaseRangeMax: 147.2 + m_VBaseRangeMin: -82.79999 + m_VBaseRangeMax: 82.79999 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 634.2 + height: 165.59998 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 317.1, y: 82.79999} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -317.1 + y: -82.79999 + width: 634.2 + height: 165.59998 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 792.75, y: 233.24997} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &14 +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: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u5C42\u7EA7" + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 635.2 + y: 73.6 + width: 247.59998 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 0efbffff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 9} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 2e41307eb01faed4e87abe86bae87f81 +--- !u!114 &15 +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: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: "\u9879\u76EE" + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 884.8 + y: 73.6 + width: 306.00006 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - "Assets/\u52CD/\u7269\u7406\u6750\u8D28" + 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: c4770000 + m_LastClickedID: 30660 + m_ExpandedIDs: 00000000987700009a7700009c7700009e770000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000987700009a7700009c7700009e770000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 133 +--- !u!114 &16 +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: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: "\u68C0\u67E5\u5668" + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1192.8 + y: 73.6 + width: 342.19995 + height: 701.8 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: -160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000..299c246 --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": ["Temp/", "External/"], + "options": { + "types": true, + "properties": false, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfe..fbd9515 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,64 @@ -{} \ No newline at end of file +trackSelection = true +fetchPreview = true +wantsMore = false +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + adb = { + active = false + priority = 2500 + defaultAction = null + } + asset = { + active = true + priority = 25 + defaultAction = null + } + store = { + active = true + priority = 100 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + packages = { + active = true + priority = 90 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +expandedQueries = [ +] +queryBuilder = false +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" \ No newline at end of file