ninemine/Convention-Unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复一些内容

Browse Source
This commit is contained in:
LiuBai095
2025-11-25 11:59:44 +08:00
parent 1afdb95231
commit fced17765c
24 changed files with 147 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Convention/[ES3]/Easy Save 3/Resources/ES3/ES3Defaults.asset
View File

@@ -33,7 +33,6 @@ MonoBehaviour:
- Assembly-CSharp
- Assembly-CSharp-firstpass
- Cinemachine
- CW.Common
- Dreamteck.Splines
- Dreamteck.Utilities
- EasySave3
@@ -42,9 +41,6 @@ MonoBehaviour:
- glTFast.dots
- glTFast.Export
- glTFast.Newtonsoft
- LeanCommon
- LeanGUI
- LeanTransition
showAdvancedSettings: 0
addMgrToSceneAutomatically: 0
autoUpdateReferences: 1

2
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/Component Types/ES3Type_BoxCollider.cs
View File

@@ -49,7 +49,7 @@ namespace ES3Types
instance.contactOffset = reader.Read<System.Single>();
break;
case "material":
instance.sharedMaterial = reader.Read<UnityEngine.PhysicMaterial>();
instance.sharedMaterial = reader.Read<UnityEngine.PhysicsMaterial>();
break;
default:
reader.Skip();

2
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/Component Types/ES3Type_CapsuleCollider.cs
View File

@@ -57,7 +57,7 @@ namespace ES3Types
instance.contactOffset = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "material":
instance.sharedMaterial = reader.Read<UnityEngine.PhysicMaterial>();
instance.sharedMaterial = reader.Read<UnityEngine.PhysicsMaterial>();
break;
default:
reader.Skip();

2
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/Component Types/ES3Type_MeshCollider.cs
View File

@@ -58,7 +58,7 @@ namespace ES3Types
instance.contactOffset = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "material":
instance.sharedMaterial = reader.Read<UnityEngine.PhysicMaterial>(ES3Type_PhysicMaterial.Instance);
instance.sharedMaterial = reader.Read<PhysicsMaterial>(ES3Type_PhysicMaterial.Instance);
break;
default:
reader.Skip();

12
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/Component Types/ES3Type_Rigidbody.cs
View File

@@ -16,10 +16,10 @@ namespace ES3Types
{
var instance = (UnityEngine.Rigidbody)obj;
writer.WriteProperty("velocity", instance.velocity, ES3Type_Vector3.Instance);
writer.WriteProperty("velocity", instance.linearVelocity, ES3Type_Vector3.Instance);
writer.WriteProperty("angularVelocity", instance.angularVelocity, ES3Type_Vector3.Instance);
writer.WriteProperty("drag", instance.drag, ES3Type_float.Instance);
writer.WriteProperty("angularDrag", instance.angularDrag, ES3Type_float.Instance);
writer.WriteProperty("drag", instance.linearDamping, ES3Type_float.Instance);
writer.WriteProperty("angularDrag", instance.angularDamping, ES3Type_float.Instance);
writer.WriteProperty("mass", instance.mass, ES3Type_float.Instance);
writer.WriteProperty("useGravity", instance.useGravity, ES3Type_bool.Instance);
writer.WriteProperty("maxDepenetrationVelocity", instance.maxDepenetrationVelocity, ES3Type_float.Instance);
@@ -47,16 +47,16 @@ namespace ES3Types
{
case "velocity":
instance.velocity = reader.Read<UnityEngine.Vector3>(ES3Type_Vector3.Instance);
instance.linearVelocity = reader.Read<UnityEngine.Vector3>(ES3Type_Vector3.Instance);
break;
case "angularVelocity":
instance.angularVelocity = reader.Read<UnityEngine.Vector3>(ES3Type_Vector3.Instance);
break;
case "drag":
instance.drag = reader.Read<System.Single>(ES3Type_float.Instance);
instance.linearDamping = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "angularDrag":
instance.angularDrag = reader.Read<System.Single>(ES3Type_float.Instance);
instance.angularDamping = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "mass":
instance.mass = reader.Read<System.Single>(ES3Type_float.Instance);

2
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/Component Types/ES3Type_SphereCollider.cs
View File

@@ -48,7 +48,7 @@ namespace ES3Types
instance.contactOffset = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "material":
instance.sharedMaterial = reader.Read<UnityEngine.PhysicMaterial>();
instance.sharedMaterial = reader.Read<UnityEngine.PhysicsMaterial>();
break;
default:
reader.Skip();

14
Convention/[ES3]/Easy Save 3/Scripts/Types/Unity Types/ES3Type_PhysicMaterial.cs
View File

@@ -8,11 +8,11 @@ namespace ES3Types
{
public static ES3Type Instance = null;
public ES3Type_PhysicMaterial() : base(typeof(UnityEngine.PhysicMaterial)){ Instance = this; }
public ES3Type_PhysicMaterial() : base(typeof(UnityEngine.PhysicsMaterial)){ Instance = this; }
protected override void WriteObject(object obj, ES3Writer writer)
{
var instance = (UnityEngine.PhysicMaterial)obj;
var instance = (UnityEngine.PhysicsMaterial)obj;
writer.WriteProperty("dynamicFriction", instance.dynamicFriction, ES3Type_float.Instance);
writer.WriteProperty("staticFriction", instance.staticFriction, ES3Type_float.Instance);
@@ -23,7 +23,7 @@ namespace ES3Types
protected override void ReadObject<T>(ES3Reader reader, object obj)
{
var instance = (UnityEngine.PhysicMaterial)obj;
var instance = (UnityEngine.PhysicsMaterial)obj;
foreach(string propertyName in reader.Properties)
{
switch(propertyName)
@@ -39,10 +39,10 @@ namespace ES3Types
instance.bounciness = reader.Read<System.Single>(ES3Type_float.Instance);
break;
case "frictionCombine":
instance.frictionCombine = reader.Read<UnityEngine.PhysicMaterialCombine>();
instance.frictionCombine = reader.Read<UnityEngine.PhysicsMaterialCombine>();
break;
case "bounceCombine":
instance.bounceCombine = reader.Read<UnityEngine.PhysicMaterialCombine>();
instance.bounceCombine = reader.Read<UnityEngine.PhysicsMaterialCombine>();
break;
default:
reader.Skip();
@@ -53,7 +53,7 @@ namespace ES3Types
protected override object ReadObject<T>(ES3Reader reader)
{
var instance = new UnityEngine.PhysicMaterial();
var instance = new UnityEngine.PhysicsMaterial();
ReadObject<T>(reader, instance);
return instance;
}
@@ -63,7 +63,7 @@ namespace ES3Types
{
public static ES3Type Instance;
public ES3Type_PhysicMaterialArray() : base(typeof(UnityEngine.PhysicMaterial[]), ES3Type_PhysicMaterial.Instance)
public ES3Type_PhysicMaterialArray() : base(typeof(UnityEngine.PhysicsMaterial[]), ES3Type_PhysicMaterial.Instance)
{
Instance = this;
}