修复一些内容
This commit is contained in:
@@ -108,15 +108,17 @@ MonoBehaviour:
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_ActiveFontFeatures: 00000000
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
@@ -376,15 +378,17 @@ MonoBehaviour:
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_ActiveFontFeatures: 00000000
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
|
||||
@@ -108,15 +108,17 @@ MonoBehaviour:
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_ActiveFontFeatures: 00000000
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
@@ -523,15 +525,17 @@ MonoBehaviour:
|
||||
m_lineSpacingMax: 0
|
||||
m_paragraphSpacing: 0
|
||||
m_charWidthMaxAdj: 0
|
||||
m_enableWordWrapping: 1
|
||||
m_TextWrappingMode: 1
|
||||
m_wordWrappingRatios: 0.4
|
||||
m_overflowMode: 0
|
||||
m_linkedTextComponent: {fileID: 0}
|
||||
parentLinkedComponent: {fileID: 0}
|
||||
m_enableKerning: 1
|
||||
m_ActiveFontFeatures: 00000000
|
||||
m_enableExtraPadding: 0
|
||||
checkPaddingRequired: 0
|
||||
m_isRichText: 1
|
||||
m_EmojiFallbackSupport: 1
|
||||
m_parseCtrlCharacters: 1
|
||||
m_isOrthographic: 1
|
||||
m_isCullingEnabled: 0
|
||||
@@ -941,6 +945,10 @@ PrefabInstance:
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -6641050763205051922, guid: 4abb91c83e9e6214992ef15922294c0c, type: 2}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_TextWrappingMode
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_enableWordWrapping
|
||||
value: 0
|
||||
|
||||
@@ -634,6 +634,10 @@ PrefabInstance:
|
||||
propertyPath: m_RaycastTarget
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_TextWrappingMode
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_enableWordWrapping
|
||||
value: 0
|
||||
|
||||
@@ -3295,6 +3295,10 @@ PrefabInstance:
|
||||
propertyPath: m_RaycastTarget
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_TextWrappingMode
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6279050909353911363, guid: 4e6810693c07dfb4399ed0c7c7a3ce39, type: 3}
|
||||
propertyPath: m_enableWordWrapping
|
||||
value: 0
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _FocusEmisson: {r: 0, g: 0, b: 1, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -55,4 +57,6 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FocusColor: {r: 0, g: 0, b: 1, a: 0}
|
||||
- _FocusEmisson: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _FocusEmisson: {r: 0, g: 1, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -55,4 +57,6 @@ Material:
|
||||
m_Colors:
|
||||
- _Color: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FocusColor: {r: 0, g: 1, b: 0, a: 0}
|
||||
- _FocusEmisson: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _FocusEmisson: {r: 1, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 1, g: 0, b: 0, a: 0}
|
||||
- _FocusEmisson: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _FocusEmisson: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -25,13 +25,15 @@ Material:
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _EMISSION
|
||||
m_LightmapFlags: 2
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -57,3 +59,4 @@ Material:
|
||||
- _FocusColor: {r: 1, g: 1, b: 1, a: 0}
|
||||
- _FocusEmisson: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -32,7 +32,8 @@ Material:
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -131,3 +132,4 @@ Material:
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 7
|
||||
version: 10
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
@@ -21,19 +21,19 @@ Material:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Template
|
||||
m_Shader: {fileID: -6465566751694194690, guid: be64c4a17e7d11847942454405ae536d,
|
||||
type: 3}
|
||||
m_Shader: {fileID: -6465566751694194690, guid: be64c4a17e7d11847942454405ae536d, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords:
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords:
|
||||
- _REFLECTION_PROBE_BOX_PROJECTION
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
disabledShaderPasses:
|
||||
- MOTIONVECTORS
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
@@ -82,3 +82,4 @@ Material:
|
||||
- _ColorFilter: {r: 0.7411765, g: 0.8392157, b: 1, a: 1}
|
||||
- _TransitionEdgeColor: {r: 7.1354446, g: 2.9139512, b: 0.41094184, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
using Convention.Experimental.PublicType;
|
||||
using Convention.WindowsUI;
|
||||
using Sirenix.Utilities;
|
||||
using Convention.WindowsUI;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
@@ -14,7 +12,6 @@ using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.Scripting;
|
||||
using UnityEngine.UI;
|
||||
|
||||
namespace UnityEditor
|
||||
|
||||
@@ -5,9 +5,10 @@ using UnityEngine;
|
||||
|
||||
namespace Convention
|
||||
{
|
||||
[Serializable]
|
||||
public class GlobalConfig : IEnumerable<KeyValuePair<string, object>>
|
||||
{
|
||||
public static string ConstConfigFile = "config.json";
|
||||
public static string ConstConfigFile = "config.easysave";
|
||||
|
||||
public static void InitExtensionEnv()
|
||||
{
|
||||
@@ -18,7 +19,7 @@ namespace Convention
|
||||
private int configLogging_tspace = "Property not found".Length;
|
||||
|
||||
private ToolFile DataDir;
|
||||
private Dictionary<string, object> data_pair = new();
|
||||
[Content, SerializeField] private Dictionary<string, object> data_pair = new();
|
||||
|
||||
public GlobalConfig(string dataDir, bool isTryCreateDataDir = false, bool isLoad = true)
|
||||
: this(new ToolFile(dataDir), isTryCreateDataDir, isLoad) { }
|
||||
@@ -124,10 +125,10 @@ namespace Convention
|
||||
public int DataSize() => data_pair.Count;
|
||||
|
||||
[Serializable]
|
||||
public class InternalProperty
|
||||
public struct InternalProperty
|
||||
{
|
||||
public Dictionary<string, object> property = new();
|
||||
public Dictionary<string, object> find = new();
|
||||
public Dictionary<string, object> property;
|
||||
public Dictionary<string, object> find;
|
||||
}
|
||||
|
||||
public GlobalConfig SaveProperties()
|
||||
|
||||
@@ -178,6 +178,11 @@ MeshRenderer:
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -199,6 +204,7 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -261,6 +267,11 @@ MeshRenderer:
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -282,6 +293,7 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -432,6 +444,7 @@ MonoBehaviour:
|
||||
m_DeselectOnBackgroundClick: 1
|
||||
m_PointerBehavior: 0
|
||||
m_CursorLockBehavior: 0
|
||||
m_ScrollDeltaPerTick: 6
|
||||
--- !u!114 &5755241224653137510
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -472,7 +485,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 6aef4bef-4ba7-40e0-a7d1-d7f1e248ca58
|
||||
m_ActionName: Global/MinimizeWindow[/Keyboard/minus]
|
||||
m_ActionName: 'Global/MinimizeWindow[/Keyboard/minus]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2842681098514009160}
|
||||
@@ -488,7 +501,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 5a8d46e2-d677-458a-9ff0-f6c3f3617562
|
||||
m_ActionName: Global/MaximizeWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/equals]
|
||||
m_ActionName: 'Global/MaximizeWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/equals]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5097730334777079569}
|
||||
@@ -505,7 +518,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 019b3bce-869c-4779-9021-77ca15e4c92f
|
||||
m_ActionName: Global/FocusHierarchy[/Keyboard/ctrl,/Keyboard/w,/Keyboard/h]
|
||||
m_ActionName: 'Global/FocusHierarchy[/Keyboard/ctrl,/Keyboard/w,/Keyboard/h]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5097730334777079569}
|
||||
@@ -522,7 +535,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 427a3330-d987-4cc4-80f1-5481caffc3f2
|
||||
m_ActionName: Global/FocusTools[/Keyboard/ctrl,/Keyboard/w,/Keyboard/t]
|
||||
m_ActionName: 'Global/FocusTools[/Keyboard/ctrl,/Keyboard/w,/Keyboard/t]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5097730334777079569}
|
||||
@@ -539,7 +552,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: b988c7ef-3a1d-4e95-9fc8-bcacf7a33267
|
||||
m_ActionName: Global/FocusAssets[/Keyboard/ctrl,/Keyboard/w,/Keyboard/a]
|
||||
m_ActionName: 'Global/FocusAssets[/Keyboard/ctrl,/Keyboard/w,/Keyboard/a]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5097730334777079569}
|
||||
@@ -568,7 +581,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 056fffef-8a96-49e4-b2b2-ad08f4f8e42a
|
||||
m_ActionName: Global/FocusInspector[/Keyboard/ctrl,/Keyboard/w,/Keyboard/i]
|
||||
m_ActionName: 'Global/FocusInspector[/Keyboard/ctrl,/Keyboard/w,/Keyboard/i]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 5097730334777079569}
|
||||
@@ -585,7 +598,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 1e8842a8-dd79-4d95-87e5-1f7635d66606
|
||||
m_ActionName: Global/FocusMain[/Keyboard/ctrl,/Keyboard/w,/Keyboard/m]
|
||||
m_ActionName: 'Global/FocusMain[/Keyboard/ctrl,/Keyboard/w,/Keyboard/m]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2842681098514009160}
|
||||
@@ -601,7 +614,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 232e2893-c8ea-4bad-bec4-adbfa058ba13
|
||||
m_ActionName: Global/ExitFullWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/leftBracket]
|
||||
m_ActionName: 'Global/ExitFullWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/leftBracket]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2842681098514009160}
|
||||
@@ -617,7 +630,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: f5fc4030-90d0-4d71-baba-a1d93b407b76
|
||||
m_ActionName: Global/FullWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/rightBracket]
|
||||
m_ActionName: 'Global/FullWindow[/Keyboard/ctrl,/Keyboard/w,/Keyboard/rightBracket]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2842681098514009160}
|
||||
@@ -633,15 +646,15 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 72e4bc9a-bf8d-4cf6-bcb4-635303b3dd91
|
||||
m_ActionName: Global/ExitFocusInspector[/Keyboard/ctrl,/Keyboard/w,/Keyboard/quote]
|
||||
m_ActionName: 'Global/ExitFocusInspector[/Keyboard/ctrl,/Keyboard/w,/Keyboard/quote]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionId: 09e09383-f82c-482a-942b-c8eb0834e6a6
|
||||
m_ActionName: Global/CommandMode[/Keyboard/leftCtrl,/Keyboard/p]
|
||||
m_ActionName: 'Global/CommandMode[/Keyboard/leftCtrl,/Keyboard/p]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ActionId: 59ef6b68-5b72-429d-b115-6351f9c596b4
|
||||
m_ActionName: Global/EscAnyMode[/Keyboard/escape]
|
||||
m_ActionName: 'Global/EscAnyMode[/Keyboard/escape]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 8774020968396821109}
|
||||
@@ -657,7 +670,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: 6f11972a-292f-4ec8-a47a-c08a5255a3ec
|
||||
m_ActionName: Global/RefreshMode[/Keyboard/ctrl,/Keyboard/r]
|
||||
m_ActionName: 'Global/RefreshMode[/Keyboard/ctrl,/Keyboard/r]'
|
||||
- m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 9026220626307204097}
|
||||
@@ -673,7 +686,7 @@ MonoBehaviour:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_ActionId: f01a7483-b388-46f9-9104-0100e1d7c09e
|
||||
m_ActionName: Global/Rename[/Keyboard/f2]
|
||||
m_ActionName: 'Global/Rename[/Keyboard/f2]'
|
||||
m_NeverAutoSwitchControlSchemes: 0
|
||||
m_DefaultControlScheme:
|
||||
m_DefaultActionMap: Global
|
||||
@@ -811,7 +824,6 @@ MonoBehaviour:
|
||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
@@ -819,6 +831,7 @@ MonoBehaviour:
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!114 &4433285524107997579
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -979,7 +992,7 @@ MonoBehaviour:
|
||||
m_Bits: 55
|
||||
--- !u!95 &2842681098514009160
|
||||
Animator:
|
||||
serializedVersion: 5
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
@@ -993,6 +1006,7 @@ Animator:
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
@@ -1160,7 +1174,6 @@ MonoBehaviour:
|
||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
@@ -1168,6 +1181,7 @@ MonoBehaviour:
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!114 &9221906298468010471
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1300,6 +1314,11 @@ MeshRenderer:
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
@@ -1321,6 +1340,7 @@ MeshRenderer:
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
@@ -1533,7 +1553,6 @@ MonoBehaviour:
|
||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
@@ -1541,6 +1560,7 @@ MonoBehaviour:
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!114 &5183958985083021394
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
Reference in New Issue
Block a user