qianzhuqing 3 年之前
父节点
当前提交
7c4acc0e68

二进制
Assets/GameMain/DataTables/CustomBody.txt


+ 7 - 0
Assets/GameMain/DataTables/CustomBody.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b0ca33e6a02931a4e8e660d8a861a2b3
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Assets/GameMain/Localization/ChineseSimplified/Dictionaries/Default.xml

@@ -25,5 +25,7 @@
     <String Key="Setting.UISound" Value="界面音效" />
     <String Key="Setting.Language" Value="语言" />
     <String Key="Setting.LanguageTips" Value="更改语言需要重启游戏" />
+    <String Key="Reset" Value="重置" />
+    <String Key="CurModify" Value="点击右边选择一项修改" />
   </Dictionary>
 </Dictionaries>

+ 202 - 0
Assets/GameMain/Scenes/CustomRole.unity

@@ -652,6 +652,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7c3559daf63a51d44965d9864233a269, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Chest: []
+  UpperArmUp: []
+  UpperArmDown: []
+  UpperLegUp: []
+  UpperLegDown: []
+  LowerLegUp: []
+  LowerLegDown: []
 --- !u!1 &461674368
 GameObject:
   m_ObjectHideFlags: 0
@@ -901,6 +908,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7c3559daf63a51d44965d9864233a269, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Chest: []
+  UpperArmUp: []
+  UpperArmDown: []
+  UpperLegUp: []
+  UpperLegDown: []
+  LowerLegUp: []
+  LowerLegDown: []
 --- !u!4 &944447064 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6863600431025939355, guid: a83bf52c2391bc247be837a410a359b3,
@@ -985,6 +999,16 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: c2825d2c1b851744691862abc76c2ecc, type: 2}
+    - target: {fileID: 5866666021909216657, guid: 1af50795f5cfada4f88a13671ba266a1,
+        type: 3}
+      propertyPath: m_ApplyRootMotion
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7483789912442921702, guid: 1af50795f5cfada4f88a13671ba266a1,
+        type: 3}
+      propertyPath: m_UpdateWhenOffscreen
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7483789912442921702, guid: 1af50795f5cfada4f88a13671ba266a1,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -1085,6 +1109,83 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7c3559daf63a51d44965d9864233a269, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Chest:
+  - {fileID: 1087840215}
+  - {fileID: 1087840214}
+  UpperArmUp: []
+  UpperArmDown: []
+  UpperLegUp:
+  - {fileID: 1087840213}
+  - {fileID: 1087840212}
+  UpperLegDown:
+  - {fileID: 1087840211}
+  - {fileID: 1087840210}
+  LowerLegUp:
+  - {fileID: 1087840209}
+  - {fileID: 1087840208}
+  LowerLegDown:
+  - {fileID: 1087840207}
+  - {fileID: 1087840206}
+--- !u!4 &1087840206 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -6594135349356385827, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840207 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5540880601891008848, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840208 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4074698504923940769, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840209 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8006841102329058293, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840210 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5619264037979462020, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840211 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2886157410157165574, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840212 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4545331875172179139, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840213 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1241508450722594044, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840214 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5418009751611583249, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1087840215 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7976887068377323859, guid: 1af50795f5cfada4f88a13671ba266a1,
+    type: 3}
+  m_PrefabInstance: {fileID: 1087840203}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1124385602 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -5030409034257756646, guid: a83bf52c2391bc247be837a410a359b3,
@@ -1212,6 +1313,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7c3559daf63a51d44965d9864233a269, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Chest: []
+  UpperArmUp: []
+  UpperArmDown: []
+  UpperLegUp: []
+  UpperLegDown: []
+  LowerLegUp: []
+  LowerLegDown: []
 --- !u!1 &1300160357
 GameObject:
   m_ObjectHideFlags: 0
@@ -1304,6 +1412,100 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1425817754
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1425817758}
+  - component: {fileID: 1425817757}
+  - component: {fileID: 1425817756}
+  - component: {fileID: 1425817755}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!64 &1425817755
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425817754}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1425817756
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425817754}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &1425817757
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425817754}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &1425817758
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425817754}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.28167272, y: -1.36, z: -0.0041262507}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &1491612860 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 3252194131456232172, guid: a83bf52c2391bc247be837a410a359b3,

+ 6 - 0
Assets/GameMain/Scripts/Entity/EntityData/RoleCustomBoneData.cs

@@ -8,11 +8,17 @@ namespace MetaClient
     {
         public Dictionary<int, PartData> bodyList;
         public Dictionary<int, PartData> faceList;
+        public Dictionary<string, Vector3> orginLocalScaleList;
+        public Dictionary<string, Vector3> orginLocalPositionList;
+        public Dictionary<string, Quaternion> orginLocalRotationList;
 
         public RoleCustomData ()
         {
             bodyList = new Dictionary<int, PartData>();
             faceList = new Dictionary<int, PartData>();
+            orginLocalScaleList = new Dictionary<string, Vector3>();
+            orginLocalPositionList = new Dictionary<string, Vector3>();
+            orginLocalRotationList = new Dictionary<string, Quaternion>();
         }
     }
 

+ 58 - 3
Assets/GameMain/Scripts/Game/CustomRole/CustomManager.cs

@@ -24,15 +24,27 @@ namespace MetaClient
         {
             GameEntry.Event.Subscribe(CustomRoleBodyEventArgs.EventId, UpdateBody);
 
+            testPlayer = GameObject.Find("biaozhunnv").GetComponent<CustomRoleController>();
+
             bodyData = new RoleCustomData();
             for (int i = 0; i < 6; i++)
             {
                 bodyData.bodyList.Add(i, new PartData((EditableBodyPart)i, ModifyType.LengthWidthThick));
             }
 
-            //CustomRoleUtility.ShowFile();
-
-            testPlayer = GameObject.Find("biaozhunnv").GetComponent<CustomRoleController>();
+            //初始缩放
+            testPlayer.GetNormalAniBonesScale(ref bodyData.orginLocalScaleList);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.Chest);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperArmUp);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperArmDown);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperLegUp);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.UpperLegDown);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.LowerLegUp);
+            testPlayer.GetExtraAniBonesScale(ref bodyData.orginLocalScaleList, EditableBodyPart.LowerLegDown);
+            //初始位置
+            testPlayer.GetExtraAniBonesPosition(ref bodyData.orginLocalPositionList, EditableBodyPart.Chest);
+            //初始旋转
+            testPlayer.GetExtraAniBonesRotate(ref bodyData.orginLocalRotationList, EditableBodyPart.Chest);
         }
 
         public void Clear()
@@ -57,5 +69,48 @@ namespace MetaClient
         {
             return 0.5f + (bodyData.bodyList[(int)part].floatValue - 1) / valueFloating;
         }
+        /// <summary>
+        /// 重置角色数据
+        /// </summary>
+        public void ResetRole()
+        {
+            if(testPlayer == null)
+            {
+                Debug.LogError("没有模型存在");
+                return;
+            }
+            Debug.Log("重置模型");
+
+            foreach (var item in bodyData.bodyList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                value.floatValue = 1;
+            }
+
+            //重置缩放
+            foreach (var item in bodyData.orginLocalScaleList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                testPlayer.SetBoneScale(key, value);
+            }
+
+            //重置旋转
+            foreach (var item in bodyData.orginLocalRotationList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                testPlayer.SetBoneRot(key, value);
+            }
+
+            //重置位置
+            foreach (var item in bodyData.orginLocalPositionList)
+            {
+                var key = item.Key;
+                var value = item.Value;
+                testPlayer.SetBonePos(key, value);
+            }
+        }
     }
 }

+ 125 - 16
Assets/GameMain/Scripts/Game/CustomRole/CustomRoleController.cs

@@ -6,15 +6,35 @@ using UnityEngine;
 public class CustomRoleController : MonoBehaviour
 {
     private Animator ani;
+    private SkinnedMeshRenderer body;
+
+    public Transform[] Chest;
+    public Transform[] UpperArmUp;
+    public Transform[] UpperArmDown;
+    public Transform[] UpperLegUp;
+    public Transform[] UpperLegDown;
+    public Transform[] LowerLegUp;
+    public Transform[] LowerLegDown;
 
     private void Start()
     {
         ani = GetComponent<Animator>();
+        body = GetComponentInChildren<SkinnedMeshRenderer>();
         var t1 = ani.GetBoneTransform(HumanBodyBones.LeftHand);
         var t2 = ani.GetBoneTransform(HumanBodyBones.LeftFoot);
+    }
 
-        Debug.Log(t1.name + " " + t1.position);
-        Debug.Log(t2.name + " " + t2.position);
+    private void Update()
+    {
+        UpdatePos();
+    }
+
+    private void UpdatePos()
+    {
+        var t = body.bounds.min;
+        var offset = t.y - (-1.36f);
+        var y = transform.position.y - offset;
+        transform.SetPositionY(y * 0.2f + transform.position.y * 0.8f);
     }
 
     public void UpdateBoneScale(EditableBodyPart part,float value)
@@ -25,22 +45,8 @@ public class CustomRoleController : MonoBehaviour
     public List<Transform> GetBonesTrans()
     {
         var bonesTrans = new List<Transform>();
-        //foreach (var item in Enum.GetValues(typeof(HumanBodyBones)))
-        //{
-        //    if(item == null)
-        //    {
-        //        continue;
-        //    }
-        //    var trans = ani.GetBoneTransform((HumanBodyBones)item);
-        //    if(trans)
-        //    {
-        //        bonesTrans.Add(trans);
-        //    }
-        //}
-        Debug.Log(Enum.GetValues(typeof(HumanBodyBones)).Length);
         for (int i = 0; i < Enum.GetValues(typeof(HumanBodyBones)).Length - 1; i++)
         {
-            Debug.Log((HumanBodyBones)i + "  " + i);
             var trans = ani.GetBoneTransform((HumanBodyBones)i);
             if (trans)
             {
@@ -50,4 +56,107 @@ public class CustomRoleController : MonoBehaviour
 
         return bonesTrans;
     }
+
+    public void GetNormalAniBonesScale(ref Dictionary<string, Vector3> boneDic)
+    {
+        CustomRoleUtility.GetNormalAniBonesScale(ani,ref boneDic);
+    }
+
+    private Transform[] GetExtraAniBonesTrans(EditableBodyPart extraPart)
+    {
+        Transform[] targetTrans = null;
+        switch (extraPart)
+        {
+            case EditableBodyPart.Chest:
+                targetTrans = Chest;
+                break;
+            case EditableBodyPart.UpperArmUp:
+                targetTrans = UpperArmUp;
+                break;
+            case EditableBodyPart.UpperArmDown:
+                targetTrans = UpperArmDown;
+                break;
+            case EditableBodyPart.UpperLegUp:
+                targetTrans = UpperLegUp;
+                break;
+            case EditableBodyPart.UpperLegDown:
+                targetTrans = UpperLegDown;
+                break;
+            case EditableBodyPart.LowerLegUp:
+                targetTrans = LowerLegUp;
+                break;
+            case EditableBodyPart.LowerLegDown:
+                targetTrans = LowerLegDown;
+                break;
+            default:
+                break;
+        }
+        return targetTrans;
+    }
+
+    public void GetExtraAniBonesScale(ref Dictionary<string, Vector3> boneDic,EditableBodyPart extraPart)
+    {
+        Transform[] targetTrans = GetExtraAniBonesTrans(extraPart);
+
+        if(targetTrans != null)
+        {
+            for (int i = 0; i < targetTrans.Length; i++)
+            {
+                boneDic.Add(targetTrans[i].name, targetTrans[i].localScale);
+            }
+        }
+    }
+
+    public void GetExtraAniBonesRotate(ref Dictionary<string, Quaternion> boneDic, EditableBodyPart extraPart)
+    {
+        Transform[] targetTrans = GetExtraAniBonesTrans(extraPart);
+
+        if (targetTrans != null)
+        {
+            for (int i = 0; i < targetTrans.Length; i++)
+            {
+                boneDic.Add(targetTrans[i].name, targetTrans[i].localRotation);
+            }
+        }
+    }
+
+    public void GetExtraAniBonesPosition(ref Dictionary<string, Vector3> boneDic, EditableBodyPart extraPart)
+    {
+        Transform[] targetTrans = GetExtraAniBonesTrans(extraPart);
+
+        if (targetTrans != null)
+        {
+            for (int i = 0; i < targetTrans.Length; i++)
+            {
+                boneDic.Add(targetTrans[i].name, targetTrans[i].localPosition);
+            }
+        }
+    }
+
+    public void SetBonePos(string name,Vector3 value)
+    {
+        var bone = CustomRoleUtility.GetChild(transform,name);
+        if(bone)
+        {
+            bone.transform.localPosition = value;
+        }
+    }
+
+    public void SetBoneRot(string name, Quaternion value)
+    {
+        var bone = CustomRoleUtility.GetChild(transform, name);
+        if (bone)
+        {
+            bone.transform.localRotation = value;
+        }
+    }
+
+    public void SetBoneScale(string name, Vector3 value)
+    {
+        var bone = CustomRoleUtility.GetChild(transform, name);
+        if (bone)
+        {
+            bone.transform.localScale = value;
+        }
+    }
 }

+ 5 - 0
Assets/GameMain/Scripts/UI/CustomRoleForm.cs

@@ -108,5 +108,10 @@ namespace MetaClient
                 point.transform.position = pos;
             }
         }
+
+        public void ClickReset()
+        {
+            CustomManager.Instance.ResetRole();
+        }
     }
 }

+ 31 - 0
Assets/GameMain/Scripts/Utility/CustomRoleUtility.cs

@@ -142,6 +142,37 @@ public static class CustomRoleUtility
         }
     }
 
+    public static void GetNormalAniBonesScale(Animator ani,ref Dictionary<string, Vector3> boneDic)
+    {
+        for (int i = 0; i < Enum.GetValues(typeof(HumanBodyBones)).Length - 1; i++)
+        {
+            var trans = ani.GetBoneTransform((HumanBodyBones)i);
+            if(trans)
+            {
+                boneDic.Add(trans.name, trans.localScale);
+            }
+        }
+    }
+
+    public static Transform GetChild(Transform trans,string name)
+    {
+        for (int i = 0; i < trans.childCount; i++)
+        {
+            if(trans.GetChild(i).name == name)
+            {
+                return trans.GetChild(i);
+            }else
+            {
+                var childTrans = GetChild(trans.GetChild(i),name);
+                if(childTrans != null)
+                {
+                    return childTrans;
+                }
+            }
+        }
+        return null;
+    }
+
     public static void ShowFile()
     {
         FileStream fs = File.Open("E:/key.key", FileMode.Open);

+ 211 - 2
Assets/GameMain/UI/UIForms/CustomRoleForm.prefab

@@ -34,6 +34,7 @@ RectTransform:
   - {fileID: 3816706407775173979}
   - {fileID: 4781382683912879807}
   - {fileID: 8012591015549786358}
+  - {fileID: 6606522460983083901}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -434,6 +435,84 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1339010410882657232
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5915194094141497025}
+  - component: {fileID: 8940581088607357976}
+  - component: {fileID: 7321404756729408625}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5915194094141497025
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1339010410882657232}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6606522460983083901}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8940581088607357976
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1339010410882657232}
+  m_CullTransparentMesh: 0
+--- !u!114 &7321404756729408625
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1339010410882657232}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Reset
 --- !u!1 &2677603730461522199
 GameObject:
   m_ObjectHideFlags: 0
@@ -564,6 +643,136 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &3320525919604949141
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6606522460983083901}
+  - component: {fileID: 7931250227477844016}
+  - component: {fileID: 5920242674523688651}
+  - component: {fileID: 1896980988400132418}
+  m_Layer: 5
+  m_Name: resetBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6606522460983083901
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3320525919604949141}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5915194094141497025}
+  m_Father: {fileID: 22455944}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -228, y: -540.13}
+  m_SizeDelta: {x: 160, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7931250227477844016
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3320525919604949141}
+  m_CullTransparentMesh: 0
+--- !u!114 &5920242674523688651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3320525919604949141}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1896980988400132418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3320525919604949141}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5920242674523688651}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2747401629747932731}
+        m_MethodName: ClickReset
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &4150156127494969592
 GameObject:
   m_ObjectHideFlags: 0
@@ -2122,7 +2331,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 557}
-  m_SizeDelta: {x: 160, y: 50}
+  m_SizeDelta: {x: 300, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8201164518370244266
 CanvasRenderer:
@@ -2164,4 +2373,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5F53\u524D\u4FEE\u6539"
+  m_Text: CurModify

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -136,7 +136,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
+  bundleVersion: 0.18
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0