浏览代码

Initial push with boat falling due to Unity Physics

/dots-input
mikegeig 5 年前
当前提交
7845eb06
共有 14 个文件被更改,包括 1441 次插入3 次删除
  1. 6
      Packages/manifest.json
  2. 8
      Assets/EntityCache.meta
  3. 8
      Assets/Unity Physics Items.meta
  4. 8
      Assets/EntityCache/Resources.meta
  5. 13
      Assets/Unity Physics Items/BoatBodyComponent.cs
  6. 11
      Assets/Unity Physics Items/BoatBodyComponent.cs.meta
  7. 302
      Assets/Unity Physics Items/BoatEntity.prefab
  8. 7
      Assets/Unity Physics Items/BoatEntity.prefab.meta
  9. 1001
      Assets/Unity Physics Items/Physics Scene.unity
  10. 7
      Assets/Unity Physics Items/Physics Scene.unity.meta
  11. 66
      Assets/Unity Physics Items/Physics Settings.prefab
  12. 7
      Assets/Unity Physics Items/Physics Settings.prefab.meta

6
Packages/manifest.json


"dependencies": {
"com.unity.burst": "1.1.1",
"com.unity.cinemachine": "2.3.4",
"com.unity.render-pipelines.core": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.render-pipelines.core",
"com.unity.render-pipelines.universal": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.render-pipelines.universal",
"com.unity.shadergraph": "file:/Users/andremcgrail/Documents/UnityProjects/Github/SRP_Master/com.unity.shadergraph",
"com.unity.entities": "0.0.12-preview.33",
"com.unity.physics": "0.1.0-preview",
"com.unity.render-pipelines.lightweight": "7.0.0",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",

8
Assets/EntityCache.meta


fileFormatVersion: 2
guid: e50cf0f4dde230944a81a4bb1a939a90
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Unity Physics Items.meta


fileFormatVersion: 2
guid: b67fc1f9c9fc5be47b5a34feb592f451
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/EntityCache/Resources.meta


fileFormatVersion: 2
guid: f81c7c23b2629154aa90990298a95e36
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

13
Assets/Unity Physics Items/BoatBodyComponent.cs


using System.Collections;
using System.Collections.Generic;
using Unity.Entities;
using Unity.Transforms;
using UnityEngine;
public class BoatBodyComponent : MonoBehaviour, IConvertGameObjectToEntity
{
public void Convert(Entity entity, EntityManager dstManager, GameObjectConversionSystem conversionSystem)
{
dstManager.AddComponent(entity, typeof(CopyTransformToGameObject));
}
}

11
Assets/Unity Physics Items/BoatBodyComponent.cs.meta


fileFormatVersion: 2
guid: 80b5230fc040dc24a87a4b4792d30957
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

302
Assets/Unity Physics Items/BoatEntity.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &2092507921
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3456711171255019043}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 80b5230fc040dc24a87a4b4792d30957, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2092507922
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3456711171255019043}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
m_Name:
m_EditorClassIdentifier:
ConversionMode: 1
--- !u!1 &3457973740146875416
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3457973740146875417}
- component: {fileID: 1531988075}
- component: {fileID: 1531988076}
- component: {fileID: 1531988078}
m_Layer: 11
m_Name: BoatEntity
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3457973740146875417
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457973740146875416}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -83.22217, y: -0.153, z: -23.65689}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3453465595108755947}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1531988075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457973740146875416}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
m_Name:
m_EditorClassIdentifier:
ConversionMode: 0
--- !u!114 &1531988076
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457973740146875416}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_MotionType: 0
m_Mass: 3200
m_LinearDamping: 0.1
m_AngularDamping: 0.05
m_InitialLinearVelocity:
x: 0
y: 0
z: 0
m_InitialAngularVelocity:
x: 0
y: 0
z: 0
m_GravityFactor: 1
m_OverrideDefaultMassDistribution: 0
m_CenterOfMass:
x: 0
y: 0
z: 0
m_Orientation:
Value:
x: 0
y: 0
z: 0
RotationOrder: 4
m_InertiaTensor:
x: 0.4
y: 0.4
z: 0.4
--- !u!114 &1531988078
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3457973740146875416}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShapeType: 31
m_PrimitiveCenter:
x: 0
y: 0
z: 0
m_PrimitiveSize:
x: 1
y: 1
z: 1
m_PrimitiveOrientation:
Value:
x: -0
y: 0
z: 0
RotationOrder: 4
m_Capsule:
Height: 1
Radius: 0.5
Axis: 2
m_Cylinder:
Height: 1
Radius: 0.5
Axis: 2
m_SphereRadius: 0.5
m_ConvexRadius: 0.05
m_CustomMesh: {fileID: 2899951614431091848, guid: a362db008c5274e03bf6f3d2387cf617,
type: 3}
m_Material:
m_SupportsTemplate: 1
m_Template: {fileID: 0}
m_IsTrigger:
m_Override: 0
m_Value: 0
m_Friction:
m_Override: 0
m_Value:
Value: 0.5
CombineMode: 0
m_Restitution:
m_Override: 0
m_Value:
Value: 0
CombineMode: 2
m_BelongsTo:
m_Override: 0
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
m_CollidesWith:
m_Override: 0
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
m_RaisesCollisionEvents:
m_Override: 0
m_Value: 0
m_CustomFlags:
m_Override: 0
m_Value: 0000000000000000
--- !u!1001 &3457973740818156961
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3457973740146875417}
m_Modifications:
- target: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_Name
value: _Boat
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 64258884862185400, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: PrimaryColor.r
value: 0.076799296
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: PrimaryColor.g
value: 0.7679928
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: PrimaryColor.b
value: 0.5129714
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: TrimColor.r
value: 0.061527293
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: TrimColor.g
value: 0.2320072
objectReference: {fileID: 0}
- target: {fileID: 114129291822198474, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: TrimColor.b
value: 0.16910727
objectReference: {fileID: 0}
- target: {fileID: 114571606569623246, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1710334234404381546, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
propertyPath: RB
value:
objectReference: {fileID: 3404562789124436809, guid: 0a308b87c1579fb4c9ea256406209ca5,
type: 3}
m_RemovedComponents:
- {fileID: 54710712322113256, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: fc3ffb83d6eafb1489a5b23bc82d25b6, type: 3}
--- !u!1 &3456711171255019043 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1553288845585282, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
m_PrefabInstance: {fileID: 3457973740818156961}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3453465595108755947 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4534809148113994, guid: fc3ffb83d6eafb1489a5b23bc82d25b6,
type: 3}
m_PrefabInstance: {fileID: 3457973740818156961}
m_PrefabAsset: {fileID: 0}

7
Assets/Unity Physics Items/BoatEntity.prefab.meta


fileFormatVersion: 2
guid: 0a308b87c1579fb4c9ea256406209ca5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1001
Assets/Unity Physics Items/Physics Scene.unity
文件差异内容过多而无法显示
查看文件

7
Assets/Unity Physics Items/Physics Scene.unity.meta


fileFormatVersion: 2
guid: 15526d9c33e0e1a4a976cb75b81a90bb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

66
Assets/Unity Physics Items/Physics Settings.prefab


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6698997538611213016
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4018593011617785703}
- component: {fileID: 1925807081182823211}
- component: {fileID: 6001476266129338508}
m_Layer: 0
m_Name: Physics Settings
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4018593011617785703
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6698997538611213016}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -81.26014, y: -1.9031935, z: -21.097088}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1925807081182823211
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6698997538611213016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d30974bf68d61043b1572197db94cdc, type: 3}
m_Name:
m_EditorClassIdentifier:
SimulationType: 1
Gravity:
x: -0
y: -9.81
z: -0
SolverIterationCount: 4
ThreadCountHint: 8
--- !u!114 &6001476266129338508
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6698997538611213016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
m_Name:
m_EditorClassIdentifier:
ConversionMode: 0

7
Assets/Unity Physics Items/Physics Settings.prefab.meta


fileFormatVersion: 2
guid: ebb958ca9e119be438b62f3cce1981fc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
正在加载...
取消
保存